containers: default max_instances to 20 and fix logging in @cloudflare/cli (#10764)

* default max_instances to 20 * add log level to @cloudflare/cli * fixup link to docs in error * Update packages/containers-shared/src/images.ts Co-authored-by: Edmund Hung <edmund@cloudflare.com> --------- Co-authored-by: Edmund Hung <edmund@cloudflare.com>

Author: emily-shen

.changeset/fruity-pants-end.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+containers: default `max_instances` to 20 instead of 1.

.changeset/twenty-carrots-read.md

@@ -0,0 +1,6 @@
+---
+"wrangler": patch
+"@cloudflare/cli": patch
+---
+
+fix: respect the log level set by wrangler when logging using @cloudflare/cli

packages/cli/index.ts

@@ -53,10 +53,38 @@ export const space = (n = 1) => {
 return hidden("\u200A".repeat(n));
 };
 
+const LOGGER_LEVELS = {
+none: -1,
+error: 0,
+warn: 1,
+info: 2,
+log: 3,
+debug: 4,
+} as const;
+
+export type LoggerLevel = keyof typeof LOGGER_LEVELS;
+
+// Global log level that can be set by consuming packages
+let currentLogLevel: LoggerLevel = "log";
+
+export function setLogLevel(level: LoggerLevel) {
+currentLogLevel = level;
+}
+
+export function getLogLevel(): LoggerLevel {
+return currentLogLevel;
+}
+
 // Primitive for printing to stdout. Use this instead of
 // console.log or printing to stdout directly
 export const logRaw = (msg: string) => {
-stdout.write(`${msg}\n`);
+// treat all log calls as 'log' level logs
+const currentLevel = getLogLevel();
+
+// Only output if current log level allows 'log' level messages
+if (LOGGER_LEVELS[currentLevel] >= LOGGER_LEVELS.log) {
+stdout.write(`${msg}\n`);
+}
 };
 
 // A simple stylized log for use within a prompt
@@ -237,7 +265,9 @@ export const error = (
 extra?: string,
 corner = shapes.corners.bl
 ) => {
-if (msg) {
+// Only output if current log level allows 'error' level messages
+const currentLevel = getLogLevel();
+if (msg && LOGGER_LEVELS[currentLevel] >= LOGGER_LEVELS.error) {
 stderr.write(
 `${gray(corner)} ${status.error} ${dim(msg)}\n${
 extra ? space() + extra + "\n" : ""

packages/containers-shared/src/images.ts

@@ -98,7 +98,7 @@ export async function prepareContainerImagesForDev(args: {
 if (!isCloudflareRegistryLink(options.image_uri)) {
 throw new UserError(
 `Image "${options.image_uri}" is a registry link but does not point to the Cloudflare container registry.\n` +
-`To use an existing image from another repository, see https://developers.cloudflare.com/containers/image-management/#using-existing-images`
+`To use an existing image from another repository, see https://developers.cloudflare.com/containers/platform-details/image-management/#using-pre-built-container-images`
 );
 }
 const pull = await pullImage(dockerPath, options);

packages/wrangler/src/__tests__/containers/config.test.ts

@@ -227,7 +227,7 @@ describe("getNormalizedContainerOptions", () => {
 expect(result[0]).toMatchObject({
 name: "test-container",
 class_name: "TestContainer",
-max_instances: 1,
+max_instances: 20,
 rollout_step_percentage: 100,
 });
 });

packages/wrangler/src/__tests__/logger.test.ts

@@ -1,5 +1,6 @@
+import { error, logRaw, setLogLevel } from "@cloudflare/cli";
 import { Logger } from "../logger";
-import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockCLIOutput, mockConsoleMethods } from "./helpers/mock-console";
 
 describe("logger", () => {
 const std = mockConsoleMethods();
@@ -238,4 +239,84 @@ describe("logger", () => {
 expect(std.info).toMatchInlineSnapshot(`"This is a once message"`);
 });
 });
+
+describe("@cloudflare/cli logRaw", () => {
+const cliOut = mockCLIOutput();
+
+it("should output at log level", () => {
+setLogLevel("log");
+logRaw("This is a logRaw message");
+expect(cliOut.stdout).toMatchInlineSnapshot(
+`"This is a logRaw message\n"`
+);
+});
+
+it("should not output when log level is set to warn", () => {
+setLogLevel("warn");
+logRaw("This is a logRaw message");
+expect(cliOut.stdout).toMatchInlineSnapshot(`""`);
+});
+
+it("should not output when log level is set to error", () => {
+setLogLevel("error");
+logRaw("This is a logRaw message");
+expect(cliOut.stdout).toMatchInlineSnapshot(`""`);
+});
+
+it("should not output when log level is set to none", () => {
+setLogLevel("none");
+logRaw("This is a logRaw message");
+expect(cliOut.stdout).toMatchInlineSnapshot(`""`);
+});
+
+it("should output when log level is set to debug", () => {
+setLogLevel("debug");
+logRaw("This is a logRaw message");
+expect(cliOut.stdout).toMatchInlineSnapshot(
+`"This is a logRaw message\n"`
+);
+});
+});
+
+describe("@cloudflare/cli error", () => {
+const cliOut = mockCLIOutput();
+
+it("should output at error level", () => {
+setLogLevel("error");
+error("This is an error message");
+expect(cliOut.stderr).toMatchInlineSnapshot(
+`"╰ ERROR This is an error message\n"`
+);
+});
+
+it("should not output when log level is set to none", () => {
+setLogLevel("none");
+error("This is an error message");
+expect(cliOut.stderr).toMatchInlineSnapshot(`""`);
+});
+
+it("should output when log level is set to warn", () => {
+setLogLevel("warn");
+error("This is an error message");
+expect(cliOut.stderr).toMatchInlineSnapshot(
+`"╰ ERROR This is an error message\n"`
+);
+});
+
+it("should output when log level is set to log", () => {
+setLogLevel("log");
+error("This is an error message");
+expect(cliOut.stderr).toMatchInlineSnapshot(
+`"╰ ERROR This is an error message\n"`
+);
+});
+
+it("should output when log level is set to debug", () => {
+setLogLevel("debug");
+error("This is an error message");
+expect(cliOut.stderr).toMatchInlineSnapshot(
+`"╰ ERROR This is an error message\n"`
+);
+});
+});
 });

packages/wrangler/src/containers/config.ts

@@ -88,7 +88,7 @@ export const getNormalizedContainerOptions = async (
 const shared: Omit<SharedContainerConfig, "disk_size" | "instance_type"> = {
 name: container.name,
 class_name: container.class_name,
-max_instances: container.max_instances ?? 1,
+max_instances: container.max_instances ?? 20,
 scheduling_policy: (container.scheduling_policy ??
 SchedulingPolicy.DEFAULT) as SchedulingPolicy,
 constraints: {

packages/wrangler/src/index.ts

@@ -2,7 +2,7 @@ import assert from "node:assert";
 import os from "node:os";
 import { resolve } from "node:path";
 import { setTimeout } from "node:timers/promises";
-import { checkMacOSVersion } from "@cloudflare/cli";
+import { checkMacOSVersion, setLogLevel } from "@cloudflare/cli";
 import { ApiError } from "@cloudflare/containers-shared";
 import { UserError as ContainersUserError } from "@cloudflare/containers-shared/src/error";
 import chalk from "chalk";
@@ -64,6 +64,7 @@ import {
 dispatchNamespaceRenameCommand,
 } from "./dispatch-namespace";
 import { docs } from "./docs";
+import { getEnvironmentVariableFactory } from "./environment-variables/factory";
 import { COMPLIANCE_REGION_CONFIG_UNKNOWN } from "./environment-variables/misc-variables";
 import {
 CommandLineArgsError,
@@ -1597,6 +1598,14 @@ export async function main(argv: string[]): Promise<void> {
 // Update logger level, before we do any logging
 if (Object.keys(LOGGER_LEVELS).includes(args.logLevel as string)) {
 logger.loggerLevel = args.logLevel as LoggerLevel;
+// Also set the CLI package log level to match
+setLogLevel(args.logLevel as LoggerLevel);
+}
+const envLogLevel = getEnvironmentVariableFactory({
+variableName: "WRANGLER_LOG",
+})()?.toLowerCase();
+if (envLogLevel) {
+setLogLevel(envLogLevel as LoggerLevel);
 }
 // Middleware called for each sub-command, but only want to record once
 if (recordedCommand) {

turbo.json

@@ -13,6 +13,7 @@
 "CLOUDFLARE_CONTAINER_REGISTRY",
 "DOCKER_HOST",
 "WRANGLER_DOCKER_HOST",
+"WRANGLER_LOG",
 "WRANGLER_API_ENVIRONMENT"
 ],
 "tasks": {