chore: wip

chore: wip

chore: wip

Author: chrisbbreuer

.stacks/core/cloud/cdk.json

@@ -1,5 +1,5 @@
 {
-  "app": "bun ./src/deploy.ts",
+  "app": "bun ./deploy.ts",
   "profile": "stacks",
   "watch": {
     "include": [

.stacks/core/cloud/src/deploy.ts renamed to .stacks/core/cloud/deploy.ts

@@ -1,10 +1,12 @@
 /* eslint-disable no-new */
 import process from 'node:process'
 import { config } from '@stacksjs/config'
+import { ExitCode } from '@stacksjs/types'
 import { env } from '@stacksjs/env'
 import * as cdk from 'aws-cdk-lib'
-import { Cloud } from './cloud/'
-import type { CloudOptions } from './types'
+import { Cloud } from './src/cloud'
+import { getOrCreateTimestamp } from './src/helpers'
+import type { CloudOptions } from './src/types'
 
 const app = new cdk.App()
 const appEnv = config.app.env === 'local' ? 'dev' : config.app.env
@@ -14,6 +16,7 @@ const name = `stacks-cloud-${appEnv}`
 const appName = config.app.name?.toLowerCase()
 const account = env.AWS_ACCOUNT_ID
 const region = env.AWS_DEFAULT_REGION
+let timestamp
 
 if (!appKey) {
   log.info('Please set an application key. `buddy key:generate` is your friend, in this case.')
@@ -24,11 +27,6 @@ const parts = appKey.split(':')
 if (parts && parts.length < 2)
   throw new Error('Invalid format application key format. Expected a colon-separated string. You may need to run `buddy key:generate`.')
 
-const partialAppKey = parts[1] ? parts[1].substring(0, 10).toLowerCase() : undefined
-
-if (!partialAppKey)
-  throw new Error('The application key seems to be missing. Please set it before deploying. `buddy key:generate` is your friend, in this case.')
-
 if (!account || !region)
   throw new Error('Missing accountId or region in config.')
 
@@ -46,34 +44,23 @@ const usEnv = {
   region,
 }
 
+try {
+  timestamp = await getOrCreateTimestamp()
+}
+catch (error) {
+  console.error('Error fetching timestamp', error)
+  process.exit(ExitCode.FatalError)
+}
+
 export const options = {
   env: usEnv,
   name,
   appEnv: appEnv ?? 'dev',
   appName,
   domain,
-  partialAppKey,
+  timestamp,
 } satisfies CloudOptions
 
 new Cloud(app, name, options)
 
 app.synth()
-
-// function isProductionEnv(env: string) {
-//   return env === 'production' || env === 'prod'
-// }
-
-// export async function getExistingBucketNameByPrefix(prefix: string): Promise<string | undefined | null> {
-//   const s3 = new S3({ region: 'us-east-1' })
-
-//   try {
-//     const response = await s3.send(new ListBucketsCommand({}))
-//     const bucket = response.Buckets?.find(bucket => bucket.Name?.startsWith(prefix))
-
-//     return bucket ? bucket.Name : null
-//   }
-//   catch (error) {
-//     console.error('Error fetching buckets', error)
-//     return `${prefix}-${partialAppKey}`
-//   }
-// }

.stacks/core/cloud/src/cloud/cdn.ts

@@ -7,7 +7,6 @@ import {
   aws_cloudfront_origins as origins,
   aws_route53 as route53,
   aws_secretsmanager as secretsmanager,
-  // aws_ssm as ssm,
   aws_route53_targets as targets,
 } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
@@ -50,23 +49,6 @@ export class CdnStack {
       cookieBehavior: this.getCookieBehavior(config.cloud.cdn?.cookieBehavior),
     })
 
-    // Fetch the timestamp from SSM Parameter Store
-    // const timestampParam = ssm.StringParameter.fromSecureStringParameterAttributes(scope, 'TimestampParam', {
-    //   parameterName: `/stacks/${props.appName.toLowerCase()}/timestamp`,
-    //   version: 1,
-    // })
-
-    // let timestamp = timestampParam.stringValue
-
-    // // If the timestamp does not exist, create it
-    // if (!timestamp) {
-    //   timestamp = new Date().getTime().toString()
-    //   new ssm.StringParameter(scope, 'TimestampParam', {
-    //     parameterName: `/stacks/${props.appName.toLowerCase()}/timestamp`,
-    //     stringValue: timestamp,
-    //   })
-    // }
-
     // the actual CDN distribution
     this.distribution = new cloudfront.Distribution(scope, 'Cdn', {
       domainNames: [props.domain],

.stacks/core/cloud/src/cloud/docs.ts

@@ -21,10 +21,9 @@ export class DocsStack {
     // this edge function ensures pretty docs urls
     // soon to be reused for our Meema features
     this.originRequestFunction = new lambda.Function(scope, 'OriginRequestFunction', {
-      // this needs to have partialAppKey & timestamp to ensure it is unique, because there is a chance that during testing, you deploy
-      // the same app many times using the same app key. Since Origin Request (Lambda@Edge) functions are replicated functions, the
-      // deletion process takes a long time. This is to ensure that the function is always unique in cases of quick recreations.
-      functionName: `${props.appName}-${props.appEnv}-origin-request-${props.partialAppKey}-${new Date().getTime()}`,
+      // this needs to have timestamp to ensure uniqueness. Since Origin Request (Lambda@Edge) functions are replicated functions, the
+      // deletion process takes a "long time". This way, the function is always unique in cases of quick recreations.
+      functionName: `${props.appName}-${props.appEnv}-origin-request-${props.timestamp}`,
       description: 'The Stacks Origin Request function that prettifies URLs',
       runtime: lambda.Runtime.NODEJS_18_X,
       handler: 'dist/origin-request.handler',

.stacks/core/cloud/src/cloud/email.ts

@@ -13,7 +13,7 @@ export class EmailStack {
   constructor(scope: Construct, props: EmailStackProps) {
     const bucketPrefix = `${props.appName}-${props.appEnv}`
     this.emailBucket = new s3.Bucket(scope, 'EmailServerBucket', {
-      bucketName: `${bucketPrefix}-email-${timestamp}`,
+      bucketName: `${bucketPrefix}-email-${props.timestamp}`,
       versioned: true,
       removalPolicy: RemovalPolicy.DESTROY,
       autoDeleteObjects: true,

.stacks/core/cloud/src/cloud/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-new */
-import type { Construct } from 'constructs'
 import { Stack } from 'aws-cdk-lib'
+import type { Construct } from 'constructs'
 import type { CloudOptions } from '../types'
 import { CdnStack } from './cdn'
 import { DnsStack } from './dns'

.stacks/core/cloud/src/cloud/storage.ts

@@ -20,7 +20,7 @@ export class StorageStack {
     this.bucketPrefix = `${props.appName}-${props.appEnv}`
 
     this.publicBucket = new s3.Bucket(scope, 'PublicBucket', {
-      bucketName: `${this.bucketPrefix}-${props.partialAppKey}`,
+      bucketName: `${this.bucketPrefix}-${props.timestamp}`,
       versioned: true,
       autoDeleteObjects: true,
       removalPolicy: RemovalPolicy.DESTROY,
@@ -30,7 +30,7 @@ export class StorageStack {
     Tags.of(this.publicBucket).add('daily-backup', 'true')
 
     this.privateBucket = new s3.Bucket(scope, 'PrivateBucket', {
-      bucketName: `${this.bucketPrefix}-private-${props.partialAppKey}`,
+      bucketName: `${this.bucketPrefix}-private-${props.timestamp}`,
       versioned: true,
       removalPolicy: RemovalPolicy.DESTROY,
       autoDeleteObjects: true,
@@ -48,7 +48,7 @@ export class StorageStack {
     Tags.of(this.privateBucket).add('daily-backup', 'true')
 
     this.logBucket = new s3.Bucket(scope, 'LogsBucket', {
-      bucketName: `${this.bucketPrefix}-logs-${props.partialAppKey}`,
+      bucketName: `${this.bucketPrefix}-logs-${props.timestamp}`,
       removalPolicy: RemovalPolicy.DESTROY,
       autoDeleteObjects: true,
       blockPublicAccess: new s3.BlockPublicAccess({

.stacks/core/cloud/src/helpers.ts

@@ -4,6 +4,7 @@ import { CloudWatchLogsClient, DeleteLogGroupCommand, DescribeLogGroupsCommand }
 import { EC2, _InstanceType as InstanceType } from '@aws-sdk/client-ec2'
 import { DescribeFileSystemsCommand, EFSClient } from '@aws-sdk/client-efs'
 import { IAM } from '@aws-sdk/client-iam'
+import { SSM } from '@aws-sdk/client-ssm'
 import { Lambda } from '@aws-sdk/client-lambda'
 import type { CountryCode } from '@aws-sdk/client-route-53-domains'
 import { ContactType, Route53Domains } from '@aws-sdk/client-route-53-domains'
@@ -483,3 +484,48 @@ export async function isFailedState() {
 
   return !isStacksCloudPresent
 }
+
+export async function getOrCreateTimestamp(): Promise<string> {
+  const parameterName = `/stacks/timestamp`
+  const ssm = new SSM({ region: 'us-east-1' })
+
+  try {
+    const response = await ssm.getParameter({ Name: parameterName })
+    const timestamp = response.Parameter ? response.Parameter.Value : undefined
+
+    if (!timestamp)
+      throw new Error('Timestamp parameter not found')
+
+    return timestamp
+  }
+  catch (error: any) {
+    const timestamp = new Date().getTime().toString()
+    log.info(`Creating timestamp parameter ${parameterName} with value ${timestamp}`)
+    await ssm.putParameter({
+      Name: parameterName,
+      Value: timestamp,
+      Type: 'String',
+    })
+
+    return timestamp
+  }
+}
+
+// function isProductionEnv(env: string) {
+//   return env === 'production' || env === 'prod'
+// }
+
+// export async function getExistingBucketNameByPrefix(prefix: string): Promise<string | undefined | null> {
+//   const s3 = new S3({ region: 'us-east-1' })
+
+//   try {
+//     const response = await s3.send(new ListBucketsCommand({}))
+//     const bucket = response.Buckets?.find(bucket => bucket.Name?.startsWith(prefix))
+
+//     return bucket ? bucket.Name : null
+//   }
+//   catch (error) {
+//     console.error('Error fetching buckets', error)
+//     return `${prefix}-${timestamp}`
+//   }
+// }

.stacks/core/cloud/src/types.ts

@@ -10,7 +10,7 @@ export interface CloudOptions extends StackProps {
   appEnv: AppEnvType
   appName: string
   domain: string
-  partialAppKey: string
+  timestamp: string
 }
 
 // export interface NestedCloudProps extends NestedStackProps {
@@ -23,5 +23,5 @@ export interface NestedCloudProps {
   appEnv: AppEnvType
   appName: string
   domain: string
-  partialAppKey: string
+  timestamp: string
 }

.stacks/core/database/src/migrations/index.ts

@@ -49,7 +49,7 @@ export interface MigrationOptions {
 export function generateMigrationFile(options: MigrationOptions) {
   const { name, up, down } = options
 
-  const timestamp = new Date().getTime()
+  const timestamp = new Date().getTime().toString()
   const fileName = `${timestamp}-${name}.ts`
   const filePath = p.frameworkPath(`database/migrations/${fileName}`)
   const fileContent = `