@granite-js/pulumi-aws 2.5.2 → 2.5.3

package/dist/lambda/auto-cache-removal.js

@@ -100,6 +100,26 @@ import {
   fromUtf8,
   toUtf8
 } from "../chunk-Z4UYYQ4J.js";
+import {
+  validateChannel
+} from "../chunk-GEE3OQDP.js";
+import "../chunk-V7TRGEV6.js";
+import "../chunk-3AVBP57V.js";
+import "../chunk-ZIHRRTTA.js";
+import "../chunk-3JKQPIJ2.js";
+import "../chunk-7NN7DVGK.js";
+import "../chunk-63Q3RLAK.js";
+import "../chunk-OCHPLE5N.js";
+import "../chunk-GJFKL6XM.js";
+import "../chunk-24XYHOWM.js";
+import "../chunk-57WYIP4I.js";
+import "../chunk-TDZTH7TL.js";
+import "../chunk-RYIGWCGK.js";
+import "../chunk-H4QJ5O4E.js";
+import "../chunk-THUA35UY.js";
+
+// src/lambda/utils/invalidation.ts
+import { randomUUID } from "crypto";
 
 // ../../.yarn/cache/@aws-sdk-core-npm-3.940.0-0d32a8e8d2-090b960007.zip/node_modules/@aws-sdk/core/dist-es/submodules/protocols/xml/parseXmlBody.js
 var loadRestXmlErrorCode = (output, data) => {
@@ -14076,6 +14096,10 @@ function isCurrentFile(key) {
   const pathParts = key.split("/");
   return pathParts.length === 3 && pathParts[0] === "deployments" && ["CURRENT", "deployment_state"].includes(pathParts[2] ?? "");
 }
+function isSelectorRegistrationFile(key) {
+  const parts = key.split("/");
+  return parts.length === 4 && parts[0] === "deployments" && parts[2] === "selectors" && Boolean(parts[3]?.endsWith(".json"));
+}
 function isClusterDeploymentInfoFile(key) {
   const pathParts = key.split("/");
   return Boolean(
@@ -14086,11 +14110,20 @@ function isClusterDeploymentInfoFile(key) {
 // src/lambda/utils/invalidation.ts
 var cloudFrontClient = new CloudFrontClient({});
 function getPathsToInvalidate(key) {
+  if (key.startsWith("channels/")) {
+    const [, channel, ...parts] = key.split("/");
+    try {
+      validateChannel(channel ?? "");
+    } catch {
+      return [];
+    }
+    key = parts.join("/");
+  }
   const appName = extractAppName(key);
   if (!appName) {
     return [];
   }
-  if (isCurrentFile(key)) {
+  if (isCurrentFile(key) || isSelectorRegistrationFile(key)) {
     return [`/ios/${appName}/*`, `/android/${appName}/*`];
   }
   if (isClusterDeploymentInfoFile(key)) {
@@ -14102,8 +14135,7 @@ function getPathsToInvalidate(key) {
   return [];
 }
 async function createInvalidation(paths, distributionId) {
-  const timestamp = (/* @__PURE__ */ new Date()).getTime();
-  const callerReference = `s3-triggered-invalidation-${timestamp}`;
+  const callerReference = `s3-triggered-invalidation-${randomUUID()}`;
   const params = {
     DistributionId: distributionId,
     InvalidationBatch: {

package/dist/lambda/origin-request.cjs

@@ -29416,16 +29416,66 @@ var S3Client2 = class {
     const response = await this.s3Client.send(command);
     return response;
   }
+  async *listObjectKeys(prefix) {
+    let continuationToken;
+    for (; ; ) {
+      const response = await this.s3Client.send(
+        new ListObjectsV2Command({
+          Bucket: this.bucket,
+          Prefix: prefix,
+          ContinuationToken: continuationToken
+        })
+      );
+      for (const object2 of response.Contents ?? []) {
+        if (object2.Key !== void 0) {
+          yield object2.Key;
+        }
+      }
+      if (!response.IsTruncated) {
+        return;
+      }
+      continuationToken = response.NextContinuationToken;
+      if (!continuationToken) {
+        throw new Error("Truncated S3 listing has no continuation token");
+      }
+    }
+  }
   destroy() {
     this.s3Client.destroy();
   }
 };
+var InvalidRequest3 = class extends Error {
+  constructor(message) {
+    super();
+    this.name = "InvalidRequest";
+    this.message = message;
+  }
+};
+function validateChannel(channel) {
+  if (channel === "bundle") {
+    throw new InvalidRequest3("bundle is reserved for the legacy default bundle");
+  }
+  if (!isChannelName(channel)) {
+    throw new InvalidRequest3(
+      "Channel must contain 1-64 letters, digits, underscores or hyphens, starting with a letter or digit"
+    );
+  }
+  return channel;
+}
+function isChannelName(value) {
+  return typeof value === "string" && value !== "bundle" && /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(value);
+}
+function channelPrefix(channel) {
+  return channel === void 0 ? "" : `channels/${validateChannel(channel)}/`;
+}
 var paths = {
-  bundlePathPrefix: (appName, deploymentId) => `bundles/${appName}/${deploymentId}`,
-  bundleList: (appName) => `deployments/${appName}/DEPLOYMENTS`,
-  deploymentState: (appName) => `deployments/${appName}/deployment_state`,
-  clusterDeploymentState: (appName, clusterId) => `deployments/${appName}/clusters/${clusterId}`,
-  clusterDeploymentInfoPath: (appName, clusterId) => `deployments/${appName}/clusters/${clusterId}.deploymentInfo`
+  appBundlePrefix: ({ appName, channel }) => `${channelPrefix(channel)}bundles/${appName}/`,
+  selectorRegistration: ({ appName, selector }) => `deployments/${appName}/selectors/${encodeURIComponent(selector)}.json`,
+  bundlePathPrefix: ({ appName, deploymentId, channel }) => `${channelPrefix(channel)}bundles/${appName}/${deploymentId}`,
+  bundleList: ({ appName, channel }) => `${channelPrefix(channel)}deployments/${appName}/DEPLOYMENTS`,
+  deploymentState: ({ appName, channel }) => `${channelPrefix(channel)}deployments/${appName}/deployment_state`,
+  clusterDeploymentState: ({ appName, clusterId, channel }) => `${channelPrefix(channel)}deployments/${appName}/clusters/${clusterId}`,
+  clusterDeploymentInfoPath: ({ appName, clusterId, channel }) => `${channelPrefix(channel)}deployments/${appName}/clusters/${clusterId}.deploymentInfo`
 };
 function shuffle(arr) {
   const result = arr.slice();
@@ -29540,7 +29590,7 @@ function isFullyRollout(config) {
 }
 async function readBundleList(appName, context) {
   const { s3Client } = context;
-  const data = await s3Client.getObject(paths.bundleList(appName));
+  const data = await s3Client.getObject(paths.bundleList({ appName, channel: context.channel }));
   return JSON.parse(data);
 }
 var store$4;
@@ -29906,8 +29956,8 @@ var clusterDeploymentInfo = /* @__PURE__ */ object({
 var deploymentState = /* @__PURE__ */ union([pendingDeploymentState, stableDeploymentState, canaryDeploymentState]);
 async function readCluster({ appName, clusterId }, context) {
   const { s3Client } = context;
+  const deploymentInfoPath = paths.clusterDeploymentInfoPath({ appName, clusterId, channel: context.channel });
   try {
-    const deploymentInfoPath = paths.clusterDeploymentInfoPath(appName, clusterId);
     const rawData = await s3Client.getObject(deploymentInfoPath);
     const { deploymentId } = parse2(clusterDeploymentInfo, JSON.parse(rawData));
     return deploymentId;
@@ -29924,7 +29974,7 @@ var InternalServerError = class extends Error {
 };
 async function readDeploymentState(appName, context) {
   const { s3Client } = context;
-  const deploymentStatePath = paths.deploymentState(appName);
+  const deploymentStatePath = paths.deploymentState({ appName, channel: context.channel });
   try {
     const rawData = await s3Client.getObject(deploymentStatePath);
     const state2 = parse2(deploymentState, JSON.parse(rawData));
@@ -29936,19 +29986,12 @@ async function readDeploymentState(appName, context) {
     throw error;
   }
 }
-function resolveBundle({ appName, platform: platform2, deploymentId, tag }) {
-  const bundleUrlPrefix = paths.bundlePathPrefix(appName, deploymentId);
+function resolveBundle({ appName, platform: platform2, deploymentId, tag, channel }) {
+  const bundleUrlPrefix = paths.bundlePathPrefix({ appName, deploymentId, channel });
   const extension = "hbc.gz";
   const name = [BUNDLE_BASE_NAME, platform2, tag, extension].filter(Boolean).join(".");
   return `${bundleUrlPrefix}/${name}`;
 }
-var InvalidRequest3 = class extends Error {
-  constructor(message) {
-    super();
-    this.name = "InvalidRequest";
-    this.message = message;
-  }
-};
 var NotFoundError = class extends Error {
   constructor(message) {
     super();
@@ -29986,8 +30029,8 @@ async function resolveDeploymentIdByGroupId(appName, numericGroupId, context) {
 }
 async function resolveDeploymentIdByCluster(appName, clusterId, context) {
   const { s3Client } = context;
+  const clusterDeploymentInfoPath = paths.clusterDeploymentInfoPath({ appName, clusterId, channel: context.channel });
   try {
-    const clusterDeploymentInfoPath = paths.clusterDeploymentInfoPath(appName, clusterId);
     const rawData = await s3Client.getObject(clusterDeploymentInfoPath);
     const deploymentInfo = parse2(clusterDeploymentInfo, JSON.parse(rawData));
     return deploymentInfo.deploymentId;
@@ -29998,9 +30041,94 @@ async function resolveDeploymentIdByCluster(appName, clusterId, context) {
     throw new InternalServerError("resolveDeploymentIdByCluster", error);
   }
 }
+var registrationSchema = /* @__PURE__ */ object({
+  version: /* @__PURE__ */ literal(1),
+  type: /* @__PURE__ */ union([/* @__PURE__ */ literal("CHANNEL"), /* @__PURE__ */ literal("LEGACY_TAG")])
+});
+function isAppName(appName) {
+  return /^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(appName);
+}
+async function readRegistration(options, { s3Client }) {
+  let raw;
+  try {
+    raw = await s3Client.getObject(paths.selectorRegistration(options));
+  } catch (error) {
+    if (error instanceof NoSuchKey) {
+      return void 0;
+    }
+    throw error;
+  }
+  try {
+    return parse2(registrationSchema, JSON.parse(raw));
+  } catch (error) {
+    throw new InternalServerError("Invalid selector registration", error);
+  }
+}
+async function resolveChannel(options, context) {
+  if (!isAppName(options.appName) || !isChannelName(options.selector)) {
+    return void 0;
+  }
+  const registration = await readRegistration(options, context);
+  return registration?.type === "CHANNEL" ? options.selector : void 0;
+}
+async function registerChannel({ appName, channel }, context) {
+  validateChannel(channel);
+  if (!isAppName(appName)) {
+    throw new InvalidRequest3("Channel registration requires a URL-safe application name");
+  }
+  await claimSelector({ appName, selector: channel }, "CHANNEL", context);
+}
+async function reserveLegacyTag(options, context) {
+  if (isAppName(options.appName) && isChannelName(options.selector)) {
+    await claimSelector(options, "LEGACY_TAG", context);
+  }
+}
+async function claimSelector(options, type, context) {
+  const { s3Client } = context;
+  let lastConflict;
+  for (let attempt = 0; attempt < 3; attempt++) {
+    const existing = await readRegistration(options, context);
+    if (existing !== void 0) {
+      if (existing.type !== type) {
+        throw new InvalidRequest3(
+          `Selector ${options.selector} for ${options.appName} is already reserved as ${existing.type}`
+        );
+      }
+      return;
+    }
+    if (type === "CHANNEL") {
+      const prefix = paths.appBundlePrefix({ appName: options.appName });
+      for await (const key of s3Client.listObjectKeys(prefix)) {
+        if (["ios", "android"].some((platform2) => key.endsWith(`/bundle.${platform2}.${options.selector}.hbc.gz`))) {
+          throw new InvalidRequest3(
+            `Channel ${options.selector} conflicts with an existing legacy bundle tag for ${options.appName}`
+          );
+        }
+      }
+    }
+    try {
+      await s3Client.putObject(paths.selectorRegistration(options), {
+        Body: JSON.stringify({ version: 1, type }),
+        ContentType: "application/json",
+        CacheControl: "no-store",
+        IfNoneMatch: "*"
+      });
+      return;
+    } catch (error) {
+      if (!(error instanceof S3ServiceException) || ![409, 412].includes(error.$metadata.httpStatusCode ?? 0)) {
+        throw error;
+      }
+      lastConflict = error;
+    }
+  }
+  throw new InternalServerError("Concurrent selector registration could not be completed", lastConflict);
+}
 async function rollout({ state: state2, appName }, context) {
   const { s3Client } = context;
-  await s3Client.putObject(paths.deploymentState(appName), {
+  if (context.channel !== void 0) {
+    await registerChannel({ appName, channel: context.channel }, context);
+  }
+  await s3Client.putObject(paths.deploymentState({ appName, channel: context.channel }), {
     Body: JSON.stringify(state2),
     ContentType: "application/json"
   });
@@ -30008,14 +30136,17 @@ async function rollout({ state: state2, appName }, context) {
 }
 async function rolloutCluster({ appName, deploymentId, clusterId }, context) {
   const { s3Client } = context;
-  await s3Client.putObject(paths.clusterDeploymentState(appName, clusterId), {
+  if (context.channel !== void 0) {
+    await registerChannel({ appName, channel: context.channel }, context);
+  }
+  await s3Client.putObject(paths.clusterDeploymentInfoPath({ appName, clusterId, channel: context.channel }), {
     Body: JSON.stringify({ deploymentId }),
     ContentType: "application/json"
   });
 }
 async function writeBundleList(appName, deploymentInfo, context) {
   const { s3Client } = context;
-  await s3Client.putObject(paths.bundleList(appName), {
+  await s3Client.putObject(paths.bundleList({ appName, channel: context.channel }), {
     Body: JSON.stringify(deploymentInfo.slice(0, MAX_HISTORY_COUNT)),
     ContentType: "application/json"
   });
@@ -30040,7 +30171,12 @@ function toDeployedAtString(date2) {
 }
 async function uploadBundle({ bundlePath, appName, deploymentId, deployedAt, platform: platform2, tag }, context) {
   const { s3Client } = context;
-  const bundlePathKey = resolveBundle({ appName, platform: platform2, deploymentId, tag });
+  const bundlePathKey = resolveBundle({ appName, platform: platform2, deploymentId, tag, channel: context.channel });
+  if (context.channel !== void 0) {
+    await registerChannel({ appName, channel: context.channel }, context);
+  } else if (tag) {
+    await reserveLegacyTag({ appName, selector: tag }, context);
+  }
   await s3Client.putObject(bundlePathKey, {
     Body: fs3.createReadStream(bundlePath),
     Metadata: {
@@ -30057,6 +30193,8 @@ async function uploadBundle({ bundlePath, appName, deploymentId, deployedAt, pla
   return { bundlePathKey, deploymentInfo };
 }
 var DeployManager = {
+  registerChannel,
+  resolveChannel,
   planRollout,
   rollout,
   rolloutCluster,
@@ -30120,6 +30258,14 @@ function createOriginRequestHandler(context) {
       if (appName == null || platform2 == null || groupId == null) {
         throw new InvalidRequest3("invalid request");
       }
+      const channel = await DeployManager.resolveChannel({ appName, selector: suffix }, { s3Client });
+      const tag = channel !== void 0 || suffix === "bundle" ? void 0 : suffix;
+      if (channel !== void 0) {
+        const parts = request2.uri.split("/");
+        if (parts.length !== 5 || !["ios", "android"].includes(parts[1] ?? "") || parts.slice(2).some((part) => !part)) {
+          throw new InvalidRequest3("Expected /<platform>/<app>/<group>/<selector>");
+        }
+      }
       const deploymentId = await DeployManager.resolveDeploymentId(
         {
           appName,
@@ -30127,14 +30273,16 @@ function createOriginRequestHandler(context) {
           allowAccessCluster: context.allowAccessCluster
         },
         {
-          s3Client
+          s3Client,
+          channel
         }
       );
       const bundlePath = DeployManager.resolveBundle({
         appName,
         platform: platform2,
         deploymentId,
-        tag: suffix !== "bundle" ? suffix : void 0
+        channel,
+        tag
       });
       const absolutePath = `/${bundlePath}`;
       request2.uri = absolutePath;
@@ -30146,6 +30294,9 @@ function createOriginRequestHandler(context) {
       ];
       return request2;
     } catch (error) {
+      if (error instanceof NoSuchKey) {
+        return { status: "404", statusDescription: "Deployment not found" };
+      }
       if (error instanceof NotFoundError) {
         return { status: "404", statusDescription: error.message };
       }

package/dist/lambda/origin-request.js

@@ -1,9 +1,10 @@
 import {
   DeployManager,
   InvalidRequest3,
+  NoSuchKey,
   NotFoundError,
   S3Client2
-} from "../chunk-ZBT5SDIQ.js";
+} from "../chunk-GEE3OQDP.js";
 import "../chunk-V7TRGEV6.js";
 import "../chunk-3AVBP57V.js";
 import "../chunk-ZIHRRTTA.js";
@@ -70,6 +71,14 @@ function createOriginRequestHandler(context) {
       if (appName == null || platform == null || groupId == null) {
         throw new InvalidRequest3("invalid request");
       }
+      const channel = await DeployManager.resolveChannel({ appName, selector: suffix }, { s3Client });
+      const tag = channel !== void 0 || suffix === "bundle" ? void 0 : suffix;
+      if (channel !== void 0) {
+        const parts = request.uri.split("/");
+        if (parts.length !== 5 || !["ios", "android"].includes(parts[1] ?? "") || parts.slice(2).some((part) => !part)) {
+          throw new InvalidRequest3("Expected /<platform>/<app>/<group>/<selector>");
+        }
+      }
       const deploymentId = await DeployManager.resolveDeploymentId(
         {
           appName,
@@ -77,14 +86,16 @@ function createOriginRequestHandler(context) {
           allowAccessCluster: context.allowAccessCluster
         },
         {
-          s3Client
+          s3Client,
+          channel
         }
       );
       const bundlePath = DeployManager.resolveBundle({
         appName,
         platform,
         deploymentId,
-        tag: suffix !== "bundle" ? suffix : void 0
+        channel,
+        tag
       });
       const absolutePath = `/${bundlePath}`;
       request.uri = absolutePath;
@@ -96,6 +107,9 @@ function createOriginRequestHandler(context) {
       ];
       return request;
     } catch (error) {
+      if (error instanceof NoSuchKey) {
+        return { status: "404", statusDescription: "Deployment not found" };
+      }
       if (error instanceof NotFoundError) {
         return { status: "404", statusDescription: error.message };
       }

package/dist/lambda/origin-response.js

@@ -1,6 +1,6 @@
 import {
   InvalidRequest3
-} from "../chunk-ZBT5SDIQ.js";
+} from "../chunk-GEE3OQDP.js";
 import "../chunk-V7TRGEV6.js";
 import "../chunk-3AVBP57V.js";
 import "../chunk-ZIHRRTTA.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/pulumi-aws",
   "type": "module",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -65,8 +65,8 @@
   },
   "devDependencies": {
     "@aws-sdk/client-cloudfront": "^3.812.0",
-    "@granite-js/deployment-manager": "2.5.2",
-    "@granite-js/utils": "2.5.2",
+    "@granite-js/deployment-manager": "2.5.3",
+    "@granite-js/utils": "2.5.3",
     "@pulumi/aws": "^6.80.0",
     "@pulumi/pulumi": "^3.170.0",
     "@types/aws-lambda": "^8.10.149",