Merge pull request #954 from mikaylathompson/cdk-update-bugfixes

Source password secret permssions + sigv4 yaml fixes
opensearch-project · Sep 13, 2024 · 421cf2b · 421cf2b
2 parents d0d5b40 + 93b1d0f
commit 421cf2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/deployment/cdk/opensearch-service-migration/lib/common-utilities.ts b/deployment/cdk/opensearch-service-migration/lib/common-utilities.ts
@@ -326,6 +326,13 @@ export class ClusterSigV4Auth {
         this.region = region;
         this.serviceSigningName = service;
     }
+
+    toDict() {
+        return {
+            region: this.region,
+            service: this.serviceSigningName
+        }
+    }
 }
 
 export class ClusterBasicAuth {
@@ -379,7 +386,7 @@ export class ClusterAuth {
             return {no_auth: ""};
         }
         if (this.sigv4) {
-            return {sigv4: this.sigv4};
+            return {sigv4: this.sigv4.toDict()};
         }
         return {};
     }

diff --git a/deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-console-stack.ts b/deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-console-stack.ts
@@ -235,8 +235,8 @@ export class MigrationConsoleStack extends MigrationServiceCore {
         const getTargetSecretsPolicy = props.servicesYaml.target_cluster.auth.basicAuth?.password_from_secret_arn ?
             getTargetPasswordAccessPolicy(props.servicesYaml.target_cluster.auth.basicAuth?.password_from_secret_arn) : null;
 
-        const getSourceSecretsPolicy = props.servicesYaml.source_cluster?.auth.basicAuth?.password_from_secret_arn ?
-            getTargetPasswordAccessPolicy(props.servicesYaml.source_cluster?.auth.basicAuth?.password_from_secret_arn) : null;
+        const getSourceSecretsPolicy = props.sourceCluster?.auth.basicAuth?.password_from_secret_arn ?
+            getTargetPasswordAccessPolicy(props.sourceCluster?.auth.basicAuth?.password_from_secret_arn) : null;
 
         // Upload the services.yaml file to Parameter Store
         let servicesYaml = props.servicesYaml