From 2461b4a7b887f54c884013afec98c21c0aeddd97 Mon Sep 17 00:00:00 2001 From: Harshit Aggarwal Date: Tue, 24 Nov 2020 18:32:24 +0530 Subject: [PATCH 1/6] enabling http --- .../register-azure/src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/provider/register-azure/src/main/resources/application.properties b/provider/register-azure/src/main/resources/application.properties index a9ea1434..76ee8e89 100644 --- a/provider/register-azure/src/main/resources/application.properties +++ b/provider/register-azure/src/main/resources/application.properties @@ -50,5 +50,6 @@ INTEGRATION_TEST_AUDIENCES= CRON_JOB_EXPECTED_IP=0:0:0:0:0:0:0:1 SUBSCRIBER_PRIVATE_KEY_ID= ENVIRONMENT=LOCAL +ACCEPT_HTTP=true management.health.defaults.enabled=false \ No newline at end of file -- GitLab From 55851dfcec23ae5885e439b60dd812a30be3a1c6 Mon Sep 17 00:00:00 2001 From: komakkar Date: Tue, 24 Nov 2020 19:20:55 +0530 Subject: [PATCH 2/6] taking the same in deployment.yaml --- devops/azure/chart/templates/deployment.yaml | 2 ++ .../register-azure/src/main/resources/application.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index fd222fc7..94a23590 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -96,3 +96,5 @@ spec: value: https://haaggarw-eventgrid-viewer.azurewebsites.net/api/updates - name: SUBSCRIBER_SECRET value: "395f1b05e95171d7c0dde0b19fd6cf" + - name: ACCEPT_HTTP + value: true diff --git a/provider/register-azure/src/main/resources/application.properties b/provider/register-azure/src/main/resources/application.properties index 76ee8e89..9de511c6 100644 --- a/provider/register-azure/src/main/resources/application.properties +++ b/provider/register-azure/src/main/resources/application.properties @@ -50,6 +50,6 @@ INTEGRATION_TEST_AUDIENCES= CRON_JOB_EXPECTED_IP=0:0:0:0:0:0:0:1 SUBSCRIBER_PRIVATE_KEY_ID= ENVIRONMENT=LOCAL -ACCEPT_HTTP=true + management.health.defaults.enabled=false \ No newline at end of file -- GitLab From 12222ed386f63409bbff5b131141c54f6fd813ee Mon Sep 17 00:00:00 2001 From: komakkar Date: Tue, 24 Nov 2020 19:22:28 +0530 Subject: [PATCH 3/6] taking the same in deployment.yaml --- devops/azure/chart/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 94a23590..26671a2e 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -96,5 +96,5 @@ spec: value: https://haaggarw-eventgrid-viewer.azurewebsites.net/api/updates - name: SUBSCRIBER_SECRET value: "395f1b05e95171d7c0dde0b19fd6cf" - - name: ACCEPT_HTTP - value: true + - name: ACCEPT_HTTP # TEMPORARY UNTIL HTTPS + value: "true" \ No newline at end of file -- GitLab From 39891ca72fdc98e5466a53d5aa8299cd7369b6e8 Mon Sep 17 00:00:00 2001 From: komakkar Date: Thu, 26 Nov 2020 17:46:50 +0530 Subject: [PATCH 4/6] decoupling chart name and context path --- devops/azure/chart/templates/osdu-istio-policy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/osdu-istio-policy.yaml b/devops/azure/chart/templates/osdu-istio-policy.yaml index e5820380..ab785dfb 100644 --- a/devops/azure/chart/templates/osdu-istio-policy.yaml +++ b/devops/azure/chart/templates/osdu-istio-policy.yaml @@ -29,4 +29,4 @@ spec: to: - operation: notPaths: ["/","*/swagger-resources","*/swagger", - "/api/{{ .Chart.Name }}/v1/swagger-resources/*","*/swagger-ui.html","*/actuator/health","/api/{{ .Chart.Name }}/v1/test/challenge/*"] \ No newline at end of file + "/api/register/v1/swagger-resources/*","*/swagger-ui.html","*/actuator/health","/api/register/v1/test/challenge/*"] \ No newline at end of file -- GitLab From dd7f3fc71964378e9441d27104369ca58208fbc3 Mon Sep 17 00:00:00 2001 From: komakkar Date: Thu, 26 Nov 2020 22:23:47 +0530 Subject: [PATCH 5/6] undoing stray changes --- .../register-azure/src/main/resources/application.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/provider/register-azure/src/main/resources/application.properties b/provider/register-azure/src/main/resources/application.properties index 9de511c6..4df41cce 100644 --- a/provider/register-azure/src/main/resources/application.properties +++ b/provider/register-azure/src/main/resources/application.properties @@ -51,5 +51,4 @@ CRON_JOB_EXPECTED_IP=0:0:0:0:0:0:0:1 SUBSCRIBER_PRIVATE_KEY_ID= ENVIRONMENT=LOCAL - -management.health.defaults.enabled=false \ No newline at end of file +management.health.defaults.enabled=false -- GitLab From 373121ea9d13e8581b285c8a33116ca1334dcb32 Mon Sep 17 00:00:00 2001 From: komakkar Date: Thu, 26 Nov 2020 22:25:15 +0530 Subject: [PATCH 6/6] undoing stray changes --- .../register-azure/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider/register-azure/src/main/resources/application.properties b/provider/register-azure/src/main/resources/application.properties index 4df41cce..a9ea1434 100644 --- a/provider/register-azure/src/main/resources/application.properties +++ b/provider/register-azure/src/main/resources/application.properties @@ -51,4 +51,4 @@ CRON_JOB_EXPECTED_IP=0:0:0:0:0:0:0:1 SUBSCRIBER_PRIVATE_KEY_ID= ENVIRONMENT=LOCAL -management.health.defaults.enabled=false +management.health.defaults.enabled=false \ No newline at end of file -- GitLab