Merge pull request #64 from Opetushallitus/fix/oaipmh-path

Change oaipmh service basepath to meta/oaipmh
Opetushallitus · Jan 21, 2025 · abd17a7 · abd17a7
2 parents d655152 + a9e819a
commit abd17a7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/aoe-data-services/oaipmh-provider/src/main/resources/application.properties b/aoe-data-services/oaipmh-provider/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=8001
-server.servlet.context-path=/rest
+server.servlet.context-path=/meta
 server.servlet.register-default-servlet=true
 spring.profiles.active=prod
 

diff --git a/aoe-infra/bin/infra.ts b/aoe-infra/bin/infra.ts
@@ -397,14 +397,19 @@ if (environmentName === 'dev' || environmentName === 'qa' || environmentName ===
     minimumCount: environmentConfig.services.data_services.min_count,
     maximumCount: environmentConfig.services.data_services.max_count,
     cpuArchitecture: CpuArchitecture.X86_64,
-    env_vars: environmentConfig.services.data_services.env_vars,
+    env_vars: {
+      ...environmentConfig.services.data_services.env_vars,
+      ...{
+        AOE_IDENTIFY_BASEURL: `https://${domain}/meta/oaipmh`
+      }
+    },
     parameter_store_secrets: [],
     secrets_manager_secrets: [],
     utilityAccountId: utilityAccountId,
     alb: Alb.alb,
     listener: Alb.albListener,
-    listenerPathPatterns: ['/rest/oaipmh*'],
-    healthCheckPath: '/rest/health',
+    listenerPathPatterns: ['/meta/oaipmh*'],
+    healthCheckPath: '/meta/health',
     healthCheckGracePeriod: 180,
     healthCheckInterval: 5,
     healthCheckTimeout: 2,

diff --git a/aoe-infra/environments/dev.json b/aoe-infra/environments/dev.json
@@ -51,7 +51,7 @@
             "memory_limit": "1024",
             "min_count": 1,
             "max_count": 1,
-            "image_tag": "ga-306",
+            "image_tag": "ga-314",
             "allow_ecs_exec": true,
             "env_vars": {
                 "SPRING_PROFILES_ACTIVE": "prod",

diff --git a/aoe-infra/environments/prod.json b/aoe-infra/environments/prod.json
@@ -51,7 +51,7 @@
             "memory_limit": "4096",
             "min_count": 1,
             "max_count": 1,
-            "image_tag": "ga-306",
+            "image_tag": "ga-314",
             "allow_ecs_exec": true,
             "env_vars": {
                 "SPRING_PROFILES_ACTIVE": "prod",

diff --git a/aoe-infra/environments/qa.json b/aoe-infra/environments/qa.json
@@ -51,7 +51,7 @@
             "memory_limit": "1024",
             "min_count": 1,
             "max_count": 1,
-            "image_tag": "ga-306",
+            "image_tag": "ga-314",
             "allow_ecs_exec": true,
             "env_vars": {
                 "SPRING_PROFILES_ACTIVE": "prod",