Merge branch 'master' into sleep-schedules

tidepool-org · Nov 6, 2023 · a2033e8 · a2033e8
2 parents 245e317 + b8166fb
commit a2033e8
Show file tree

Hide file tree

Showing 4,148 changed files with 1,074,851 additions and 122,591 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,14 +5,14 @@ dist: jammy
 language: go
 
 go:
-  - 1.20
+  - 1.21.x
 
 go_import_path: github.com/tidepool-org/platform
 
 env:
   global:
-    - MONGODB=6.0.8
-    - MONGOSH=1.10.4
+    - MONGODB=6.0.11
+    - MONGOSH=1.10.6
     - DIST=jammy
 
 before_install:

diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ endif
 
 ginkgo:
 ifeq ($(shell which ginkgo),)
-	cd vendor/github.com/onsi/ginkgo/ginkgo && go install -mod=vendor .
+	cd vendor/github.com/onsi/ginkgo/v2/ginkgo && go install -mod=vendor .
 endif
 
 goimports:
@@ -189,28 +189,28 @@ service-restart-all:
 	@cd $(ROOT_DIRECTORY) && for SERVICE in migrations tools; do $(MAKE) service-restart SERVICE="$${SERVICE}"; done
 
 test: ginkgo
-	@echo "ginkgo -requireSuite -slowSpecThreshold=10 -r $(TEST)"
-	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo -requireSuite -slowSpecThreshold=10 -r $(TEST)
+	@echo "ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r $(TEST)"
+	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r $(TEST)
 
 test-until-failure: ginkgo
-	@echo "ginkgo -requireSuite -slowSpecThreshold=10 -r -untilItFails $(TEST)"
-	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo -requireSuite -slowSpecThreshold=10 -r -untilItFails $(TEST)
+	@echo "ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r -untilItFails $(TEST)"
+	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r -untilItFails $(TEST)
 
 test-watch: ginkgo
-	@echo "ginkgo watch -requireSuite -slowSpecThreshold=10 -r $(TEST)"
-	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo watch -requireSuite -slowSpecThreshold=10 -r $(TEST)
+	@echo "ginkgo watch --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r $(TEST)"
+	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo watch --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r $(TEST)
 
 ci-test: ginkgo
-	@echo "ginkgo -requireSuite -slowSpecThreshold=10 -r -randomizeSuites -randomizeAllSpecs -succinct -failOnPending -cover -trace -race -progress -keepGoing $(TEST)"
-	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo -requireSuite -slowSpecThreshold=10 --compilers=2 -r -randomizeSuites -randomizeAllSpecs -succinct -failOnPending -cover -trace -race -progress -keepGoing $(TEST)
+	@echo "ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r --randomize-suites --randomize-all --succinct --fail-on-pending --cover --trace --race --keep-going $(TEST)"
+	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s --compilers=2 -r --randomize-suites --randomize-all --succinct --fail-on-pending --cover --trace --race --keep-going $(TEST)
 
 ci-test-until-failure: ginkgo
-	@echo "ginkgo -requireSuite -slowSpecThreshold=10 -r -randomizeSuites -randomizeAllSpecs -succinct -failOnPending -cover -trace -race -progress -keepGoing -untilItFails $(TEST)"
-	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo -requireSuite -slowSpecThreshold=10 -r -randomizeSuites -randomizeAllSpecs -succinct -failOnPending -cover -trace -race -progress -keepGoing -untilItFails $(TEST)
+	@echo "ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r --randomize-suites --randomize-all --succinct --fail-on-pending --cover --trace --race --keep-going -untilItFails $(TEST)"
+	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r --randomize-suites --randomize-all --succinct --fail-on-pending --cover --trace --race --keep-going -untilItFails $(TEST)
 
 ci-test-watch: ginkgo
-	@echo "ginkgo watch -requireSuite -slowSpecThreshold=10 -r -randomizeAllSpecs -succinct -failOnPending -cover -trace -race -progress $(TEST)"
-	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo watch -requireSuite -slowSpecThreshold=10 -r -randomizeAllSpecs -succinct -failOnPending -cover -trace -race -progress $(TEST)
+	@echo "ginkgo watch --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r --randomize-all --succinct --fail-on-pending --cover --trace --race $(TEST)"
+	@cd $(ROOT_DIRECTORY) && . ./env.test.sh && ginkgo watch --require-suite --poll-progress-after=10s --poll-progress-interval=20s -r --randomize-all --succinct --fail-on-pending --cover --trace --race $(TEST)
 
 deploy: clean-deploy deploy-services deploy-migrations deploy-tools
 

diff --git a/alerts/config_test.go b/alerts/config_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/data/blood/glucose"

diff --git a/apple/device_check_test.go b/apple/device_check_test.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/apple"

diff --git a/application/application_test.go b/application/application_test.go
@@ -1,7 +1,7 @@
 package application_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/application"

diff --git a/application/provider_test.go b/application/provider_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/application"

diff --git a/application/runner_test.go b/application/runner_test.go
@@ -3,7 +3,7 @@ package application_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/application"

diff --git a/application/version_reporter_test.go b/application/version_reporter_test.go
@@ -1,7 +1,7 @@
 package application_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/application"

diff --git a/association/association_test.go b/association/association_test.go
@@ -3,8 +3,7 @@ package association_test
 import (
 	"strings"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/association"

diff --git a/auth/auth_test.go b/auth/auth_test.go
@@ -1,7 +1,7 @@
 package auth_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth"

diff --git a/auth/client/client_test.go b/auth/client/client_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 

diff --git a/auth/client/external_test.go b/auth/client/external_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 

diff --git a/auth/provider_session_test.go b/auth/provider_session_test.go
@@ -1,8 +1,7 @@
 package auth_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth"

diff --git a/auth/restricted_token_test.go b/auth/restricted_token_test.go
@@ -1,8 +1,7 @@
 package auth_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth"

diff --git a/auth/service/api/router_test.go b/auth/service/api/router_test.go
@@ -1,7 +1,7 @@
 package api_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth/service/api"

diff --git a/auth/service/api/status_get_test.go b/auth/service/api/status_get_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/ant0ine/go-json-rest/rest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth/service"

diff --git a/auth/service/api/v1/oauth_test.go b/auth/service/api/v1/oauth_test.go
@@ -1,7 +1,7 @@
 package v1_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("OAuth", func() {

diff --git a/auth/service/api/v1/provider_session_test.go b/auth/service/api/v1/provider_session_test.go
@@ -1,7 +1,7 @@
 package v1_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("ProviderSession", func() {

diff --git a/auth/service/api/v1/restricted_token_test.go b/auth/service/api/v1/restricted_token_test.go
@@ -1,7 +1,7 @@
 package v1_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("RestrictedToken", func() {

diff --git a/auth/service/api/v1/router_test.go b/auth/service/api/v1/router_test.go
@@ -1,7 +1,7 @@
 package v1_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	authServiceApiV1 "github.com/tidepool-org/platform/auth/service/api/v1"

diff --git a/auth/service/service/client_test.go b/auth/service/service/client_test.go
@@ -1,7 +1,7 @@
 package service_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("Client", func() {

diff --git a/auth/service/service/service_test.go b/auth/service/service/service_test.go
@@ -6,7 +6,7 @@ import (
 
 	eventsTest "github.com/tidepool-org/platform/events/test"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 

diff --git a/auth/store/mongo/provider_session_repository_test.go b/auth/store/mongo/provider_session_repository_test.go
@@ -1,7 +1,7 @@
 package mongo_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("ProviderSessionRepository", func() {

diff --git a/auth/store/mongo/restricted_token_repository_test.go b/auth/store/mongo/restricted_token_repository_test.go
@@ -1,7 +1,7 @@
 package mongo_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("RestrictedTokenRepository", func() {

diff --git a/auth/store/mongo/store_test.go b/auth/store/mongo/store_test.go
@@ -3,7 +3,7 @@ package mongo_test
 import (
 	"context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth/store"

diff --git a/auth/user_test.go b/auth/user_test.go
@@ -1,8 +1,7 @@
 package auth_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/auth"

diff --git a/aws/api/api_test.go b/aws/api/api_test.go
@@ -3,7 +3,7 @@ package api_test
 import (
 	awsSdkGoAwsSession "github.com/aws/aws-sdk-go/aws/session"
 	awsSdkGoServiceS3 "github.com/aws/aws-sdk-go/service/s3"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/aws"

diff --git a/aws/aws_test.go b/aws/aws_test.go
@@ -1,7 +1,7 @@
 package aws_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/aws"

diff --git a/blob/blob_test.go b/blob/blob_test.go
@@ -7,8 +7,7 @@ import (
 	"net/url"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/tidepool-org/platform/blob"

diff --git a/blob/client/client_test.go b/blob/client/client_test.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strconv"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 

diff --git a/blob/errors_test.go b/blob/errors_test.go
@@ -1,8 +1,7 @@
 package blob_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 
 	"github.com/tidepool-org/platform/blob"
 	errorsTest "github.com/tidepool-org/platform/errors/test"

diff --git a/blob/service/api/v1/v1_test.go b/blob/service/api/v1/v1_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/tidepool-org/platform/permission"
 
 	"github.com/ant0ine/go-json-rest/rest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"