@stacksjs/ts-cloud 0.5.2 → 0.5.4

package/dist/index.js

@@ -26359,9 +26359,12 @@ function composeServerlessAppTemplate(opts) {
     };
   }
   if (hasVpc && needsDataVpc) {
+    if (!app.vpc?.id)
+      throw new Error("serverless app: data services (elasticache / aurora-serverless / rdsProxy / efs) need app.vpc.id (the VPC id) so the managed security group is created in the right VPC.");
     resources.DataSecurityGroup = {
       Type: "AWS::EC2::SecurityGroup",
       Properties: {
+        VpcId: app.vpc.id,
         GroupDescription: `${slug}-${environment} serverless data access`,
         SecurityGroupIngress: [{ IpProtocol: "-1", CidrIp: "10.0.0.0/8" }]
       }
@@ -26442,6 +26445,7 @@ function composeServerlessAppTemplate(opts) {
         Engine: "aurora-mysql",
         EngineMode: "provisioned",
         DBClusterIdentifier: `${slug}-${environment}-db`,
+        DatabaseName: "app",
         MasterUsername: Fn2.sub("{{resolve:secretsmanager:${DbSecret}:SecretString:username}}"),
         MasterUserPassword: Fn2.sub("{{resolve:secretsmanager:${DbSecret}:SecretString:password}}"),
         ServerlessV2ScalingConfiguration: { MinCapacity: 0.5, MaxCapacity: 4 },
@@ -26488,6 +26492,15 @@ function composeServerlessAppTemplate(opts) {
         RequireTLS: false
       }
     };
+    resources.DbProxyTargetGroup = {
+      Type: "AWS::RDS::DBProxyTargetGroup",
+      DependsOn: ["DbInstance"],
+      Properties: {
+        DBProxyName: Fn2.ref("DbProxy"),
+        TargetGroupName: "default",
+        DBClusterIdentifiers: [Fn2.ref("DbCluster")]
+      }
+    };
     outputs.DbProxyEndpoint = { Description: "RDS Proxy endpoint", Value: Fn2.getAtt("DbProxy", "Endpoint") };
   }
   outputs.HttpFunctionName = { Description: "HTTP function name", Value: Fn2.ref("HttpFunction") };
@@ -57435,7 +57448,7 @@ var exports_serverless_image = {};
 __export(exports_serverless_image, {
   buildAndPushServerlessImage: () => buildAndPushServerlessImage
 });
-import { execFileSync as execFileSync3, execSync as execSync3 } from "node:child_process";
+import { execFileSync as execFileSync3 } from "node:child_process";
 import { mkdirSync as mkdirSync7, mkdtempSync as mkdtempSync4, rmSync as rmSync4, writeFileSync as writeFileSync10 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 import { dirname as dirname7, join as join15 } from "node:path";
@@ -57497,12 +57510,17 @@ async function buildAndPushServerlessImage(opts) {
       throw new Error(`could not resolve ECR repository URI for ${repository}`);
     const imageUri = `${repoUri}:${tag}`;
     step2("docker build");
-    execFileSync3("docker", ["build", "--platform", platform, "-t", imageUri, stage], { stdio: "inherit" });
-    step2("ecr login");
-    const loginCmd = await ecr2.getDockerLoginCommand();
-    execSync3(loginCmd, { stdio: "inherit" });
-    step2("docker push");
-    execFileSync3("docker", ["push", imageUri], { stdio: "inherit" });
+    execFileSync3("docker", ["build", "--platform", platform, "--provenance=false", "--sbom=false", "-t", imageUri, stage], { stdio: "inherit" });
+    step2("ecr auth + push");
+    const auth = await ecr2.getAuthorizationToken();
+    const data = auth.authorizationData?.[0];
+    if (!data?.authorizationToken || !data.proxyEndpoint)
+      throw new Error("failed to get an ECR authorization token");
+    const registry = data.proxyEndpoint.replace(/^https?:\/\//, "");
+    const dockerConfig = join15(stage, ".docker");
+    mkdirSync7(dockerConfig, { recursive: true });
+    writeFileSync10(join15(dockerConfig, "config.json"), JSON.stringify({ auths: { [registry]: { auth: data.authorizationToken } } }));
+    execFileSync3("docker", ["push", imageUri], { stdio: "inherit", env: { ...process.env, DOCKER_CONFIG: dockerConfig } });
     info(`Image: ${imageUri}`);
     return { imageUri, tag, handlers };
   } finally {
@@ -83326,7 +83344,7 @@ async function deployServerlessApp(config6, environment, opts = {}) {
       step(`Creating artifact bucket ${artifactBucket}`);
       await s32.createBucket(artifactBucket);
     }
-    const exists = await s32.headObject(artifactBucket, key).then(() => true).catch(() => false);
+    const exists = await s32.headObject(artifactBucket, key).then((r) => r !== null).catch(() => false);
     if (exists) {
       info("Artifact already uploaded — reusing");
     } else {
@@ -83339,7 +83357,20 @@ async function deployServerlessApp(config6, environment, opts = {}) {
   const composed = composeServerlessAppTemplate({ config: config6, environment, app, handlers, runtimeLayers });
   const templateBody = JSON.stringify(composed.template);
   const capabilities = ["CAPABILITY_NAMED_IAM"];
-  const stackExists = await cfn.describeStacks({ stackName }).then((r) => r.Stacks.length > 0).catch(() => false);
+  const status = await cfn.describeStacks({ stackName }).then((r) => r.Stacks[0]?.StackStatus).catch(() => {
+    return;
+  });
+  let stackExists = status !== undefined;
+  if (status && /DELETE_IN_PROGRESS/.test(status)) {
+    step("Waiting for an in-progress stack delete to finish");
+    await cfn.waitForStack(stackName, "stack-delete-complete").catch(() => {});
+    stackExists = false;
+  } else if (status && /(?:ROLLBACK_COMPLETE|REVIEW_IN_PROGRESS|CREATE_FAILED)/.test(status)) {
+    step(`Deleting unusable stack (status ${status}) before recreate`);
+    await cfn.deleteStack(stackName);
+    await cfn.waitForStack(stackName, "stack-delete-complete").catch(() => {});
+    stackExists = false;
+  }
   step(stackExists ? "Updating infrastructure stack" : "Creating infrastructure stack");
   try {
     if (stackExists) {
@@ -83372,6 +83403,19 @@ async function deployServerlessApp(config6, environment, opts = {}) {
   }
   step("Resolving secrets");
   const secrets = await resolveSecrets(app, region);
+  if (app.database?.connection === "aurora-serverless") {
+    try {
+      const sm = new SecretsManagerClient(region);
+      const v = await sm.getSecretValue({ SecretId: `${slug}/${environment}/db` });
+      const creds = JSON.parse(v.SecretString ?? "{}");
+      if (creds.username)
+        secrets.DB_USERNAME = creds.username;
+      if (creds.password)
+        secrets.DB_PASSWORD = creds.password;
+    } catch (err) {
+      warn(`Could not resolve Aurora DB credentials: ${err.message}`);
+    }
+  }
   if (!await s32.bucketExists(artifactBucket)) {
     await s32.createBucket(artifactBucket);
   }
@@ -83571,7 +83615,7 @@ function planServices(services) {
   const packages = [];
   const names = [];
   if (enabled(services.mysql)) {
-    packages.push("mysql.com");
+    packages.push(typeof services.mysql === "object" && services.mysql.version ? `mysql.com@${services.mysql.version}` : "mysql.com@8.0.43");
     names.push("mysql");
   } else if (enabled(services.mariadb)) {
     packages.push(PANTRY_PACKAGES.mariadb);
@@ -84772,7 +84816,7 @@ await init_dist2();
 import { existsSync as existsSync18, readFileSync as readFileSync15 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { join as join18 } from "node:path";
-import { execSync as execSync5 } from "node:child_process";
+import { execSync as execSync3 } from "node:child_process";
 
 // src/drivers/hetzner/client.ts
 var DEFAULT_API_URL = "https://api.hetzner.cloud/v1";
@@ -85708,7 +85752,7 @@ class HetznerDriver {
     let lastErr;
     while (Date.now() - start < sshTimeoutMs) {
       try {
-        execSync5(`ssh ${this.sshBaseArgs(host, ["-o", "ConnectTimeout=5"]).map((a) => `"${a.replace(/"/g, "\\\"")}"`).join(" ")} true`, {
+        execSync3(`ssh ${this.sshBaseArgs(host, ["-o", "ConnectTimeout=5"]).map((a) => `"${a.replace(/"/g, "\\\"")}"`).join(" ")} true`, {
           stdio: "pipe",
           maxBuffer: SSH_MAX_BUFFER
         });
@@ -85768,7 +85812,7 @@ ${out}`);
     ];
   }
   scpToHost(host, localPath, remotePath) {
-    execSync5([
+    execSync3([
       "scp",
       "-i",
       this.sshPrivateKeyPath,
@@ -85781,7 +85825,7 @@ ${out}`);
   }
   sshExec(host, script) {
     const escaped = script.replace(/'/g, `'\\''`);
-    return execSync5(`ssh ${this.sshBaseArgs(host).map((a) => `"${a.replace(/"/g, "\\\"")}"`).join(" ")} '${escaped}'`, {
+    return execSync3(`ssh ${this.sshBaseArgs(host).map((a) => `"${a.replace(/"/g, "\\\"")}"`).join(" ")} '${escaped}'`, {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"],
       maxBuffer: SSH_MAX_BUFFER

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/ts-cloud",
   "type": "module",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "A lightweight, performant infrastructure-as-code library and CLI for deploying both server-based (EC2) and serverless applications.",
   "author": "Chris Breuer <chris@stacksjs.com>",
   "license": "MIT",
@@ -89,8 +89,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ts-cloud/aws-types": "0.5.2",
-    "@ts-cloud/core": "0.5.2",
+    "@ts-cloud/aws-types": "0.5.4",
+    "@ts-cloud/core": "0.5.4",
     "@stacksjs/ts-xml": "^0.1.0"
   },
   "devDependencies": {