chore: wip

Author: chrisbbreuer

storage/framework/core/cloud/deploy.ts

@@ -17,7 +17,7 @@ const appKey = config.app.key
 const domain = config.app.url
 const appName = config.app.name?.toLowerCase() ?? 'stacks'
 const slug = slugify(appName)
-const name = `${slug}-cloud-${appEnv}`
+const name = `${slug}-cloud`
 const account = env.AWS_ACCOUNT_ID
 // const region = env.AWS_DEFAULT_REGION
 const region = 'us-east-1' // currently, us-east-1 is the only fully-supported region
@@ -69,7 +69,7 @@ export const options = {
 
 new Cloud(app, name, {
   ...options,
-  description: `Stacks Cloud ${appEnv} deployment`,
+  description: `The Stacks Cloud`,
 })
 
 app.synth()

storage/framework/core/cloud/src/cloud/compute.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-new */
-import type { aws_certificatemanager as acm, aws_ec2 as ec2, aws_efs as efs, aws_lambda as lambda, aws_route53 as route53 } from 'aws-cdk-lib'
-import { Duration, CfnOutput as Output, aws_ecs as ecs, aws_ecs_patterns as ecs_patterns, aws_logs as logs, aws_secretsmanager as secretsmanager } from 'aws-cdk-lib'
+import type { aws_certificatemanager as acm, aws_efs as efs, aws_lambda as lambda, aws_route53 as route53 } from 'aws-cdk-lib'
+import { Duration, CfnOutput as Output, aws_ec2 as ec2, aws_ecs as ecs, aws_ecs_patterns as ecs_patterns, aws_logs as logs, aws_secretsmanager as secretsmanager } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
 import { path as p } from '@stacksjs/path'
 import { env } from '@stacksjs/env'
@@ -25,17 +25,14 @@ export class ComputeStack {
     if (!fileSystem)
       throw new Error('The file system is missing. Please make sure it was created properly.')
 
-    // const dockerImageAsset = new ecr_assets.DockerImageAsset(scope, 'ServerBuildImage', {
-    //   directory: p.cloudPath('src/server'),
-    // })
-
     const cluster = new ecs.Cluster(scope, 'StacksCluster', {
       vpc,
     })
 
     const taskDefinition = new ecs.FargateTaskDefinition(scope, 'TaskDef', {
       memoryLimitMiB: 512, // Match your Lambda memory size
       cpu: 256, // Choose an appropriate value
+      portMappings: [{ containerPort: 80 }],
     })
 
     const container = taskDefinition.addContainer('WebServerContainer', {
@@ -54,6 +51,10 @@ export class ComputeStack {
       taskDefinition,
       desiredCount: 1, // Start with 1 task instance
       // Other configurations like public load balancer, domain name, etc.
+      publicLoadBalancer: true,
+      taskSubnets: vpc.selectSubnets({ subnetType: ec2.SubnetType.PUBLIC, onePerAz: true }),
+      assignPublicIp: true,
+      listenerPort: 80,
     })
 
     const volumeName = `${props.slug}-${props.appEnv}-efs`

storage/framework/core/cloud/src/cloud/network.ts

@@ -17,34 +17,14 @@ export class NetworkStack {
       natGateways: 0,
       subnetConfiguration: [
         {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-public-subnet-1`,
+          name: 'public-subnet-1',
           subnetType: ec2.SubnetType.PUBLIC,
+          cidrMask: 24,
         },
         {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-public-subnet-2`,
-          subnetType: ec2.SubnetType.PUBLIC,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-public-subnet-3`,
-          subnetType: ec2.SubnetType.PUBLIC,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-private-subnet-1`,
-          subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-private-subnet-2`,
-          subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-private-subnet-3`,
+          name: 'private-subnet-1',
           subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
+          cidrMask: 28,
         },
       ],
     })