Bump @types/prettier from 2.6.0 to 2.7.3 in /efimeral

efimeral/lambdas/api/check-box-id.js

@@ -32,7 +32,7 @@ exports.handler = Sentry.AWSLambda.wrapHandler(async (event, context) => {
       };
     }
 
-    const containerURL = await getContainerURL(task.attachments[0].details);
+    const containerURL = await getContainerURL(task.attachments[0].details, task.containers[0].networkBindings[0].containerPort);
     return {
       statusCode: 200,
       headers: headers,
@@ -73,7 +73,7 @@ async function getRunningTaskById(clusterArn, taskId, ecs) {
   return undefined;
 }
 
-async function getContainerURL(details) {
+async function getContainerURL(details, containerPort) {
   let eni = '';
   for (let i = 0; i < details.length; i++) {
     if (details[i].name === 'networkInterfaceId') {
@@ -94,5 +94,5 @@ async function getContainerURL(details) {
   const data = await ec2.describeNetworkInterfaces(params);
   console.log(`Network data: ${JSON.stringify(data)}`);
 
-  return `http://${data.NetworkInterfaces[0].Association.PublicDnsName}:${process.env.CONTAINER_PORT}`
+  return `http://${data.NetworkInterfaces[0].Association.PublicDnsName}:${containerPort}`
 }

efimeral/lib/efimeral-stack.ts

@@ -14,13 +14,20 @@ import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
 import * as route53 from 'aws-cdk-lib/aws-route53';
 import * as route53Targets from 'aws-cdk-lib/aws-route53-targets';
 import * as acm from 'aws-cdk-lib/aws-certificatemanager';
+import * as crypto from 'crypto';
 
 
 export const ecrRepositoyName = 'efimeral-boxes';
-export const containerPort = 8080;
 export const containerTimeoutMinutes = 10;
 export const apiSubdomain = 'api.efimeral.ar';
-export const imageTags = ['alpine', 'ubuntu']
+export const images = [
+  {tag: 'alpine', ecr: true, port: 8080},
+  {tag: 'ubuntu', ecr: true, port: 8080},
+  {tag: 'vscode', ecr: false, port: 8000, image: 'ahmadnassri/vscode-server', environment: {
+    VSCODE_SERVE_MODE: 'serve-local',
+    VSCODE_KEYRING_PASS: crypto.randomBytes(20).toString('hex'),
+  }}
+]
 
 export class APIStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props?: cdk.StackProps) {
@@ -64,30 +71,39 @@ export class APIStack extends cdk.Stack {
 
     const tasks: { [key: string]: ecs.TaskDefinition } = {};
     const taskArns: { [key: string]: string} = {};
-    imageTags.forEach(tag => {
-      const task = new ecs.TaskDefinition(this, `box-task-${tag}`, {
+    images.forEach(tag => {
+      const task = new ecs.TaskDefinition(this, `box-task-${tag.tag}`, {
         compatibility: ecs.Compatibility.FARGATE,
         cpu: '256',
         memoryMiB: '512',
       });
-      task.addContainer(`box-${tag}`, {
-        image: ecs.ContainerImage.fromEcrRepository(repository, tag),
+
+      let image;
+      if (tag.ecr) {
+        image = ecs.ContainerImage.fromEcrRepository(repository, tag.tag);
+      } else {
+        image = ecs.ContainerImage.fromRegistry(`${tag.image}:latest`);
+      }
+
+      task.addContainer(`box-${tag.tag}`, {
+        image: image,
         cpu: 1,
         memoryReservationMiB: 512,
         portMappings: [
           {
-            containerPort: containerPort,
+            containerPort: tag.port,
             protocol: ecs.Protocol.TCP,
           },
         ],
         logging: ecs.LogDrivers.awsLogs({
-          streamPrefix: `box-${tag}`,
+          streamPrefix: `box-${tag.tag}`,
           logRetention: logs.RetentionDays.ONE_WEEK,
         }),
+        environment: tag.environment,
       });
 
-      tasks[tag] = task;
-      taskArns[tag] = task.taskDefinitionArn;
+      tasks[tag.tag] = task;
+      taskArns[tag.tag] = task.taskDefinitionArn;
     });
 
     const sentryDSN = secretsmanager.Secret.fromSecretNameV2(
@@ -109,7 +125,7 @@ export class APIStack extends cdk.Stack {
         MAX_ALLOWED_RUNNING_TASKS: "10",
         TASK_DEFINITION_ARNS: JSON.stringify(taskArns),
         DEFAULT_TAG: 'alpine',
-        AVAILABLE_TAGS: JSON.stringify(imageTags),
+        AVAILABLE_TAGS: JSON.stringify(images.map(tag => tag.tag)),
         SUBNET_ID: vpc.publicSubnets[0].subnetId,
         SECURITY_GROUP_ID: sg.securityGroupId,
       },
@@ -123,7 +139,7 @@ export class APIStack extends cdk.Stack {
       },
     });
 
-    imageTags.forEach(tag => tasks[tag].grantRun(fnApiCreateBoxHandler));
+    images.forEach(tag => tasks[tag.tag].grantRun(fnApiCreateBoxHandler));
 
     const fnApiCheckBoxIdHandler = new lambdaNodeJS.NodejsFunction(this, 'api-check-box-id', {
       description: 'Checks RUNNING state for box ID and returns its public URL if exists',
@@ -137,7 +153,6 @@ export class APIStack extends cdk.Stack {
         LAMBDAS_SENTRY_DSN: sentryDSN,
         CORS_DISABLED: "true",
         CLUSTER_ARN: cluster.clusterArn,
-        CONTAINER_PORT: `${containerPort}`,
       },
       bundling: {
         esbuildArgs: {

efimeral/package.json

@@ -15,9 +15,10 @@
     "@aws-sdk/client-ec2": "^3.332.0",
     "@aws-sdk/client-ecs": "^3.338.0",
     "@types/jest": "^27.5.2",
-    "@types/node": "10.17.27",
-    "@types/prettier": "2.6.0",
-    "aws-cdk": "2.80.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^10.17.27",
+    "@types/prettier": "2.7.3",
+    "aws-cdk": "^2.80.0",
     "aws-sdk-client-mock": "^2.1.1",
     "esbuild": "^0.17.19",
     "jest": "^27.5.1",
@@ -30,6 +31,7 @@
     "adm-zip": "^0.5.10",
     "aws-cdk-lib": "2.80.0",
     "constructs": "^10.0.0",
+    "crypto": "^1.0.1",
     "source-map-support": "^0.5.21"
   }
 }

efimeral/test/efimeral.test.ts

@@ -84,18 +84,18 @@ test('Stack created', () => {
     MaxSize: '3',
   });  
 
-  Efimeral.imageTags.forEach(tag => {
+  Efimeral.images.forEach(tag => {
     template.hasResourceProperties('AWS::ECS::TaskDefinition', {
       Cpu: '256',
       Memory: '512',
       RequiresCompatibilities: ['FARGATE'],
       ContainerDefinitions: [{
-          Name: `box-${tag}`,
+          Name: `box-${tag.tag}`,
           Cpu: 1,
           Essential: true,
           MemoryReservation: 512,
           PortMappings: [{
-              ContainerPort: 8080,
+              ContainerPort: tag.port,
               Protocol: ecs.Protocol.TCP,
           }],
       }],

efimeral/test/lambda-api-check-box-id.test.js

@@ -34,6 +34,11 @@ describe("Check box running state by ID", () => {
 					value: 'fakeNetworkId',
 				}]
 			}],
+			containers: [{
+				networkBindings: [{
+					containerPort: 8080,
+				}]
+			}],
 			lastStatus: 'RUNNING',
 			desiredStatus: 'RUNNING',
 		}],
@@ -82,6 +87,11 @@ describe("Check box running state by ID", () => {
 			attachments: [{
 				details: []
 			}],
+			containers: [{
+				networkBindings: [{
+					containerPort: 8080,
+				}]
+			}],
 			lastStatus: 'RUNNING',
 			desiredStatus: 'RUNNING',
 		}],

efimeral/test/lambda-api-create-box.test.js

@@ -4,7 +4,7 @@ const { mockClient } = require("aws-sdk-client-mock");
 const lambdaFunction = require("../lambdas/api/create-box");
 
 const ecsMock = mockClient(ECSClient);
-const validTags = ["alpine", "ubuntu"];
+const validTags = ["alpine", "ubuntu", "vscode"];
 
 describe("Create box", () => {
   const ENV = process.env;
@@ -16,6 +16,7 @@ describe("Create box", () => {
 	process.env.TASK_DEFINITION_ARNS = JSON.stringify({
 		alpine: 'fakeArn1',
 		ubuntu: 'fakeArn2',
+		vscode: 'fakeArn3'
 	});
   });