From f50c9b1f7c911224f4363e56d2d3913b48f12800 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Tue, 1 Jun 2021 11:21:52 -0400 Subject: [PATCH 1/4] Remove /hello and add file upload endpoints for ingest-api --- api_endpoints.dev.json | 32 ++++++++++++++++++++++++-------- api_endpoints.localhost.json | 32 ++++++++++++++++++++++++-------- api_endpoints.prod.json | 32 ++++++++++++++++++++++++-------- api_endpoints.stage.json | 32 ++++++++++++++++++++++++-------- api_endpoints.test.json | 32 ++++++++++++++++++++++++-------- 5 files changed, 120 insertions(+), 40 deletions(-) diff --git a/api_endpoints.dev.json b/api_endpoints.dev.json index c577612..3779d96 100644 --- a/api_endpoints.dev.json +++ b/api_endpoints.dev.json @@ -241,14 +241,6 @@ "endpoint": "/status", "auth": false }, - { - "method": "GET", - "endpoint": "/hello", - "auth": true, - "groups": [ - "5777527e-ec11-11e8-ab41-0af86edb4424" - ] - }, { "method": "GET", "endpoint": "/datasets", @@ -396,6 +388,30 @@ "endpoint": "/logout", "auth": false }, + { + "method": "POST", + "endpoint": "/file-upload", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-commit", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-remove", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, { "method": "POST", "endpoint": "/uploads", diff --git a/api_endpoints.localhost.json b/api_endpoints.localhost.json index 51a600b..806c288 100644 --- a/api_endpoints.localhost.json +++ b/api_endpoints.localhost.json @@ -241,14 +241,6 @@ "endpoint": "/status", "auth": false }, - { - "method": "GET", - "endpoint": "/hello", - "auth": true, - "groups": [ - "5777527e-ec11-11e8-ab41-0af86edb4424" - ] - }, { "method": "GET", "endpoint": "/datasets", @@ -396,6 +388,30 @@ "endpoint": "/logout", "auth": false }, + { + "method": "POST", + "endpoint": "/file-upload", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-commit", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-remove", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, { "method": "POST", "endpoint": "/uploads", diff --git a/api_endpoints.prod.json b/api_endpoints.prod.json index 449f736..13b2349 100644 --- a/api_endpoints.prod.json +++ b/api_endpoints.prod.json @@ -241,14 +241,6 @@ "endpoint": "/status", "auth": false }, - { - "method": "GET", - "endpoint": "/hello", - "auth": true, - "groups": [ - "5777527e-ec11-11e8-ab41-0af86edb4424" - ] - }, { "method": "GET", "endpoint": "/datasets", @@ -396,6 +388,30 @@ "endpoint": "/logout", "auth": false }, + { + "method": "POST", + "endpoint": "/file-upload", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-commit", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-remove", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, { "method": "POST", "endpoint": "/uploads", diff --git a/api_endpoints.stage.json b/api_endpoints.stage.json index 9a548b6..4970f4a 100644 --- a/api_endpoints.stage.json +++ b/api_endpoints.stage.json @@ -241,14 +241,6 @@ "endpoint": "/status", "auth": false }, - { - "method": "GET", - "endpoint": "/hello", - "auth": true, - "groups": [ - "5777527e-ec11-11e8-ab41-0af86edb4424" - ] - }, { "method": "GET", "endpoint": "/datasets", @@ -396,6 +388,30 @@ "endpoint": "/logout", "auth": false }, + { + "method": "POST", + "endpoint": "/file-upload", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-commit", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-remove", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, { "method": "POST", "endpoint": "/uploads", diff --git a/api_endpoints.test.json b/api_endpoints.test.json index e934e38..f57ebf1 100644 --- a/api_endpoints.test.json +++ b/api_endpoints.test.json @@ -241,14 +241,6 @@ "endpoint": "/status", "auth": false }, - { - "method": "GET", - "endpoint": "/hello", - "auth": true, - "groups": [ - "5777527e-ec11-11e8-ab41-0af86edb4424" - ] - }, { "method": "GET", "endpoint": "/datasets", @@ -396,6 +388,30 @@ "endpoint": "/logout", "auth": false }, + { + "method": "POST", + "endpoint": "/file-upload", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-commit", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, + { + "method": "POST", + "endpoint": "/file-remove", + "auth": true, + "groups": [ + "5777527e-ec11-11e8-ab41-0af86edb4424" + ] + }, { "method": "POST", "endpoint": "/uploads", From 535e14c9399cc8d22ecd9cc03661cc6381ecb721 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Fri, 4 Jun 2021 13:39:04 -0400 Subject: [PATCH 2/4] Remove file upload restriction from entity-api --- nginx/conf.d-dev/entity-api.conf | 3 --- nginx/conf.d-localhost/entity-api.conf | 3 --- nginx/conf.d-prod/entity-api.conf | 3 --- nginx/conf.d-stage/entity-api.conf | 3 --- nginx/conf.d-test/entity-api.conf | 3 --- 5 files changed, 15 deletions(-) diff --git a/nginx/conf.d-dev/entity-api.conf b/nginx/conf.d-dev/entity-api.conf index 90e300c..7399e29 100644 --- a/nginx/conf.d-dev/entity-api.conf +++ b/nginx/conf.d-dev/entity-api.conf @@ -32,9 +32,6 @@ server { access_log /usr/src/app/log/nginx_access_entity-api.log; error_log /usr/src/app/log/nginx_error_entity-api.log warn; - # Set file upload size liit to 10M, default is 1M. - client_max_body_size 10M; - # No auth_request for favicon location = /favicon.ico { alias /usr/share/nginx/html/favicon.ico; diff --git a/nginx/conf.d-localhost/entity-api.conf b/nginx/conf.d-localhost/entity-api.conf index 14c09ab..9338780 100644 --- a/nginx/conf.d-localhost/entity-api.conf +++ b/nginx/conf.d-localhost/entity-api.conf @@ -15,9 +15,6 @@ server { # Logging to the mounted volume for outside container access access_log /usr/src/app/log/nginx_access_entity-api.log; error_log /usr/src/app/log/nginx_error_entity-api.log warn; - - # Set file upload size liit to 10M, default is 1M. - client_max_body_size 10M; # No auth_request for favicon location = /favicon.ico { diff --git a/nginx/conf.d-prod/entity-api.conf b/nginx/conf.d-prod/entity-api.conf index 4acfd79..825211f 100644 --- a/nginx/conf.d-prod/entity-api.conf +++ b/nginx/conf.d-prod/entity-api.conf @@ -32,9 +32,6 @@ server { access_log /usr/src/app/log/nginx_access_entity-api.log; error_log /usr/src/app/log/nginx_error_entity-api.log warn; - # Set file upload size liit to 10M, default is 1M. - client_max_body_size 10M; - # No auth_request for favicon location = /favicon.ico { alias /usr/share/nginx/html/favicon.ico; diff --git a/nginx/conf.d-stage/entity-api.conf b/nginx/conf.d-stage/entity-api.conf index a1246a3..078d6f5 100644 --- a/nginx/conf.d-stage/entity-api.conf +++ b/nginx/conf.d-stage/entity-api.conf @@ -32,9 +32,6 @@ server { access_log /usr/src/app/log/nginx_access_entity-api.log; error_log /usr/src/app/log/nginx_error_entity-api.log warn; - # Set file upload size liit to 10M, default is 1M. - client_max_body_size 10M; - # No auth_request for favicon location = /favicon.ico { alias /usr/share/nginx/html/favicon.ico; diff --git a/nginx/conf.d-test/entity-api.conf b/nginx/conf.d-test/entity-api.conf index a99e8c2..b9c96bd 100644 --- a/nginx/conf.d-test/entity-api.conf +++ b/nginx/conf.d-test/entity-api.conf @@ -32,9 +32,6 @@ server { access_log /usr/src/app/log/nginx_access_entity-api.log; error_log /usr/src/app/log/nginx_error_entity-api.log warn; - # Set file upload size liit to 10M, default is 1M. - client_max_body_size 10M; - # No auth_request for favicon location = /favicon.ico { alias /usr/share/nginx/html/favicon.ico; From 3d63804f326b062b2fe70df53ddeb6dd67c4a652 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Fri, 4 Jun 2021 13:40:43 -0400 Subject: [PATCH 3/4] File upload 10M for ingest-api localhost --- nginx/conf.d-localhost/ingest-api.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/conf.d-localhost/ingest-api.conf b/nginx/conf.d-localhost/ingest-api.conf index d9a5644..30cd8bc 100644 --- a/nginx/conf.d-localhost/ingest-api.conf +++ b/nginx/conf.d-localhost/ingest-api.conf @@ -16,8 +16,8 @@ server { access_log /usr/src/app/log/nginx_access_ingest-api.log; error_log /usr/src/app/log/nginx_error_ingest-api.log warn; - # Allows file uploads up to 500 megabytes - client_max_body_size 500M; + # Set file upload size liit to 10M, default is 1M. + client_max_body_size 10M; # No auth_request for favicon location = /favicon.ico { From 0b078ce10172526a8e53941c38f5f5b56ecb3879 Mon Sep 17 00:00:00 2001 From: "Zhou (Joe) Yuan" Date: Mon, 7 Jun 2021 13:35:15 -0400 Subject: [PATCH 4/4] Bump version to 2.0.9 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 815e68d..09843e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.8 +2.0.9