wrangler 4.21.1 → 4.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.21.1",
+  "version": "4.21.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",

package/wrangler-dist/cli.js

@@ -22287,14 +22287,13 @@ var init_utils = __esm({
         });
       });
     }, "runDockerCmdWithOutput");
-    verifyDockerInstalled = /* @__PURE__ */ __name(async (dockerPath) => {
+    verifyDockerInstalled = /* @__PURE__ */ __name(async (dockerPath, isDev = true) => {
       try {
         await runDockerCmd(dockerPath, ["info"], ["inherit", "pipe", "pipe"]);
       } catch {
         throw new Error(
-          `The Docker CLI could not be launched. Please ensure that Docker is installed and running. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN.
-Other container tooling that is compatible with the Docker CLI may work, but is not yet guaranteed to do so.
-To suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or passing in --enable-containers=false.`
+          `The Docker CLI could not be launched. Please ensure that the Docker CLI is installed and the daemon is running.
+Other container tooling that is compatible with the Docker CLI and engine may work, but is not yet guaranteed to do so. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN and a socket with WRANGLER_DOCKER_HOST.${isDev ? "\nTo suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or passing in --enable-containers=false." : ""}`
         );
       }
     }, "verifyDockerInstalled");
@@ -22375,24 +22374,6 @@ var init_types = __esm({
 });
 
 // ../containers-shared/src/images.ts
-async function getDockerImageDigest(dockerPath, imageTag) {
-  return new Promise((resolve24, reject) => {
-    (0, import_child_process4.execFile)(
-      dockerPath,
-      ["images", "--digests", "--format", "{{.Digest}}", imageTag],
-      (error2, stdout2, stderr2) => {
-        if (error2) {
-          return reject(
-            new Error(
-              `Failed getting docker image digest for image: ${imageTag} with error: ${error2}.`
-            )
-          );
-        }
-        return resolve24(stdout2.trim());
-      }
-    );
-  });
-}
 async function pullImage(dockerPath, options) {
   await dockerLoginManagedRegistry(dockerPath);
   await runDockerCmd(dockerPath, [
@@ -22426,16 +22407,13 @@ To use an existing image from another repository, see https://developers.cloudfl
     await checkExposedPorts(dockerPath, options);
   }
 }
-var import_child_process4;
 var init_images = __esm({
   "../containers-shared/src/images.ts"() {
     init_import_meta_url();
-    import_child_process4 = require("child_process");
     init_build();
     init_knobs();
     init_login();
     init_utils();
-    __name(getDockerImageDigest, "getDockerImageDigest");
     __name(pullImage, "pullImage");
     __name(prepareContainerImagesForDev, "prepareContainerImagesForDev");
   }
@@ -29508,7 +29486,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.21.1";
+    version = "4.21.2";
   }
 });
 
@@ -38667,9 +38645,8 @@ function validateContainerApp(envName, topLevelName) {
           );
           return false;
         }
-        containerAppOptional.configuration ??= {
-          image: containerAppOptional.image
-        };
+        containerAppOptional.configuration ??= {};
+        containerAppOptional.configuration.image = containerAppOptional.image;
         delete containerAppOptional["image"];
       }
       if (!isOptionalProperty(
@@ -49164,7 +49141,7 @@ async function getAccessToken(domain2) {
   if (cache[domain2]) {
     return cache[domain2];
   }
-  const output = (0, import_child_process5.spawnSync)("cloudflared", ["access", "login", domain2]);
+  const output = (0, import_child_process4.spawnSync)("cloudflared", ["access", "login", domain2]);
   if (output.error) {
     throw new UserError(
       "To use Wrangler with Cloudflare Access, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
@@ -49178,11 +49155,11 @@ async function getAccessToken(domain2) {
   }
   throw new Error("Failed to authenticate with Cloudflare Access");
 }
-var import_child_process5, import_undici2, cache, usesAccessCache;
+var import_child_process4, import_undici2, cache, usesAccessCache;
 var init_access = __esm({
   "src/user/access.ts"() {
     init_import_meta_url();
-    import_child_process5 = require("child_process");
+    import_child_process4 = require("child_process");
     import_undici2 = __toESM(require_undici());
     init_errors();
     init_logger();
@@ -49799,11 +49776,7 @@ async function logout() {
 }
 function listScopes(message = "\u{1F481} Available scopes:") {
   logger.log(message);
-  const data = DefaultScopeKeys.map((scope) => ({
-    Scope: scope,
-    Description: DefaultScopes[scope]
-  }));
-  logger.table(data);
+  printScopes(DefaultScopeKeys);
 }
 async function getAccountId(complianceConfig) {
   const cachedAccount2 = getAccountFromCache();
@@ -49877,6 +49850,13 @@ function getAccountFromCache() {
 function getScopes() {
   return LocalState.scopes;
 }
+function printScopes(scopes) {
+  const data = scopes.map((scope) => ({
+    Scope: scope,
+    Description: DefaultScopes[scope]
+  }));
+  logger.table(data);
+}
 async function fetchAuthToken(body) {
   const headers = {
     "Content-Type": "application/x-www-form-urlencoded"
@@ -50155,6 +50135,7 @@ var init_user = __esm({
     __name(saveAccountToCache, "saveAccountToCache");
     __name(getAccountFromCache, "getAccountFromCache");
     __name(getScopes, "getScopes");
+    __name(printScopes, "printScopes");
     __name(fetchAuthToken, "fetchAuthToken");
     __name(getJSONFromResponse, "getJSONFromResponse");
   }
@@ -62273,6 +62254,14 @@ async function fillOpenAPIConfiguration(config, _json2, scope) {
   const headers = OpenAPI.HEADERS !== void 0 ? { ...OpenAPI.HEADERS } : {};
   const accountId = await requireAuth(config);
   const auth = requireApiToken();
+  const scopes = getScopes();
+  if (scopes !== void 0 && !scopes.includes(scope)) {
+    logger.error(`You don't have '${scope}' in your list of scopes`);
+    printScopes(scopes ?? []);
+    throw new UserError(
+      `You need '${scope}', try logging in again or creating an appropiate API token`
+    );
+  }
   addAuthorizationHeaderIfUnspecified(headers, auth);
   addUserAgent(headers);
   OpenAPI.CREDENTIALS = "omit";
@@ -62743,9 +62732,9 @@ async function buildAndMaybePush(args, pathToDocker, push, containerConfig) {
     });
     const inspectOutput = await dockerImageInspect(pathToDocker, {
       imageTag,
-      formatString: "{{ .Size }} {{ len .RootFS.Layers }}"
+      formatString: "{{ .Size }} {{ len .RootFS.Layers }} {{json .RepoDigests}}"
     });
-    const [sizeStr, layerStr] = inspectOutput.split(" ");
+    const [sizeStr, layerStr, repoDigests] = inspectOutput.split(" ");
     const size = parseInt(sizeStr, 10);
     const layers = parseInt(layerStr, 10);
     const MiB = 1024 * 1024;
@@ -62755,15 +62744,28 @@ async function buildAndMaybePush(args, pathToDocker, push, containerConfig) {
       account,
       containerApp: containerConfig
     });
+    let pushed = false;
     if (push) {
       await dockerLoginManagedRegistry(pathToDocker);
       try {
+        const parsedDigests = JSON.parse(repoDigests);
+        if (!Array.isArray(parsedDigests)) {
+          throw new Error(
+            `Expected RepoDigests from docker inspect to be an array but got ${JSON.stringify(parsedDigests)}`
+          );
+        }
         const repositoryOnly = imageTag.split(":")[0];
-        const localDigest = await getDockerImageDigest(pathToDocker, imageTag);
-        const digest = repositoryOnly + "@" + localDigest;
+        const digests = parsedDigests.filter(
+          (d6) => typeof d6 === "string" && d6.split("@")[0] === repositoryOnly
+        );
+        if (digests.length !== 1) {
+          throw new Error(
+            `Expected there to only be 1 valid digests for this repository: ${repositoryOnly} but there were ${digests.length}`
+          );
+        }
         await runDockerCmd(
           pathToDocker,
-          ["manifest", "inspect", digest],
+          ["manifest", "inspect", digests[0]],
           "ignore"
         );
         logger.log("Image already exists remotely, skipping push");
@@ -62771,13 +62773,19 @@ async function buildAndMaybePush(args, pathToDocker, push, containerConfig) {
           `Untagging built image: ${imageTag} since there was no change.`
         );
         await runDockerCmd(pathToDocker, ["image", "rm", imageTag]);
-        return "";
+        return { image: digests[0], pushed: false };
       } catch (error2) {
         logger.log(`Image does not exist remotely, pushing: ${imageTag}`);
+        if (error2 instanceof Error) {
+          logger.debug(
+            `Checking for local image ${imageTag} failed with error: ${error2.message}`
+          );
+        }
         await runDockerCmd(pathToDocker, ["push", imageTag]);
+        pushed = true;
       }
     }
-    return imageTag;
+    return { image: imageTag, pushed };
   } catch (error2) {
     if (error2 instanceof Error) {
       throw new UserError(error2.message);
@@ -64004,6 +64012,9 @@ async function apply(args, config) {
     `${config.name}-${appConfigNoDefaults.class_name}`];
     if (!appConfigNoDefaults.configuration?.image && application) {
       appConfigNoDefaults.configuration ??= {};
+    }
+    if (!args.imageUpdateRequired && application) {
+      appConfigNoDefaults.configuration ??= {};
       appConfigNoDefaults.configuration.image = application.configuration.image;
     }
     const appConfig = containerAppToCreateApplication(
@@ -64287,7 +64298,14 @@ ${err.message}`
 }
 async function applyCommand(args, config) {
   return apply(
-    { skipDefaults: args.skipDefaults, env: args.env, json: args.json },
+    {
+      skipDefaults: args.skipDefaults,
+      env: args.env,
+      json: args.json,
+      // For the apply command we want this to default to true
+      // so that the image can be updated if the user modified it.
+      imageUpdateRequired: true
+    },
     config
   );
 }
@@ -64327,7 +64345,10 @@ async function maybeBuildContainer(containerConfig, imageTag, dryRun, pathToDock
     if (!isDockerfile(
       containerConfig.image ?? containerConfig.configuration?.image
     )) {
-      return containerConfig.image ?? containerConfig.configuration?.image;
+      return {
+        image: containerConfig.image ?? containerConfig.configuration?.image,
+        pushed: false
+      };
     }
   } catch (err) {
     if (err instanceof Error) {
@@ -64337,13 +64358,13 @@ async function maybeBuildContainer(containerConfig, imageTag, dryRun, pathToDock
   }
   const options = getBuildArguments(containerConfig, imageTag);
   logger.log("Building image", options.tag);
-  const tag = await buildAndMaybePush(
+  const buildResult = await buildAndMaybePush(
     options,
     pathToDocker,
     !dryRun,
     containerConfig
   );
-  return tag;
+  return buildResult;
 }
 async function deployContainers(config, { versionId, accountId, scriptName, dryRun, env: env6 }) {
   if (config.containers === void 0) {
@@ -64386,16 +64407,24 @@ async function deployContainers(config, { versionId, accountId, scriptName, dryR
         }
       ]
     };
-    const image = await maybeBuildContainer(
+    const buildResult = await maybeBuildContainer(
       container,
       versionId,
       dryRun,
       pathToDocker
     );
     container.configuration ??= {};
-    container.configuration.image = image;
-    container.image = image;
-    await apply({ skipDefaults: false, json: true, env: env6 }, configuration);
+    container.configuration.image = buildResult.image;
+    container.image = buildResult.image;
+    await apply(
+      {
+        skipDefaults: false,
+        json: true,
+        env: env6,
+        imageUpdateRequired: buildResult.pushed
+      },
+      configuration
+    );
   }
 }
 function getBuildArguments(container, idForImageTag) {
@@ -119664,12 +119693,12 @@ var init_getValidatedProcessCredentials = __esm({
 });
 
 // ../../node_modules/.pnpm/@aws-sdk+credential-provider-process@3.716.0/node_modules/@aws-sdk/credential-provider-process/dist-es/resolveProcessCredentials.js
-var import_child_process6, import_util14, resolveProcessCredentials;
+var import_child_process5, import_util14, resolveProcessCredentials;
 var init_resolveProcessCredentials = __esm({
   "../../node_modules/.pnpm/@aws-sdk+credential-provider-process@3.716.0/node_modules/@aws-sdk/credential-provider-process/dist-es/resolveProcessCredentials.js"() {
     init_import_meta_url();
     init_dist_es17();
-    import_child_process6 = require("child_process");
+    import_child_process5 = require("child_process");
     import_util14 = require("util");
     init_getValidatedProcessCredentials();
     resolveProcessCredentials = /* @__PURE__ */ __name(async (profileName, profiles, logger4) => {
@@ -119677,7 +119706,7 @@ var init_resolveProcessCredentials = __esm({
       if (profiles[profileName]) {
         const credentialProcess = profile["credential_process"];
         if (credentialProcess !== void 0) {
-          const execPromise = (0, import_util14.promisify)(import_child_process6.exec);
+          const execPromise = (0, import_util14.promisify)(import_child_process5.exec);
           try {
             const { stdout: stdout2 } = await execPromise(credentialProcess);
             let data;
@@ -140306,7 +140335,7 @@ async function getDarwinInfo() {
   };
   try {
     const output = await new Promise((resolve24, reject) => {
-      (0, import_child_process7.execFile)("/usr/bin/sw_vers", (error2, stdout2) => {
+      (0, import_child_process6.execFile)("/usr/bin/sw_vers", (error2, stdout2) => {
         if (error2) {
           reject(error2);
           return;
@@ -140400,12 +140429,12 @@ function getCloudResourceContext() {
     return void 0;
   }
 }
-var import_child_process7, import_fs24, os8, import_path24, import_util16, readFileAsync, readDirAsync, Context, PLATFORM_NAMES, LINUX_DISTROS, LINUX_VERSIONS;
+var import_child_process6, import_fs24, os8, import_path24, import_util16, readFileAsync, readDirAsync, Context, PLATFORM_NAMES, LINUX_DISTROS, LINUX_VERSIONS;
 var init_context = __esm({
   "../../node_modules/.pnpm/@sentry+node@7.87.0_supports-color@9.2.2/node_modules/@sentry/node/esm/integrations/context.js"() {
     init_import_meta_url();
     init_esm6();
-    import_child_process7 = require("child_process");
+    import_child_process6 = require("child_process");
     import_fs24 = require("fs");
     os8 = __toESM(require("os"));
     import_path24 = require("path");
@@ -152638,8 +152667,16 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     }
     const canUseNewVersionsDeploymentsApi = workerExists && props.dispatchNamespace === void 0 && prod && format9 === "modules" && migrations === void 0 && !config.first_party_worker && config.containers === void 0;
     let workerBundle;
+    const dockerPath = getDockerPath();
+    if (config.containers) {
+      const hasDockerfiles = config.containers?.some(
+        (container) => isDockerfile(container.image ?? container.configuration?.image)
+      );
+      if (hasDockerfiles) {
+        await verifyDockerInstalled(dockerPath, false);
+      }
+    }
     if (props.dryRun) {
-      const dockerPath = getDockerPath();
       if (config.containers) {
         for (const container of config.containers) {
           await maybeBuildContainer(
@@ -153081,6 +153118,7 @@ var init_deploy7 = __esm({
     import_node_path56 = __toESM(require("path"));
     import_node_url9 = require("url");
     init_cli();
+    init_containers_shared();
     init_dist2();
     import_undici21 = __toESM(require_undici());
     init_assets();