fix: remove /storage from the path (#83)

nhost · May 24, 2022 · b4b4fb4 · b4b4fb4
1 parent de48ecd
commit b4b4fb4
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 21 deletions.
diff --git a/client/delete_file_test.go b/client/delete_file_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package client_test
@@ -14,7 +15,7 @@ import (
 )
 
 func TestDeleteFile(t *testing.T) {
-	baseURL := "http://localhost:8000/v1/storage"
+	baseURL := "http://localhost:8000/v1"
 	cl := client.New(baseURL, os.Getenv("HASURA_AUTH_BEARER"))
 
 	id1 := uuid.NewString()

diff --git a/client/get_file_information_test.go b/client/get_file_information_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 func TestGetFileInformation(t *testing.T) {
-	baseURL := "http://localhost:8000/v1/storage"
+	baseURL := "http://localhost:8000/v1"
 	cl := client.New(baseURL, os.Getenv("HASURA_AUTH_BEARER"))
 
 	files := []fileHelper{

diff --git a/client/get_file_presignedurl_test.go b/client/get_file_presignedurl_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package client_test
@@ -23,7 +24,7 @@ func EquateStrings(name string, expected string) cmp.Option {
 }
 
 func TestGetFilePresignedURL(t *testing.T) {
-	baseURL := "http://localhost:8000/v1/storage"
+	baseURL := "http://localhost:8000/v1"
 	cl := client.New(baseURL, os.Getenv("HASURA_AUTH_BEARER"))
 
 	files := []fileHelper{

diff --git a/client/get_file_test.go b/client/get_file_test.go
@@ -19,7 +19,7 @@ import (
 )
 
 func TestGetFile(t *testing.T) {
-	baseURL := "http://localhost:8000/v1/storage"
+	baseURL := "http://localhost:8000/v1"
 	cl := client.New(baseURL, os.Getenv("HASURA_AUTH_BEARER"))
 
 	files := []fileHelper{

diff --git a/client/update_file_test.go b/client/update_file_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package client_test
@@ -31,7 +32,7 @@ func updateFile(
 }
 
 func TestUpdateFile(t *testing.T) {
-	baseURL := "http://localhost:8000/v1/storage"
+	baseURL := "http://localhost:8000/v1"
 	cl := client.New(baseURL, os.Getenv("HASURA_AUTH_BEARER"))
 
 	id1 := uuid.NewString()

diff --git a/client/upload_file_test.go b/client/upload_file_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package client_test
@@ -41,7 +42,7 @@ func uploadFiles(
 }
 
 func TestUploadFile(t *testing.T) {
-	baseURL := "http://localhost:8000/v1/storage"
+	baseURL := "http://localhost:8000/v1"
 	cl := client.New(baseURL, os.Getenv("HASURA_AUTH_BEARER"))
 
 	id1 := uuid.NewString()

diff --git a/controller/controller.go b/controller/controller.go
@@ -132,7 +132,7 @@ func (ctrl *Controller) SetupRouter(trustedProxies []string, middleware ...gin.H
 
 	router.GET("/healthz", ctrl.Health)
 
-	apiRoot := router.Group("/v1/storage")
+	apiRoot := router.Group("/v1")
 	{
 		apiRoot.GET("/openapi.yaml", ctrl.OpenAPI)
 		apiRoot.GET("/version", ctrl.Version)

diff --git a/controller/delete_broken_metadata_test.go b/controller/delete_broken_metadata_test.go
@@ -107,7 +107,7 @@ func TestDeleteBrokenMetadata(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/storage/ops/delete-broken-metadata", nil)
+			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/ops/delete-broken-metadata", nil)
 
 			router.ServeHTTP(responseRecorder, req)
 

diff --git a/controller/delete_file_test.go b/controller/delete_file_test.go
@@ -84,7 +84,7 @@ func TestDeleteFile(t *testing.T) {
 			req, _ := http.NewRequestWithContext(
 				context.Background(),
 				"DELETE",
-				"/v1/storage/files/55af1e60-0f28-454e-885e-ea6aab2bb288",
+				"/v1/files/55af1e60-0f28-454e-885e-ea6aab2bb288",
 				nil,
 			)
 

diff --git a/controller/delete_orphans_test.go b/controller/delete_orphans_test.go
@@ -81,7 +81,7 @@ func TestDeleteOrphans(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/storage/ops/delete-orphans", nil)
+			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/ops/delete-orphans", nil)
 
 			router.ServeHTTP(responseRecorder, req)
 

diff --git a/controller/get_file_information_test.go b/controller/get_file_information_test.go
@@ -145,7 +145,7 @@ func TestGetFileInfo(t *testing.T) {
 			req, _ := http.NewRequestWithContext(
 				context.Background(),
 				"HEAD",
-				"/v1/storage/files/55af1e60-0f28-454e-885e-ea6aab2bb288",
+				"/v1/files/55af1e60-0f28-454e-885e-ea6aab2bb288",
 				nil,
 			)
 

diff --git a/controller/get_file_presigned_url.go b/controller/get_file_presigned_url.go
@@ -47,7 +47,7 @@ func (ctrl *Controller) getFilePresignedURL(ctx *gin.Context) (GetFilePresignedU
 			apiErr.ExtendError(fmt.Sprintf("problem creating presigned URL for file %s", fileMetadata.Name))
 	}
 
-	url := fmt.Sprintf("%s/v1/storage/files/%s/presignedurl/content?%s", ctrl.publicURL, fileMetadata.ID, signature)
+	url := fmt.Sprintf("%s/v1/files/%s/presignedurl/content?%s", ctrl.publicURL, fileMetadata.ID, signature)
 	return GetFilePresignedURLResponse{nil, url, bucketMetadata.DownloadExpiration}, nil
 }
 

diff --git a/controller/get_file_presigned_url_test.go b/controller/get_file_presigned_url_test.go
@@ -99,7 +99,7 @@ func TestGetFilePresignedURL(t *testing.T) {
 			req, err := http.NewRequestWithContext(
 				context.Background(),
 				"GET",
-				"/v1/storage/files/55af1e60-0f28-454e-885e-ea6aab2bb288/presignedurl",
+				"/v1/files/55af1e60-0f28-454e-885e-ea6aab2bb288/presignedurl",
 				nil,
 			)
 			if err != nil {
@@ -121,7 +121,7 @@ func TestGetFilePresignedURL(t *testing.T) {
 
 			if tc.fileFound {
 				assert(t, resp, &controller.GetFilePresignedURLResponse{
-					URL:        "http://asd/v1/storage/files/55af1e60-0f28-454e-885e-ea6aab2bb288/presignedurl/content?this-is-the-signature", // nolint: lll
+					URL:        "http://asd/v1/files/55af1e60-0f28-454e-885e-ea6aab2bb288/presignedurl/content?this-is-the-signature", // nolint: lll
 					Expiration: 30,
 				})
 			} else {

diff --git a/controller/get_file_test.go b/controller/get_file_test.go
@@ -85,7 +85,7 @@ func TestGetFile(t *testing.T) {
 			req, _ := http.NewRequestWithContext(
 				context.Background(),
 				"GET",
-				"/v1/storage/files/55af1e60-0f28-454e-885e-ea6aab2bb288",
+				"/v1/files/55af1e60-0f28-454e-885e-ea6aab2bb288",
 				nil,
 			)
 

diff --git a/controller/list_broken_metadata_test.go b/controller/list_broken_metadata_test.go
@@ -100,7 +100,7 @@ func TestListBrokenMetadata(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/storage/ops/list-broken-metadata", nil)
+			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/ops/list-broken-metadata", nil)
 
 			router.ServeHTTP(responseRecorder, req)
 

diff --git a/controller/list_not_uploaded_test.go b/controller/list_not_uploaded_test.go
@@ -88,7 +88,7 @@ func TestListNotUploaded(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/storage/ops/list-not-uploaded", nil)
+			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/ops/list-not-uploaded", nil)
 
 			router.ServeHTTP(responseRecorder, req)
 

diff --git a/controller/list_orphans_test.go b/controller/list_orphans_test.go
@@ -78,7 +78,7 @@ func TestListOrphans(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/storage/ops/list-orphans", nil)
+			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/ops/list-orphans", nil)
 
 			router.ServeHTTP(responseRecorder, req)
 

diff --git a/controller/openapi.yaml b/controller/openapi.yaml
@@ -9,7 +9,7 @@ info:
     name: LICENSE-TBD
     url: https://LICENSE-TBD
 servers:
-  - url: http://{domain}:{port}/v1/storage
+  - url: http://{domain}:{port}/v1
     description: The development API server
     variables:
       domain:

diff --git a/controller/update_file_test.go b/controller/update_file_test.go
@@ -154,7 +154,7 @@ func TestUpdateFile(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "PUT", "/v1/storage/files/"+file.md.ID, body)
+			req, _ := http.NewRequestWithContext(context.Background(), "PUT", "/v1/files/"+file.md.ID, body)
 
 			req.Header.Add("x-hasura-user-id", "some-valid-uuid")
 

diff --git a/controller/upload_file_test.go b/controller/upload_file_test.go
@@ -177,7 +177,7 @@ func TestUploadFile(t *testing.T) {
 
 			responseRecorder := httptest.NewRecorder()
 
-			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/storage/files/", body)
+			req, _ := http.NewRequestWithContext(context.Background(), "POST", "/v1/files/", body)
 
 			req.Header.Set("Content-Type", contentType)