OPHYK-318 Pass the correct bucket name to the datantuonti import task

Opetushallitus · Jan 21, 2025 · 5ac7a38 · 5ac7a38
1 parent 9801cf3
commit 5ac7a38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/infra/src/cdk-app.ts b/infra/src/cdk-app.ts
@@ -401,6 +401,7 @@ class OrganisaatioApplicationStack extends cdk.Stack {
         oiva_baseurl: this.ssmSecret("OivaBaseurl"),
         oiva_username: this.ssmSecret("OivaUsername"),
         oiva_password: this.ssmSecret("OivaPassword"),
+        "organisaatio.tasks.datantuonti.import.bucket.name": this.ssmString("organisaatio.tasks.datantuonti.import.bucket.name", "")
       },
       portMappings: [
         {
@@ -588,12 +589,12 @@ class OrganisaatioApplicationStack extends cdk.Stack {
     alarm.addAlarmAction(new cloudwatch_actions.SnsAction(alarmTopic));
   }
 
-  ssmString(name: string): ecs.Secret {
+  ssmString(name: string, prefix: string = "/organisaatio/"): ecs.Secret {
     return ecs.Secret.fromSsmParameter(
       ssm.StringParameter.fromStringParameterName(
         this,
         `Param${name}`,
-        `/organisaatio/${name}`
+        `${prefix}${name}`
       )
     );
   }

diff --git a/...o-service/src/main/java/fi/vm/sade/organisaatio/datantuonti/DatantuontiImportService.java b/...o-service/src/main/java/fi/vm/sade/organisaatio/datantuonti/DatantuontiImportService.java
@@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS datantuonti_osoite_temp(
                 kieli text
             )""";
 
-    @Value("${organisaatio.tasks.datantuonti.export.bucket-name}")
+    @Value("${organisaatio.tasks.datantuonti.import.bucket.name}")
     private String bucketName;
 
     @Transactional