Merge pull request #708 from tidepool-org/tk/fix-device-logs-route

Change device logs route to device_logs for consistency

Author: toddkazakov

blob/client/client.go

@@ -121,7 +121,7 @@ func (c *Client) CreateDeviceLogs(ctx context.Context, userID string, content *b
 		mutators = append(mutators, request.NewHeaderMutator("X-Logs-End-At-Time", content.EndAt.Format(time.RFC3339)))
 	}
 
-	url := c.client.ConstructURL("v1", "users", userID, "device-logs")
+	url := c.client.ConstructURL("v1", "users", userID, "device_logs")
 	result := &blob.DeviceLogsBlob{}
 	if err := c.client.RequestData(ctx, http.MethodPost, url, mutators, content.Body, result); err != nil {
 		return nil, err

blob/service/api/v1/v1.go

@@ -44,8 +44,8 @@ func (r *Router) Routes() []*rest.Route {
 		rest.Post("/v1/users/:userId/blobs", r.Create),
 		rest.Delete("/v1/users/:userId/blobs", r.DeleteAll),
 
-		rest.Post("/v1/users/:userId/device-logs", r.CreateDeviceLogs),
-		rest.Get("/v1/users/:userId/device-logs", r.ListDeviceLogs),
+		rest.Post("/v1/users/:userId/device_logs", r.CreateDeviceLogs),
+		rest.Get("/v1/users/:userId/device_logs", r.ListDeviceLogs),
 
 		rest.Get("/v1/blobs/:id", r.Get),
 		rest.Get("/v1/blobs/:id/content", r.GetContent),

blob/service/api/v1/v1_test.go

@@ -81,8 +81,8 @@ var _ = Describe("V1", func() {
 					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodGet), "PathExp": Equal("/v1/users/:userId/blobs")})),
 					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodPost), "PathExp": Equal("/v1/users/:userId/blobs")})),
 					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodDelete), "PathExp": Equal("/v1/users/:userId/blobs")})),
-					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodPost), "PathExp": Equal("/v1/users/:userId/device-logs")})),
-					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodGet), "PathExp": Equal("/v1/users/:userId/device-logs")})),
+					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodPost), "PathExp": Equal("/v1/users/:userId/device_logs")})),
+					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodGet), "PathExp": Equal("/v1/users/:userId/device_logs")})),
 					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodGet), "PathExp": Equal("/v1/blobs/:id")})),
 					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodGet), "PathExp": Equal("/v1/blobs/:id/content")})),
 					PointTo(MatchFields(IgnoreExtras, Fields{"HttpMethod": Equal(http.MethodDelete), "PathExp": Equal("/v1/blobs/:id")})),
@@ -326,7 +326,7 @@ var _ = Describe("V1", func() {
 				Context("ListDeviceLogs", func() {
 					BeforeEach(func() {
 						req.Method = http.MethodGet
-						req.URL.Path = fmt.Sprintf("/v1/users/%s/device-logs", userID)
+						req.URL.Path = fmt.Sprintf("/v1/users/%s/device_logs", userID)
 					})
 
 					It("panics when the response is missing", func() {
@@ -593,7 +593,7 @@ var _ = Describe("V1", func() {
 				Context("CreateDeviceLogs", func() {
 					BeforeEach(func() {
 						req.Method = http.MethodPost
-						req.URL.Path = fmt.Sprintf("/v1/users/%s/device-logs", userID)
+						req.URL.Path = fmt.Sprintf("/v1/users/%s/device_logs", userID)
 					})
 
 					It("panics when the response is missing", func() {
@@ -615,7 +615,7 @@ var _ = Describe("V1", func() {
 
 						When("the path does not contain a user id", func() {
 							BeforeEach(func() {
-								req.URL.Path = "/v1/users//device-logs"
+								req.URL.Path = "/v1/users//device_logs"
 							})
 
 							It("responds with bad request and expected error in body", func() {
@@ -628,7 +628,7 @@ var _ = Describe("V1", func() {
 
 						When("the path contains an invalid user id", func() {
 							BeforeEach(func() {
-								req.URL.Path = "/v1/users/invalid/device-logs"
+								req.URL.Path = "/v1/users/invalid/device_logs"
 							})
 
 							It("responds with bad request and expected error in body", func() {

blob/service/client/client_test.go

@@ -396,7 +396,7 @@ var _ = Describe("Client", func() {
 					Expect(result).To(BeNil())
 				})
 
-				When("the device-logs blob is created", func() {
+				When("the device_logs blob is created", func() {
 					AfterEach(func() {
 						structuredCreate := blobStoreStructured.NewCreate()
 						structuredCreate.MediaType = content.MediaType