Skip to content
Snippets Groups Projects
Commit 657971f5 authored by Jake Taylor's avatar Jake Taylor :lips:
Browse files

Merge branch 'release' into 'master' 

Revert "update deps"

See merge request elixxir/notifications-bot!42
parents 22ec7cbd 48928dbb
No related branches found
No related tags found
1 merge request!42Revert "update deps"
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 525 additions and 172 deletions
Makefile
+ 3
− 6
View file @ 657971f5
.PHONY: update master release setup update_master update_release build clean version
setup:
git config --global --add url."git@gitlab.com:".insteadOf "https://gitlab.com/"
.PHONY: update master release update_master update_release build clean version
version:
go run main.go generate
......@@ -30,6 +27,6 @@ update_master:
GOFLAGS="" go get gitlab.com/xx_network/comms@master
GOFLAGS="" go get gitlab.com/elixxir/comms@master
master: clean update_master build version
master: update_master clean build version
release: clean update_release build version
release: update_release clean build version
cmd/root.go
+ 4
− 3
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
// Package cmd initializes the CLI and config parsers as well as the logger
......
cmd/version.go
+ 5
− 4
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2018 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
// Handles command-line version functionality
......@@ -15,7 +16,7 @@ import (
)
// Change this value to set the version for this build
const currentVersion = "2.2.0"
const currentVersion = "2.3.0"
func printVersion() {
fmt.Printf("Elixxir Notifications Server v%s -- %s\n\n", SEMVER, GITVERSION)
......
cmd/version_vars.go
+ 78
− 19
View file @ 657971f5
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
// 2022-01-04 12:43:26.706957 -0600 CST m=+0.025308392
// 2023-07-26 10:35:51.001479363 -0700 PDT m=+0.023652538
package cmd
const GITVERSION = `779a153 Merge branch 'dev' into 'release'`
const SEMVER = "2.2.0"
const GITVERSION = `fa0fa3b Merge branch 'release' of git.xx.network:elixxir/notifications-bot into release`
const SEMVER = "2.3.0"
const DEPENDENCIES = `module gitlab.com/elixxir/notifications-bot
go 1.13
go 1.19
require (
cloud.google.com/go v0.55.0 // indirect
cloud.google.com/go/firestore v1.1.1 // indirect
cloud.google.com/go/pubsub v1.3.1 // indirect
firebase.google.com/go v3.12.0+incompatible
github.com/pkg/errors v0.9.1
github.com/sideshow/apns2 v0.20.0
github.com/spf13/cobra v1.0.0
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.7.0 // indirect
gitlab.com/elixxir/comms v0.0.4-0.20220104174855-044783c5c1e6
gitlab.com/elixxir/crypto v0.0.7-0.20211230230452-bca020488964
gitlab.com/elixxir/primitives v0.0.3-0.20220104173924-275cb9d7834f
gitlab.com/xx_network/comms v0.0.4-0.20211227194445-c099754b3cda
gitlab.com/xx_network/crypto v0.0.5-0.20211227194420-f311e8920467
gitlab.com/xx_network/primitives v0.0.4-0.20211222205802-03e9d7d835b0
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/tools v0.0.0-20200318150045-ba25ddc85566 // indirect
gitlab.com/elixxir/comms v0.0.4-0.20230214180204-3aba2e6795af
gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c
gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d
gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd
gitlab.com/xx_network/primitives v0.0.4-0.20230203173415-81c2cb07da44
golang.org/x/net v0.5.0
google.golang.org/api v0.20.0
google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3 // indirect
gopkg.in/ini.v1 v1.56.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gorm.io/driver/postgres v1.0.8
gorm.io/gorm v1.20.12
)
require (
cloud.google.com/go v0.55.0 // indirect
cloud.google.com/go/bigquery v1.5.0 // indirect
cloud.google.com/go/firestore v1.1.1 // indirect
cloud.google.com/go/pubsub v1.3.1 // indirect
cloud.google.com/go/storage v1.6.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/elliotchance/orderedmap v1.4.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.8.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.0.6 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.6.2 // indirect
github.com/jackc/pgx/v4 v4.10.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.1 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/klauspost/compress v1.11.7 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spf13/afero v1.1.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
go.opencensus.io v0.22.3 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.56.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
)
`
constants/constants.go
+ 7
− 0
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package constants
const NotificationsTag = "notificationData"
go.mod
+ 74
− 15
View file @ 657971f5
module gitlab.com/elixxir/notifications-bot
go 1.13
go 1.19
require (
cloud.google.com/go v0.55.0 // indirect
cloud.google.com/go/firestore v1.1.1 // indirect
cloud.google.com/go/pubsub v1.3.1 // indirect
firebase.google.com/go v3.12.0+incompatible
github.com/pkg/errors v0.9.1
github.com/sideshow/apns2 v0.20.0
github.com/spf13/cobra v1.0.0
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.0
gitlab.com/elixxir/comms v0.0.4-0.20220222212253-41a1a0067369
gitlab.com/elixxir/crypto v0.0.7-0.20220222212142-d3303373ee78
gitlab.com/elixxir/primitives v0.0.3-0.20220222212109-d412a6e46623
gitlab.com/xx_network/comms v0.0.4-0.20220222212058-5a37737af57e
gitlab.com/xx_network/crypto v0.0.5-0.20220222212031-750f7e8a01f4
gitlab.com/xx_network/primitives v0.0.4-0.20220222211843-901fa4a2d72b
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
golang.org/x/tools v0.0.0-20200318150045-ba25ddc85566 // indirect
gitlab.com/elixxir/comms v0.0.4-0.20230214180204-3aba2e6795af
gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c
gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d
gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd
gitlab.com/xx_network/primitives v0.0.4-0.20230203173415-81c2cb07da44
golang.org/x/net v0.5.0
google.golang.org/api v0.20.0
google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3 // indirect
gopkg.in/ini.v1 v1.56.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gorm.io/driver/postgres v1.0.8
gorm.io/gorm v1.20.12
)
require (
cloud.google.com/go v0.55.0 // indirect
cloud.google.com/go/bigquery v1.5.0 // indirect
cloud.google.com/go/firestore v1.1.1 // indirect
cloud.google.com/go/pubsub v1.3.1 // indirect
cloud.google.com/go/storage v1.6.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/elliotchance/orderedmap v1.4.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.8.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.0.6 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.6.2 // indirect
github.com/jackc/pgx/v4 v4.10.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.1 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/klauspost/compress v1.11.7 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spf13/afero v1.1.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
go.opencensus.io v0.22.3 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.56.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
)
go.sum
+ 282
− 90
View file @ 657971f5
This diff is collapsed.
io/poll.go
+ 6
− 6
View file @ 657971f5
///////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 xx network SEZC //
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
// Poll the network for the NDF. Users should create an ndf Poller with:
// poller := NewNdfPoller(Protocom object, permissioning host)
......
main.go
+ 4
− 3
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2018 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package main
......
notifications/apns/apns.go
+ 7
− 0
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package apns
import "github.com/sideshow/apns2"
......
notifications/ephemeral.go
+ 7
− 0
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package notifications
import (
......
notifications/ephemeral_test.go
+ 7
− 0
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package notifications
import (
......
notifications/firebase/fcm.go
+ 5
− 3
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package firebase
import (
......
notifications/firebase/fcm_test.go
+ 5
− 3
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package firebase
import (
......
notifications/ndf.go
+ 6
− 6
View file @ 657971f5
///////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 xx network SEZC //
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
// ndf controls gateway updates from the permissioning server
......
notifications/ndf_test.go
+ 6
− 6
View file @ 657971f5
///////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 xx network SEZC //
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package notifications
......
notifications/notifications.go
+ 4
− 3
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
// This file contains the main logic for notifications, including the main implementation and core loop
......
notifications/notifications_test.go
+ 5
− 3
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2020 Privategrity Corporation /
// /
// All rights reserved. /
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package notifications
import (
......
storage/buffer.go
+ 3
− 2
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2021 Privategrity Corporation //
// Copyright © 2022 xx foundation //
// //
// All rights reserved. //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package storage
......
storage/buffer_test.go
+ 7
− 0
View file @ 657971f5
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package storage
import (
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment