Use CFN input for VPC id and Stage (opensearch-project#1122)

Take CFN input from the bootstrap stack, and fill in appropriate CDK context if available --------- Signed-off-by: Tanner Lewis <[email protected]>
lewijacn · Nov 7, 2024 · bcd38c6 · bcd38c6
1 parent 6fe5d2f
commit bcd38c6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/deployment/migration-assistant-solution/initBootstrap.sh b/deployment/migration-assistant-solution/initBootstrap.sh
@@ -50,6 +50,14 @@ else
 fi
 
 cd deployment/cdk/opensearch-service-migration || exit
+
+if [[ -n "$VPC_ID" ]]; then
+  sed -i "s|<VPC_ID>|$VPC_ID|g" /opensearch-migrations/deployment/cdk/opensearch-service-migration/cdk.context.json
+fi
+if [[ -n "$STAGE" ]]; then
+  sed -i "s|<STAGE>|$STAGE|g" /opensearch-migrations/deployment/cdk/opensearch-service-migration/cdk.context.json
+fi
+
 npm install -g aws-cdk 2>&1
 npm install 2>&1
 ./buildDockerImages.sh
diff --git a/deployment/migration-assistant-solution/lib/solutions-stack.ts b/deployment/migration-assistant-solution/lib/solutions-stack.ts
@@ -89,6 +89,12 @@ function importVPC(stack: Stack, vpdIdParameter: CfnParameter, availabilityZones
     });
 }
 
+function generateExportString(exports:  Record<string, string>): string {
+    return Object.entries(exports)
+        .map(([key, value]) => `export ${key}=${value}`)
+        .join("; ");
+}
+
 export class SolutionsInfrastructureStack extends Stack {
 
     constructor(scope: Construct, id: string, props: SolutionsInfrastructureStackProps) {
@@ -144,12 +150,6 @@ export class SolutionsInfrastructureStack extends Stack {
         })
 
         const solutionsUserAgent = `AwsSolution/${props.solutionId}/${props.solutionVersion}`
-        const cfnInitConfig: InitElement[] = [
-            InitCommand.shellCommand(`echo "export MIGRATIONS_APP_REGISTRY_ARN=${appRegistryAppARN}; export MIGRATIONS_USER_AGENT=${solutionsUserAgent}" > /etc/profile.d/solutionsEnv.sh`),
-            InitFile.fromFileInline("/opensearch-migrations/initBootstrap.sh", './initBootstrap.sh', {
-                mode: "000744"
-            }),
-        ]
 
         const bootstrapRole = new Role(this, 'BootstrapRole', {
             assumedBy: new ServicePrincipal('ec2.amazonaws.com'),
@@ -188,6 +188,19 @@ export class SolutionsInfrastructureStack extends Stack {
             vpc = importVPC(this, vpcIdParameter, availabilityZonesParameter, privateSubnetIdsParameter);
         }
 
+        const exportString = generateExportString({
+            "MIGRATIONS_APP_REGISTRY_ARN": appRegistryAppARN,
+            "MIGRATIONS_USER_AGENT": solutionsUserAgent,
+            "VPC_ID": vpc.vpcId,
+            "STAGE": stageParameter.valueAsString,
+        })
+        const cfnInitConfig: InitElement[] = [
+            InitCommand.shellCommand(`echo "${exportString}" > /etc/profile.d/solutionsEnv.sh`),
+            InitFile.fromFileInline("/opensearch-migrations/initBootstrap.sh", './initBootstrap.sh', {
+                mode: "000744"
+            }),
+        ]
+
         new Instance(this, 'BootstrapEC2Instance', {
             vpc: vpc,
             vpcSubnets: {