Common updates to better support Oura and work system

.ginkgo/templates/bootstrap

@@ -0,0 +1,11 @@
+package {{.Package}}
+
+import (
+	"testing"
+
+	"github.com/tidepool-org/platform/test"
+)
+
+func TestSuite(t *testing.T) {
+	test.Test(t)
+}

.ginkgo/templates/generate

@@ -0,0 +1,15 @@
+{{.BuildTags}}
+package {{.Package}}
+
+import (
+	{{.GinkgoImport}}
+	{{.GomegaImport}}
+	. "github.com/onsi/gomega/gstruct"
+
+	{{if .ImportPackage}}"{{.PackageImportPath}}"{{end}}
+	"github.com/tidepool-org/platform/test"
+)
+
+var _ = {{.GinkgoPackage}}Describe("{{.Subject}}", func() {
+	// TODO
+})

.gitignore

@@ -29,4 +29,5 @@ _tmp
 # Development
 .gvm_local
 .idea
+.vscode
 *.code-workspace

Makefile

@@ -49,6 +49,15 @@ GINKGO_FLAGS += --require-suite --poll-progress-after=10s --poll-progress-interv
 GINKGO_CI_WATCH_FLAGS += --randomize-all --succinct --fail-on-pending --cover --trace --race
 GINKGO_CI_FLAGS += $(GINKGO_CI_WATCH_FLAGS) --randomize-suites --keep-going
 
+ifdef TEST
+	TEST_PACKAGE=$(shell [ -d "$(TEST)" ] && echo "$(TEST)" || dirname "$(TEST)")
+	TEST_PACKAGE_NAME=$(notdir $(TEST_PACKAGE))
+	TEST_DIRECTORY=$(realpath $(TEST_PACKAGE))
+	TEST_FILE=$(notdir $(TEST))
+endif
+
+TEST_REPEAT ?= 0
+
 DOCKER_LOGIN_CMD ?= docker login
 DOCKER_BUILD_CMD ?= docker build
 DOCKER_PUSH_CMD ?= docker push
@@ -265,10 +274,15 @@ test-ginkgo: ginkgo
 	@cd $(ROOT_DIRECTORY) && \
 		. ./env.test.sh && GOWORK=off $(TIMING_CMD) ginkgo $(GINKGO_FLAGS) $${GOWORK_FLAGS:-} $(TEST)
 
+test-ginkgo-until-repeat: ginkgo
+	@echo "ginkgo $(GINKGO_FLAGS) --repeat $(TEST_REPEAT) $(TEST)"
+	@cd $(ROOT_DIRECTORY) && \
+		. ./env.test.sh && GOWORK=off ginkgo $(GINKGO_FLAGS) --repeat $(TEST_REPEAT) $${GOWORK_FLAGS:-} $(TEST)
+
 test-ginkgo-until-failure: ginkgo
-	@echo "ginkgo $(GINKGO_FLAGS) -untilItFails $(TEST)"
+	@echo "ginkgo $(GINKGO_FLAGS) --until-it-fails $(TEST)"
 	@cd $(ROOT_DIRECTORY) && \
-		. ./env.test.sh && GOWORK=off ginkgo $(GINKGO_FLAGS) -untilItFails $${GOWORK_FLAGS:-} $(TEST)
+		. ./env.test.sh && GOWORK=off ginkgo $(GINKGO_FLAGS) --until-it-fails $${GOWORK_FLAGS:-} $(TEST)
 
 test-ginkgo-watch: ginkgo
 	@echo "ginkgo watch $(GINKGO_FLAGS) $(TEST)"
@@ -280,10 +294,15 @@ ci-test-ginkgo: ginkgo
 	@cd $(ROOT_DIRECTORY) && \
 		. ./env.test.sh && GOWORK=off $(TIMING_CMD) ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) $${GOWORK_FLAGS:-} $(TEST)
 
+ci-test-ginkgo-repeat: ginkgo
+	@echo "ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) --repeat $(TEST_REPEAT) $(TEST)"
+	@cd $(ROOT_DIRECTORY) && \
+		. ./env.test.sh && GOWORK=off ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) --repeat $(TEST_REPEAT) $${GOWORK_FLAGS:-} $(TEST)
+
 ci-test-ginkgo-until-failure: ginkgo
-	@echo "ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) -untilItFails $(TEST)"
+	@echo "ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) --until-it-fails $(TEST)"
 	@cd $(ROOT_DIRECTORY) && \
-		. ./env.test.sh && GOWORK=off ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) -untilItFails $${GOWORK_FLAGS:-} $(TEST)
+		. ./env.test.sh && GOWORK=off ginkgo $(GINKGO_FLAGS) $(GINKGO_CI_FLAGS) --until-it-fails $${GOWORK_FLAGS:-} $(TEST)
 
 ci-test-ginkgo-watch: ginkgo
 	@echo "ginkgo watch $(GINKGO_FLAGS) $(GINKGO_CI_WATCH_FLAGS) $(TEST)"
@@ -300,6 +319,17 @@ ci-test-go: GOTEST_FLAGS += -count=1 -race -shuffle=on -cover
 ci-test-go: GOTEST_PKGS = ./...
 ci-test-go: test-go
 
+ginkgo-bootstrap: ginkgo
+	@echo "ginkgo bootstrap $(TEST_PACKAGE)"
+	@cd "$(TEST_DIRECTORY)" && \
+		[ -f "$(TEST_PACKAGE_NAME)_suite_test.go" ] || \
+		ginkgo bootstrap --template "$(ROOT_DIRECTORY)/.ginkgo/templates/bootstrap"
+
+ginkgo-generate: ginkgo-bootstrap
+	@echo "ginkgo generate $(TEST)"
+	@cd "$(TEST_DIRECTORY)" && \
+		ginkgo generate --template "$(ROOT_DIRECTORY)/.ginkgo/templates/generate" $(TEST_FILE)
+
 service-build:
 ifdef SERVICE
 	@$(MAKE) build BUILD=$${SERVICE}

alerts/config_test.go

@@ -72,7 +72,7 @@ var _ = Describe("Config", func() {
   }
 }`, mockUserID1, mockUserID2, mockUploadID)
 		conf := &Config{}
-		err := request.DecodeObject(context.Background(), nil, buf, conf)
+		err := request.DecodeStream(context.Background(), nil, buf, conf)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(conf.UserID).To(Equal(mockUserID1))
 		Expect(conf.FollowedUserID).To(Equal(mockUserID2))
@@ -358,7 +358,7 @@ var _ = Describe("Config", func() {
 		It("validates threshold units", func() {
 			buf := buff(`{"urgentLow": {"threshold": {"units":"%s","value":42}}`, "garbage")
 			threshold := &Threshold{}
-			err := request.DecodeObject(context.Background(), nil, buf, threshold)
+			err := request.DecodeStream(context.Background(), nil, buf, threshold)
 			Expect(err).To(MatchError("json is malformed"))
 		})
 		It("validates repeat minutes (negative)", func() {
@@ -376,7 +376,7 @@ var _ = Describe("Config", func() {
   }
 }`, mockUserID1, mockUserID2, mockUploadID, glucose.MgdL)
 			cfg := &Config{}
-			err := request.DecodeObject(context.Background(), nil, buf, cfg)
+			err := request.DecodeStream(context.Background(), nil, buf, cfg)
 			Expect(err).To(MatchError("value -11m0s is not greater than or equal to 15m0s"))
 		})
 		It("validates repeat minutes (string)", func() {
@@ -393,7 +393,7 @@ var _ = Describe("Config", func() {
   }
 }`, mockUserID1, mockUserID2, glucose.MgdL)
 			cfg := &Config{}
-			err := request.DecodeObject(context.Background(), nil, buf, cfg)
+			err := request.DecodeStream(context.Background(), nil, buf, cfg)
 			Expect(err).To(MatchError("json is malformed"))
 		})
 	})
@@ -414,7 +414,7 @@ var _ = Describe("Config", func() {
   }
 }`, mockUserID1, mockUserID2, mockUploadID)
 			conf := &Config{}
-			err := request.DecodeObject(context.Background(), nil, buf, conf)
+			err := request.DecodeStream(context.Background(), nil, buf, conf)
 			Expect(err).To(Succeed())
 			Expect(conf.Low.Repeat).To(Equal(DurationMinutes(0)))
 		})
@@ -458,33 +458,33 @@ var _ = Describe("Threshold", func() {
 	It("accepts mg/dL", func() {
 		buf := buff(`{"units":"%s","value":42}`, glucose.MgdL)
 		threshold := &Threshold{}
-		err := request.DecodeObject(context.Background(), nil, buf, threshold)
+		err := request.DecodeStream(context.Background(), nil, buf, threshold)
 		Expect(err).To(BeNil())
 		Expect(threshold.Value).To(Equal(42.0))
 		Expect(threshold.Units).To(Equal(glucose.MgdL))
 	})
 	It("accepts mmol/L", func() {
 		buf := buff(`{"units":"%s","value":42}`, glucose.MmolL)
 		threshold := &Threshold{}
-		err := request.DecodeObject(context.Background(), nil, buf, threshold)
+		err := request.DecodeStream(context.Background(), nil, buf, threshold)
 		Expect(err).To(BeNil())
 		Expect(threshold.Value).To(Equal(42.0))
 		Expect(threshold.Units).To(Equal(glucose.MmolL))
 	})
 	It("rejects lb/gal", func() {
 		buf := buff(`{"units":"%s","value":42}`, "lb/gal")
-		err := request.DecodeObject(context.Background(), nil, buf, &Threshold{})
+		err := request.DecodeStream(context.Background(), nil, buf, &Threshold{})
 		Expect(err).Should(HaveOccurred())
 	})
 	It("rejects blank units", func() {
 		buf := buff(`{"units":"","value":42}`)
-		err := request.DecodeObject(context.Background(), nil, buf, &Threshold{})
+		err := request.DecodeStream(context.Background(), nil, buf, &Threshold{})
 		Expect(err).Should(HaveOccurred())
 	})
 	It("is case-sensitive with respect to Units", func() {
 		badUnits := strings.ToUpper(glucose.MmolL)
 		buf := buff(`{"units":"%s","value":42}`, badUnits)
-		err := request.DecodeObject(context.Background(), nil, buf, &Threshold{})
+		err := request.DecodeStream(context.Background(), nil, buf, &Threshold{})
 		Expect(err).Should(HaveOccurred())
 	})
 

auth/auth_test.go

@@ -55,7 +55,7 @@ var _ = Describe("Client", func() {
 			serverSessionTokenProviderController.Finish()
 		})
 
-		It("returs nil if the context is nil", func() {
+		It("returns nil if the context is nil", func() {
 			Expect(auth.ServerSessionTokenProviderFromContext(nil)).To(BeNil())
 		})
 

auth/token.go

@@ -111,6 +111,10 @@ func (o *OAuthToken) Refreshed(rawToken *oauth2.Token) (*OAuthToken, error) {
 	return &refreshed, nil
 }
 
+func (o *OAuthToken) IsExpired() bool {
+	return o.ExpirationTime.Before(time.Now())
+}
+
 func (o *OAuthToken) Expired() *OAuthToken {
 	return &OAuthToken{
 		AccessToken:    o.AccessToken,

auth/token_test.go

@@ -209,7 +209,21 @@ var _ = Describe("OAuthToken", func() {
 			})
 		})
 
-		Context("Expire", func() {
+		Context("IsExpired", func() {
+			It("returns false if the expiration time is in the future", func() {
+				token := authTest.RandomToken()
+				token.ExpirationTime = time.Now().Add(time.Second)
+				Expect(token.IsExpired()).To(BeFalse())
+			})
+
+			It("returns true if the expiration time is in the past", func() {
+				token := authTest.RandomToken()
+				token.ExpirationTime = time.Now().Add(-time.Second)
+				Expect(token.IsExpired()).To(BeTrue())
+			})
+		})
+
+		Context("Expired", func() {
 			It("sets ExpirationTime to the past", func() {
 				token := authTest.RandomToken().Expired()
 				Expect(token.ExpirationTime).To(BeTemporally("<", time.Now()))

client/client.go

@@ -118,7 +118,7 @@ func (c *Client) RequestDataWithHTTPClient(ctx context.Context, method string, u
 		return nil
 	}
 
-	return request.DecodeObject(ctx, structure.NewPointerSource(), body, responseBody)
+	return request.DecodeStream(ctx, structure.NewPointerSource(), body, responseBody)
 }
 
 func (c *Client) createRequest(ctx context.Context, method string, url string, mutators []request.RequestMutator, requestBody interface{}) (*http.Request, error) {