@awsless/cli 0.0.8 → 0.0.9

package/dist/bin.js

@@ -7237,6 +7237,7 @@ var iconFeature = defineFeature({
 import { Group as Group26, Output as Output7, resolveInputs as resolveInputs4, findInputDeps as findInputDeps4 } from "@terraforge/core";
 import { aws as aws27 } from "@terraforge/aws";
 import { camelCase as camelCase8 } from "change-case";
+import deepmerge5 from "deepmerge";
 import { relative as relative8 } from "path";
 
 // src/feature/job/util.ts
@@ -7461,45 +7462,9 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
   const variableDeps = /* @__PURE__ */ new Set();
   const taskDependsOn = [code];
   const accessPoint = props.persistentStorage ? (() => {
-    const persistentStorageSecurityGroup = new aws26.security.Group(
-      group,
-      "persistent-storage-security-group",
-      {
-        name: shortId(`${shortName}:storage-sg`),
-        description: name,
-        vpcId: ctx.shared.get("vpc", "id"),
-        revokeRulesOnDelete: true,
-        tags
-      }
-    );
-    new aws26.vpc.SecurityGroupIngressRule(group, "persistent-storage-ingress-rule", {
-      securityGroupId: persistentStorageSecurityGroup.id,
-      referencedSecurityGroupId: ctx.shared.get("job", "security-group-id"),
-      description: "Allow NFS traffic from this job",
-      ipProtocol: "tcp",
-      fromPort: 2049,
-      toPort: 2049,
-      tags
-    });
-    const fileSystem = new aws26.efs.FileSystem(group, "persistent-storage-file-system", {
-      encrypted: true,
-      performanceMode: "generalPurpose",
-      throughputMode: "elastic",
-      tags: {
-        ...tags,
-        Name: `${name}-storage`
-      }
-    });
-    for (const [index, subnetId] of ctx.shared.get("vpc", "public-subnets").entries()) {
-      const mountTarget = new aws26.efs.MountTarget(group, `mount-target-${index + 1}`, {
-        fileSystemId: fileSystem.id,
-        subnetId,
-        securityGroups: [persistentStorageSecurityGroup.id]
-      });
-      taskDependsOn.push(mountTarget);
-    }
+    const fileSystemId = ctx.shared.get("job", "persistent-storage-file-system-id");
     const accessPoint2 = new aws26.efs.AccessPoint(group, "access-point", {
-      fileSystemId: fileSystem.id,
+      fileSystemId,
       rootDirectory: {
         path: `/jobs/${name}`,
         creationInfo: {
@@ -7510,10 +7475,10 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
       },
       tags
     });
-    taskDependsOn.push(fileSystem, accessPoint2);
+    taskDependsOn.push(accessPoint2);
     return {
       accessPoint: accessPoint2,
-      fileSystem
+      fileSystemId
     };
   })() : void 0;
   const task2 = new aws26.ecs.TaskDefinition(
@@ -7537,7 +7502,7 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
           {
             name: "persistent-storage",
             efsVolumeConfiguration: {
-              fileSystemId: accessPoint.fileSystem.id,
+              fileSystemId: accessPoint.fileSystemId,
               transitEncryption: "ENABLED",
               authorizationConfig: {
                 accessPointId: accessPoint.accessPoint.id
@@ -7760,6 +7725,52 @@ var jobFeature = defineFeature({
       }
     });
     ctx.shared.set("job", "security-group-id", securityGroup.id);
+    const needsPersistentStorage = ctx.stackConfigs.some(
+      (stack) => Object.values(stack.jobs ?? {}).some((job) => {
+        const merged = deepmerge5(ctx.appConfig.defaults.job, job);
+        return merged.persistentStorage;
+      })
+    );
+    if (needsPersistentStorage) {
+      const storageGroup = new Group26(ctx.base, "job", "persistent-storage");
+      const storageSecurityGroup = new aws27.security.Group(storageGroup, "security-group", {
+        name: `${ctx.app.name}-job-storage`,
+        description: "Shared security group for job persistent storage",
+        vpcId: ctx.shared.get("vpc", "id"),
+        revokeRulesOnDelete: true,
+        tags: {
+          APP: ctx.appConfig.name
+        }
+      });
+      new aws27.vpc.SecurityGroupIngressRule(storageGroup, "ingress-rule", {
+        securityGroupId: storageSecurityGroup.id,
+        referencedSecurityGroupId: securityGroup.id,
+        description: "Allow NFS traffic from jobs",
+        ipProtocol: "tcp",
+        fromPort: 2049,
+        toPort: 2049,
+        tags: {
+          APP: ctx.appConfig.name
+        }
+      });
+      const fileSystem = new aws27.efs.FileSystem(storageGroup, "file-system", {
+        encrypted: true,
+        performanceMode: "generalPurpose",
+        throughputMode: "elastic",
+        tags: {
+          APP: ctx.appConfig.name,
+          Name: `${ctx.app.name}-job-storage`
+        }
+      });
+      for (const [index, subnetId] of ctx.shared.get("vpc", "public-subnets").entries()) {
+        new aws27.efs.MountTarget(storageGroup, `mount-target-${index + 1}`, {
+          fileSystemId: fileSystem.id,
+          subnetId,
+          securityGroups: [storageSecurityGroup.id]
+        });
+      }
+      ctx.shared.set("job", "persistent-storage-file-system-id", fileSystem.id);
+    }
   },
   onStack(ctx) {
     const jobs = Object.entries(ctx.stackConfig.jobs ?? {});
@@ -7820,7 +7831,7 @@ import { aws as aws28 } from "@terraforge/aws";
 import { Group as Group27, Output as Output8, findInputDeps as findInputDeps5, resolveInputs as resolveInputs5 } from "@terraforge/core";
 import { constantCase as constantCase13, pascalCase as pascalCase4 } from "change-case";
 import { createHash as createHash6 } from "crypto";
-import deepmerge5 from "deepmerge";
+import deepmerge6 from "deepmerge";
 import { join as join19 } from "path";
 
 // src/feature/instance/build/executable.ts
@@ -7883,7 +7894,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     resourceName: id
   });
   const shortName = shortId(`${ctx.app.name}:${ctx.stack.name}:${ns}:${id}:${ctx.appId}`);
-  const props = deepmerge5(ctx.appConfig.defaults.instance, local);
+  const props = deepmerge6(ctx.appConfig.defaults.instance, local);
   const image2 = props.image || (props.architecture === "arm64" ? "public.ecr.aws/aws-cli/aws-cli:arm64" : "public.ecr.aws/aws-cli/aws-cli:amd64");
   ctx.registerBuild("instance", name, async (build3, { workspace }) => {
     const fingerprint = await generateFileHash3(workspace, local.code.file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -87,23 +87,23 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.6",
-    "@awsless/clui": "^0.0.8",
-    "@awsless/dynamodb": "^0.3.20",
     "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/clui": "^0.0.8",
     "@awsless/duration": "^0.0.4",
+    "@awsless/dynamodb": "^0.3.20",
     "@awsless/iot": "^0.0.5",
     "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.42",
+    "@awsless/s3": "^0.0.21",
     "@awsless/redis": "^0.0.16",
     "@awsless/scheduler": "^0.0.4",
     "@awsless/size": "^0.0.2",
-    "@awsless/sns": "^0.0.10",
     "@awsless/sqs": "^0.0.21",
-    "@awsless/s3": "^0.0.21",
-    "@awsless/validate": "^0.1.7",
     "@awsless/ts-file-cache": "^0.0.13",
+    "@awsless/validate": "^0.1.7",
     "@awsless/weak-cache": "^0.0.1",
-    "awsless": "^0.0.3"
+    "awsless": "^0.0.3",
+    "@awsless/sns": "^0.0.10"
   },
   "devDependencies": {
     "@hono/node-server": "1.19.9",