@mavogel/cdk-vscode-server 0.0.62 → 0.0.64

package/assets/installer/installer.lambda/index.js

@@ -59,47 +59,89 @@ var handler = async (event, context) => {
     parameters[key] = [value];
   }
   console.log("mapped parameters: %j", parameters);
-  let attemptNo = 0;
-  let timeRemaining = context.getRemainingTimeInMillis();
   console.log(
     `Running SSM Document '${documentName}' on EC2 instance '${instanceId}'. Logging to '${cloudWatchLogGroupName}' with parameters: '${JSON.stringify(parameters)}'`
   );
+  let commandId;
+  let attemptNo = 0;
   while (true) {
     attemptNo += 1;
+    const timeRemaining = context.getRemainingTimeInMillis();
     console.log(
-      `Attempt: ${attemptNo}. Time Remaining: ${timeRemaining / 1e3}s`
+      `Send attempt: ${attemptNo}. Time Remaining: ${timeRemaining / 1e3}s`
     );
     try {
-      const response = await ssm.sendCommand({
-        DocumentName: documentName,
-        InstanceIds: [instanceId],
-        CloudWatchOutputConfig: {
-          CloudWatchLogGroupName: cloudWatchLogGroupName,
-          CloudWatchOutputEnabled: true
-        },
-        Parameters: parameters
-      });
-      console.log(`response: ${JSON.stringify(response)}`);
+      const response = await ssm.send(
+        new import_client_ssm.SendCommandCommand({
+          DocumentName: documentName,
+          InstanceIds: [instanceId],
+          CloudWatchOutputConfig: {
+            CloudWatchLogGroupName: cloudWatchLogGroupName,
+            CloudWatchOutputEnabled: true
+          },
+          Parameters: parameters
+        })
+      );
+      console.log(`sendCommand response: ${JSON.stringify(response)}`);
       const command = response.Command;
-      const commandId = command.CommandId;
-      const responseData = { CommandId: commandId };
-      switch (command.Status) {
+      commandId = command.CommandId;
+      console.log(`Command sent successfully. CommandId: ${commandId}`);
+      break;
+    } catch (error) {
+      console.log("Error sending command:", error);
+      const isUnauthorized = error.name === "UnauthorizedException" || error.name === "AccessDeniedException" || error.message && error.message.includes("not authorized");
+      const isThrottled = error.name === "ThrottlingException" || error.name === "TooManyRequestsException";
+      const isRetryable = isUnauthorized || isThrottled;
+      const remainingTime = context.getRemainingTimeInMillis();
+      if (isRetryable && remainingTime > SLEEP_MS) {
+        console.log(
+          `Retryable error encountered (${error.name}). Attempt ${attemptNo}. Sleeping: ${SLEEP_MS / 1e3}s before retry`
+        );
+        await new Promise((resolve) => setTimeout(resolve, SLEEP_MS));
+      } else {
+        console.log("Non-retryable error or timeout. Failing...");
+        throw error;
+      }
+    }
+  }
+  let pollAttemptNo = 0;
+  const responseData = { CommandId: commandId };
+  while (true) {
+    pollAttemptNo += 1;
+    const timeRemaining = context.getRemainingTimeInMillis();
+    console.log(
+      `Poll attempt: ${pollAttemptNo}. Time Remaining: ${timeRemaining / 1e3}s`
+    );
+    try {
+      const invocationResponse = await ssm.send(
+        new import_client_ssm.GetCommandInvocationCommand({
+          CommandId: commandId,
+          InstanceId: instanceId
+        })
+      );
+      console.log(
+        `getCommandInvocation response: ${JSON.stringify(invocationResponse)}`
+      );
+      const status = invocationResponse.Status;
+      switch (status) {
         case "Pending":
         case "InProgress":
-          timeRemaining = context.getRemainingTimeInMillis();
+        case "Delayed":
           if (timeRemaining > SLEEP_MS) {
             console.log(
-              `Instance ${instanceId} not ready: 'InProgress'. Sleeping: ${SLEEP_MS / 1e3}s`
+              `Command ${commandId} status: '${status}'. Sleeping: ${SLEEP_MS / 1e3}s`
             );
             await new Promise((resolve) => setTimeout(resolve, SLEEP_MS));
             break;
           } else {
             throw new Error(
-              `SSM Document ${documentName} on EC2 instance ${instanceId} timed out while lambda in progress`
+              `SSM Document ${documentName} on EC2 instance ${instanceId} timed out while lambda waiting (status: ${status})`
             );
           }
         case "Success":
-          console.log(`Instance ${instanceId} successfully bootstrapped`);
+          console.log(
+            `Instance ${instanceId} successfully bootstrapped. Command ${commandId} completed.`
+          );
           return { Data: responseData };
         case "TimedOut":
           throw new Error(
@@ -115,23 +157,18 @@ var handler = async (event, context) => {
           );
         default:
           throw new Error(
-            `SSM Document ${documentName} on EC2 instance ${instanceId} status ${command.Status}`
+            `SSM Document ${documentName} on EC2 instance ${instanceId} unknown status: ${status}`
           );
       }
-      return { Data: responseData };
     } catch (error) {
-      console.log("Error occurred:", error);
-      const isUnauthorized = error.name === "UnauthorizedException" || error.name === "AccessDeniedException" || error.message && error.message.includes("not authorized");
-      const isThrottled = error.name === "ThrottlingException" || error.name === "TooManyRequestsException";
-      const isRetryable = isUnauthorized || isThrottled;
-      timeRemaining = context.getRemainingTimeInMillis();
-      if (isRetryable && timeRemaining > SLEEP_MS) {
+      const remainingTime = context.getRemainingTimeInMillis();
+      if (error.name === "InvocationDoesNotExist" && remainingTime > SLEEP_MS) {
         console.log(
-          `Retryable error encountered (${error.name}). Attempt ${attemptNo}. Sleeping: ${SLEEP_MS / 1e3}s before retry`
+          `Invocation not yet available. Sleeping: ${SLEEP_MS / 1e3}s`
         );
         await new Promise((resolve) => setTimeout(resolve, SLEEP_MS));
       } else {
-        console.log("Non-retryable error or timeout. Failing...");
+        console.log("Error checking command status:", error);
         throw error;
       }
     }

package/awslint.json

@@ -0,0 +1,5 @@
+{
+  "exclude": [
+    "props-no-arn-refs:@mavogel/cdk-vscode-server.VSCodeServerProps.certificateArn"
+  ]
+}

package/examples/auto-stop/main.ts

@@ -37,7 +37,7 @@ export class AutoStopExampleStack extends Stack {
       instanceClass: ec2.InstanceClass.M7G,
       instanceSize: ec2.InstanceSize.XLARGE,
       instanceVolumeSize: 40,
-      instanceOperatingSystem: LinuxFlavorType.UBUNTU_22,
+      instanceOperatingSystem: LinuxFlavorType.UBUNTU_24,
       instanceCpuArchitecture: LinuxArchitectureType.ARM,
 
       // 🔥 Auto-Stop Configuration

package/examples/custom/main.ts

@@ -17,7 +17,7 @@ export class MyStack extends Stack {
             instanceVolumeSize: 8,
             instanceClass: ec2.InstanceClass.M7G,
             instanceSize: ec2.InstanceSize.LARGE,
-            instanceOperatingSystem: LinuxFlavorType.UBUNTU_22,
+            instanceOperatingSystem: LinuxFlavorType.UBUNTU_24,
             instanceCpuArchitecture: LinuxArchitectureType.ARM,
 
             // 👇🏽 or if you want to give the InstanceRole more permissions

package/examples/git-repo/main.ts

@@ -0,0 +1,30 @@
+import { App, Stack, StackProps } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import { VSCodeServer } from '../../src/index'
+
+export class MyStack extends Stack {
+    constructor(scope: Construct, id: string, props: StackProps = {}) {
+        super(scope, id, props);
+
+        new VSCodeServer(this, 'vscode', {
+            // Clone a git repository into the home folder during instance setup
+            // Perfect for workshops, training sessions, or development environments
+            repoUrl: 'https://github.com/aws-samples/aws-cdk-examples.git',
+
+            // Optional: customize the home folder path (default: /Workshop)
+            homeFolder: '/CdkWorkshop',
+
+            // Optional: specify VS Code user (default: vscode-user)
+            vscodeUser: 'workshop-user',
+        });
+    }
+}
+
+const env = {
+    account: '123456789912',
+    region: 'eu-central-1',
+};
+
+const app = new App();
+new MyStack(app, 'vscode-server-git-repo', { env });
+app.synth();

package/integ-tests/integ.al2023.ts.snapshot/IntegSetupVSCodeOnAl2023DefaultTestDeployAssert74D8F645.assets.json

@@ -14,7 +14,7 @@
         }
       }
     },
-    "e5a8816554ca9fe1e7bf41d7d9fcc2f77bb6af7b02cb83746f5f815104b12306": {
+    "73ca3102a170a72edfc485eaa1468c73bbccd6bf566fd94f904e35c82f0fb905": {
       "displayName": "IntegSetupVSCodeOnAl2023DefaultTestDeployAssert74D8F645 Template",
       "source": {
         "path": "IntegSetupVSCodeOnAl2023DefaultTestDeployAssert74D8F645.template.json",
@@ -23,7 +23,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e5a8816554ca9fe1e7bf41d7d9fcc2f77bb6af7b02cb83746f5f815104b12306.json",
+          "objectKey": "73ca3102a170a72edfc485eaa1468c73bbccd6bf566fd94f904e35c82f0fb905.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

package/integ-tests/integ.al2023.ts.snapshot/IntegSetupVSCodeOnAl2023DefaultTestDeployAssert74D8F645.template.json

@@ -45,7 +45,7 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1759320082329"
+    "salt": "1762251879959"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"

package/integ-tests/integ.al2023.ts.snapshot/IntegTestStackAl2023.assets.json

@@ -57,30 +57,30 @@
         }
       }
     },
-    "33da23274e25bd9f43638c5d83dad26e3931cbe78d462ffd9a9f565e948b4f5f": {
+    "2f99f38311da357eaaea1284d67c759759324dec4a1cd11621d9c59eea9e81df": {
       "displayName": "IntegVSCodeServer/InstallerOnEventHandler/Code",
       "source": {
-        "path": "asset.33da23274e25bd9f43638c5d83dad26e3931cbe78d462ffd9a9f565e948b4f5f.lambda",
+        "path": "asset.2f99f38311da357eaaea1284d67c759759324dec4a1cd11621d9c59eea9e81df.lambda",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "33da23274e25bd9f43638c5d83dad26e3931cbe78d462ffd9a9f565e948b4f5f.zip",
+          "objectKey": "2f99f38311da357eaaea1284d67c759759324dec4a1cd11621d9c59eea9e81df.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "0ad50fc42afd768c3d0bfdd4701e43284fb077a25f19eea1e8c51a5ca36ebfe4": {
+    "efac30c7091c58fed492058fa6403c14f7e58aab8cf4fd595d838b8d5eeec2b9": {
       "displayName": "login-handler/Code",
       "source": {
-        "path": "asset.0ad50fc42afd768c3d0bfdd4701e43284fb077a25f19eea1e8c51a5ca36ebfe4",
+        "path": "asset.efac30c7091c58fed492058fa6403c14f7e58aab8cf4fd595d838b8d5eeec2b9",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "0ad50fc42afd768c3d0bfdd4701e43284fb077a25f19eea1e8c51a5ca36ebfe4.zip",
+          "objectKey": "efac30c7091c58fed492058fa6403c14f7e58aab8cf4fd595d838b8d5eeec2b9.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
@@ -99,7 +99,7 @@
         }
       }
     },
-    "78456291afad0703e73d0edcbe74101f565cb893d6c239a8a39dec908321d182": {
+    "6a8aed172ab7e8c6ee5d7cb632f3d6ffdd72d3e870a49105a647d3b0d258db8d": {
       "displayName": "IntegTestStackAl2023 Template",
       "source": {
         "path": "IntegTestStackAl2023.template.json",
@@ -108,7 +108,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "78456291afad0703e73d0edcbe74101f565cb893d6c239a8a39dec908321d182.json",
+          "objectKey": "6a8aed172ab7e8c6ee5d7cb632f3d6ffdd72d3e870a49105a647d3b0d258db8d.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }