@awsless/cli 0.0.32 → 0.0.34

package/dist/bin.js

@@ -3543,6 +3543,57 @@ var formatByteSize = (size) => {
   return color.attr(number) + color.attr.dim(unit);
 };
 
+// src/util/policy.ts
+import { pascalCase } from "change-case";
+var sortKeysDeep = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(sortKeysDeep);
+  }
+  if (value && typeof value === "object") {
+    const entries = Object.entries(value);
+    return Object.fromEntries(
+      entries.sort(([a], [b]) => a.localeCompare(b)).map(([key, entry]) => {
+        return [key, sortKeysDeep(entry)];
+      })
+    );
+  }
+  return value;
+};
+var unique = (list3) => {
+  return [...new Set(list3)];
+};
+var mergePolicyStatements = (statements) => {
+  const merged = /* @__PURE__ */ new Map();
+  for (const statement of statements) {
+    const effect = statement.effect ?? "allow";
+    const actions = unique(statement.actions).sort();
+    const key = JSON.stringify([effect, actions, sortKeysDeep(statement.conditions) ?? null]);
+    const entry = merged.get(key);
+    if (entry) {
+      entry.resources = unique([...entry.resources, ...statement.resources]);
+    } else {
+      merged.set(key, {
+        effect,
+        actions,
+        resources: unique(statement.resources),
+        conditions: statement.conditions
+      });
+    }
+  }
+  return [...merged.values()];
+};
+var formatPolicyDocument = (statements) => {
+  return {
+    Version: "2012-10-17",
+    Statement: mergePolicyStatements(statements).map((statement) => ({
+      Effect: pascalCase(statement.effect ?? "allow"),
+      Action: statement.actions,
+      Resource: statement.resources,
+      Condition: statement.conditions
+    }))
+  };
+};
+
 // src/feature/on-failure/util.ts
 var getGlobalOnFailure = (ctx) => {
   return ctx.shared.get("on-failure", "bucket-arn");
@@ -3572,7 +3623,6 @@ var zipFiles = (files) => {
 // src/feature/function/util.ts
 import { toDays as toDays5, toSeconds } from "@awsless/duration";
 import { toMebibytes as toMebibytes3 } from "@awsless/size";
-import { pascalCase } from "change-case";
 
 // src/util/cache.ts
 import { lstat as lstat2, readdir } from "fs/promises";
@@ -3871,17 +3921,7 @@ var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
     name: "lambda-policy",
     policy: new Output3(statementDeps, async (resolve2) => {
       const list3 = await resolveInputs(statements);
-      resolve2(
-        JSON.stringify({
-          Version: "2012-10-17",
-          Statement: list3.map((statement) => ({
-            Effect: pascalCase(statement.effect ?? "allow"),
-            Action: statement.actions,
-            Resource: statement.resources,
-            Condition: statement.conditions
-          }))
-        })
-      );
+      resolve2(JSON.stringify(formatPolicyDocument(list3)));
     })
   });
   let dependsOn = [];
@@ -4550,7 +4590,6 @@ import { days as days8, seconds as seconds5, toDays as toDays6, toSeconds as toS
 import { mebibytes as mebibytes2, toMebibytes as toMebibytes4 } from "@awsless/size";
 import { aws as aws8 } from "@terraforge/aws";
 import { Output as Output4, findInputDeps as findInputDeps2, resolveInputs as resolveInputs2 } from "@terraforge/core";
-import { pascalCase as pascalCase2 } from "change-case";
 var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
   let name;
   let roleName;
@@ -4641,16 +4680,7 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
     name: "lambda-policy",
     policy: new Output4(statementDeps, async (resolve2) => {
       const list3 = await resolveInputs2(statements);
-      resolve2(
-        JSON.stringify({
-          Version: "2012-10-17",
-          Statement: list3.map((statement) => ({
-            Effect: pascalCase2(statement.effect ?? "allow"),
-            Action: statement.actions,
-            Resource: statement.resources
-          }))
-        })
-      );
+      resolve2(JSON.stringify(formatPolicyDocument(list3)));
     })
   });
   const variables = {};
@@ -5103,7 +5133,7 @@ import { toDays as toDays7 } from "@awsless/duration";
 import { stringify } from "@awsless/json";
 import { aws as aws11 } from "@terraforge/aws";
 import { Group as Group10, Output as Output5, findInputDeps as findInputDeps3, resolveInputs as resolveInputs3 } from "@terraforge/core";
-import { pascalCase as pascalCase3 } from "change-case";
+import { pascalCase as pascalCase2 } from "change-case";
 import { createHash as createHash4 } from "crypto";
 import { readFile as readFile5 } from "fs/promises";
 import { fileURLToPath } from "url";
@@ -5244,7 +5274,7 @@ var createPubSubService = (parentGroup, ctx, id, props, inputs) => {
               Version: "2012-10-17",
               Statement: [
                 {
-                  Effect: pascalCase3("allow"),
+                  Effect: pascalCase2("allow"),
                   Action: ["s3:getObject", "s3:HeadObject"],
                   Resource: `arn:aws:s3:::${bucket}/${key}`
                 }
@@ -5265,16 +5295,7 @@ var createPubSubService = (parentGroup, ctx, id, props, inputs) => {
     name: "task-policy",
     policy: new Output5(statementDeps, async (resolve2) => {
       const list3 = await resolveInputs3(statements);
-      resolve2(
-        JSON.stringify({
-          Version: "2012-10-17",
-          Statement: list3.map((statement) => ({
-            Effect: pascalCase3(statement.effect ?? "allow"),
-            Action: statement.actions,
-            Resource: statement.resources
-          }))
-        })
-      );
+      resolve2(JSON.stringify(formatPolicyDocument(list3)));
     })
   });
   const addPermission = (...permissions) => {
@@ -6695,12 +6716,12 @@ var storeFeature = defineFeature({
     ctx.addAppPermission({
       actions: [
         "s3:ListBucket",
-        "s3:ListBucketV2",
-        "s3:HeadObject",
+        // 's3:ListBucketV2',
+        // 's3:HeadObject',
         "s3:GetObject",
         "s3:PutObject",
         "s3:DeleteObject",
-        "s3:CopyObject",
+        // 's3:CopyObject',
         "s3:GetObjectAttributes"
       ],
       resources: [
@@ -7017,7 +7038,6 @@ var tableFeature = defineFeature({
           "dynamodb:GetItem",
           "dynamodb:UpdateItem",
           "dynamodb:DeleteItem",
-          "dynamodb:TransactWrite",
           "dynamodb:BatchWriteItem",
           "dynamodb:BatchGetItem",
           "dynamodb:ConditionCheckItem",
@@ -7895,7 +7915,7 @@ import { toMebibytes as toMebibytes5 } from "@awsless/size";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
 import { aws as aws27 } from "@terraforge/aws";
 import { Group as Group26, Output as Output7, findInputDeps as findInputDeps4, resolveInputs as resolveInputs4 } from "@terraforge/core";
-import { constantCase as constantCase12, pascalCase as pascalCase4 } from "change-case";
+import { constantCase as constantCase12, pascalCase as pascalCase3 } from "change-case";
 import deepmerge4 from "deepmerge";
 
 // src/feature/job/build/executable.ts
@@ -8043,7 +8063,7 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
               Version: "2012-10-17",
               Statement: [
                 {
-                  Effect: pascalCase4("allow"),
+                  Effect: pascalCase3("allow"),
                   Action: ["s3:GetObject", "s3:HeadObject"],
                   Resource: [`arn:aws:s3:::${bucket}/${key}`, `arn:aws:s3:::${bucket}/payloads/*`]
                 }
@@ -8064,16 +8084,7 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
     name: "task-policy",
     policy: new Output7(statementDeps, async (resolve2) => {
       const list3 = await resolveInputs4(statements);
-      resolve2(
-        JSON.stringify({
-          Version: "2012-10-17",
-          Statement: list3.map((statement) => ({
-            Effect: pascalCase4(statement.effect ?? "allow"),
-            Action: statement.actions,
-            Resource: statement.resources
-          }))
-        })
-      );
+      resolve2(JSON.stringify(formatPolicyDocument(list3)));
     })
   });
   const addPermission = (...permissions) => {
@@ -8474,7 +8485,7 @@ import { toMebibytes as toMebibytes6 } from "@awsless/size";
 import { generateFileHash as generateFileHash3 } from "@awsless/ts-file-cache";
 import { aws as aws29 } from "@terraforge/aws";
 import { Group as Group28, Output as Output9, findInputDeps as findInputDeps6, resolveInputs as resolveInputs6 } from "@terraforge/core";
-import { constantCase as constantCase13, pascalCase as pascalCase5 } from "change-case";
+import { constantCase as constantCase13, pascalCase as pascalCase4 } from "change-case";
 import { createHash as createHash7 } from "crypto";
 import deepmerge6 from "deepmerge";
 import { join as join21 } from "path";
@@ -8554,7 +8565,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
               Version: "2012-10-17",
               Statement: [
                 {
-                  Effect: pascalCase5("allow"),
+                  Effect: pascalCase4("allow"),
                   Action: ["s3:getObject", "s3:HeadObject"],
                   Resource: `arn:aws:s3:::${bucket}/${key}`
                 }
@@ -8575,16 +8586,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     name: "task-policy",
     policy: new Output9(statementDeps, async (resolve2) => {
       const list3 = await resolveInputs6(statements);
-      resolve2(
-        JSON.stringify({
-          Version: "2012-10-17",
-          Statement: list3.map((statement) => ({
-            Effect: pascalCase5(statement.effect ?? "allow"),
-            Action: statement.actions,
-            Resource: statement.resources
-          }))
-        })
-      );
+      resolve2(JSON.stringify(formatPolicyDocument(list3)));
     })
   });
   const addPermission = (...permissions) => {

package/dist/prebuild/pubsub-server/HASH

@@ -1 +1 @@
-21bcb63caa4b42c523fd0aaf72bc4dc13ab42a60
+7669ae3aa167b158129e305933548bfced402e16