adding types: [ node ] to tsconfig, and uploading the node.sh script to an s3 bucket and getting it executed as user data

Author: Madisonw

lib/allora/lib/allora-stack.ts

@@ -1,7 +1,10 @@
 import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
-import * as iam from 'aws-cdk-lib/aws-iam';
+import * as s3 from 'aws-cdk-lib/aws-s3';
+import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment';
+import * as fs from 'fs';
+import * as path from 'path';
 // import * as sqs from 'aws-cdk-lib/aws-sqs';
 
 
@@ -25,6 +28,21 @@ export class AlloraStack extends cdk.Stack {
     const instanceType = props?.instanceType || 't2.medium';
     const resourceNamePrefix = props?.resourceNamePrefix || 'AlloraWorkerx';
 
+    
+
+    // Create S3 Bucket
+    const bucket = new s3.Bucket(this, `${resourceNamePrefix}Bucket`, {
+      removalPolicy: cdk.RemovalPolicy.DESTROY,
+      autoDeleteObjects: true,
+    });
+
+    // Upload node.sh to S3
+    new s3deploy.BucketDeployment(this, `${resourceNamePrefix}ScriptDeployment`, {
+      sources: [s3deploy.Source.asset(path.join(__dirname, 'assets', 'user-data'))],
+      destinationBucket: bucket,
+      destinationKeyPrefix: 'user-data', // optional prefix in destination bucket
+    });
+
     // Create VPC
     const vpc = new ec2.Vpc(this, `${resourceNamePrefix}Vpc`, {
       maxAzs: props?.vpcMaxAzs || 1,
@@ -44,6 +62,18 @@ export class AlloraStack extends cdk.Stack {
     });
     securityGroup.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcp(9010), 'Allow inbound TCP 9010');
 
+     // Read user data script and inject variables
+     const userData = fs.readFileSync(path.join(__dirname, 'assets', 'user-data', 'node.sh')).toString();
+     const modifiedUserData = cdk.Fn.sub(userData, {
+       _AWS_REGION_: region,
+       _ASSETS_S3_PATH_: `s3://${bucket.bucketName}/user-data/node.sh`,
+       // Add other variables as needed
+     });
+
+    // Create UserData for EC2 instance
+    const ec2UserData = ec2.UserData.forLinux();
+    ec2UserData.addCommands(modifiedUserData);
+
     // EC2 Instance
     const instance = new ec2.Instance(this, `${resourceNamePrefix}Instance`, {
       vpc,
@@ -61,6 +91,7 @@ export class AlloraStack extends cdk.Stack {
           volumeType: ec2.EbsDeviceVolumeType.GP3,
         }),
       }],
+      userData: ec2UserData
     });
 
     // Elastic IP

lib/allora/lib/assets/user-data/node.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+echo "AWS_REGION=${_AWS_REGION_}" >> /etc/environment
+echo "ASSETS_S3_PATH=${_ASSETS_S3_PATH_}" >> /etc/environment
+
 #############################
 # Prerequisites
 # Pip

lib/allora/test/allora.test.ts

@@ -56,4 +56,79 @@ test('Stack has correct resources', () => {
   template.hasResourceProperties('AWS::EC2::EIPAssociation', {
     InstanceId: Match.anyValue(),
   });
+
+  // Check for S3 Bucket
+  template.resourceCountIs('AWS::S3::Bucket', 1);
+
+  // Check for Bucket Deployment
+  template.hasResourceProperties('Custom::CDKBucketDeployment', {
+    DestinationBucketName: {
+      'Ref': Match.anyValue(),
+    },
+    DestinationBucketKeyPrefix: 'user-data',
+    Prune: true,
+    ServiceToken: {
+      'Fn::GetAtt': [
+        Match.anyValue(),
+        'Arn'
+      ]
+    },
+    SourceBucketNames: [
+      Match.anyValue(),
+    ],
+    SourceObjectKeys: [
+      Match.stringLikeRegexp('.*\\.zip')
+    ]
+  });
+
+  // Check for S3 bucket policy to allow read access to the EC2 instance
+  template.hasResourceProperties('AWS::S3::BucketPolicy', {
+    Bucket: {
+      'Ref': Match.anyValue(),
+    },
+    PolicyDocument: {
+      Statement: Match.arrayWith([
+        Match.objectLike({
+          Action: [
+            "s3:PutBucketPolicy",
+            "s3:GetBucket*",
+            "s3:List*",
+            "s3:DeleteObject*"
+          ],
+          Effect: 'Allow',
+          Resource: [
+            {
+              'Fn::GetAtt': [
+                Match.anyValue(),
+                'Arn',
+              ],
+            },
+            {
+              'Fn::Join': [
+                '',
+                [
+                  {
+                    'Fn::GetAtt': [
+                      Match.anyValue(),
+                      'Arn'
+                    ]
+                  },
+                  '/*'
+                ]
+              ],
+            }
+          ],
+          Principal: {
+            AWS: {
+              'Fn::GetAtt': [
+                Match.anyValue(),
+                'Arn',
+              ],
+            },
+          },
+        }),
+      ]),
+      Version: '2012-10-17'
+    },
+  });
 });

lib/allora/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "types": ["node"],
     "target": "ES2020",
     "module": "commonjs",
     "lib": [