Skip to content

Commit

Permalink
[BACK-2702] Add reason for setting last updated and outdated since (#673
Browse files Browse the repository at this point in the history
)

* Add reason for setting last updated and outdated since

* add more specific conditions for SetOutdated triggers

* fix some unit tests

* update to ginkgo v2 and add some unit tests

* fix build and unit tests, still incomplete testing

* fix formatting

* possibly fix make test

* more test fixes

* travis use go 1.21 for real

* update vendor

* more unit tests

* more unit tests

* formatting

* add outdatedSinceLimit and minor bugfixes

* zero out OutdatedSinceLimit on update

* formatting

* update deps

* cleanup for review

* update deps

* remove direct depend on shopify/sarama

* remove dep on github.com/pkg/errors

* remove ginkgo v1

* address review comments

* update unit test to handle mongodb time rounding

* move DataSetsDataCreate summary logic after deduplicator

* add schemamigration reason

* dont clear LastUpdatedReason on SetOutdated

---------

Co-authored-by: Alexander Diana <[email protected]>
  • Loading branch information
toddkazakov and Roukoswarf authored Nov 6, 2023
1 parent d373193 commit b8166fb
Show file tree
Hide file tree
Showing 4,148 changed files with 1,074,851 additions and 122,591 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
26 changes: 13 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion alerts/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion apple/device_check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion application/application_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion application/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion application/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion application/version_reporter_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 1 addition & 2 deletions association/association_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion auth/client/external_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions auth/provider_session_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 1 addition & 2 deletions auth/restricted_token_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/service/api/router_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/service/api/status_get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/service/api/v1/oauth_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("OAuth", func() {
Expand Down
2 changes: 1 addition & 1 deletion auth/service/api/v1/provider_session_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("ProviderSession", func() {
Expand Down
2 changes: 1 addition & 1 deletion auth/service/api/v1/restricted_token_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("RestrictedToken", func() {
Expand Down
2 changes: 1 addition & 1 deletion auth/service/api/v1/router_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/service/service/client_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package service_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("Client", func() {
Expand Down
2 changes: 1 addition & 1 deletion auth/service/service/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion auth/store/mongo/provider_session_repository_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mongo_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("ProviderSessionRepository", func() {
Expand Down
2 changes: 1 addition & 1 deletion auth/store/mongo/restricted_token_repository_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mongo_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("RestrictedTokenRepository", func() {
Expand Down
2 changes: 1 addition & 1 deletion auth/store/mongo/store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions auth/user_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion aws/api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion aws/aws_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 1 addition & 2 deletions blob/blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion blob/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions blob/errors_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion blob/service/api/v1/v1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading

0 comments on commit b8166fb

Please sign in to comment.