diff --git a/.changeset/account-or-zone-help.md b/.changeset/account-or-zone-help.md new file mode 100644 index 0000000000..1be2ba4142 --- /dev/null +++ b/.changeset/account-or-zone-help.md @@ -0,0 +1,10 @@ +--- +"cf": patch +--- + +Explain how account-or-zone commands pick their scope + +Commands that serve either an account or a zone, such as `cf rulesets list` +and `cf load-balancers account list`, now say in `--help` that they run +against your account unless you pass `--zone`, and that they ignore +`CLOUDFLARE_ZONE_ID`. diff --git a/.changeset/empty-zone-flag.md b/.changeset/empty-zone-flag.md new file mode 100644 index 0000000000..5bb6453b1f --- /dev/null +++ b/.changeset/empty-zone-flag.md @@ -0,0 +1,16 @@ +--- +"cf": patch +--- + +Reject `--zone` without a value + +An empty `--zone` used to fall back to `CLOUDFLARE_ZONE_ID`, and `--dry-run` +previewed a `/zones//` path. On commands that serve both an account and a +zone, it also switched to zone scope. cf now stops with +`--zone requires a non-empty value.` and, as with `--mode`, rejects a repeated +`--zone`. + +Commands that forward arguments, such as `cf containers ssh`, used to drop a +`-z` with no value, so `cf containers ssh ls -z` ran plain `ls`. That now +stops with the same error. Put forwarded arguments after `--`, as in +`cf containers ssh -- ls -z`. diff --git a/docs/architecture.md b/docs/architecture.md index c1976f867d..3d135ad09d 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -440,6 +440,11 @@ to know before editing `generator/plugin/`. - `account_id` / `zone_id` are never positional — `account_id` is resolved via `getAccountId` (local mode substitutes `LOCAL_ACCOUNT_ID`), `zone_id` reuses the global `--zone` flag. +- A `{account_or_zone}/{account_or_zone_id}` path pair is one command, not + two: it runs against the account unless `--zone` is passed, and + `CLOUDFLARE_ZONE_ID` is ignored. Its help says so (`ACCOUNT_OR_ZONE_HELP`). + `--dry-run` shows the chosen scope; like other generated dry runs, it makes + no request, so a zone name stays a name in the previewed path. - `paramOverride.positional: true` (forge schema) only promotes top-level body fields to positionals — does NOT affect path params. diff --git a/packages/cli/generator/plugin/emit/handler.ts b/packages/cli/generator/plugin/emit/handler.ts index 8a9df38844..3830d4f7dd 100644 --- a/packages/cli/generator/plugin/emit/handler.ts +++ b/packages/cli/generator/plugin/emit/handler.ts @@ -309,6 +309,10 @@ export function dryRun(ctx: Ctx): string[] { return lines; } +/** How `auth` picks an account-or-zone command's scope, as its help says it. */ +export const ACCOUNT_OR_ZONE_HELP = + "Runs against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored."; + function auth(ctx: Ctx): string[] { const lines = [" const client = await createCommandClient(argv);"]; if (ctx.hasAccountOrZoneScope) { diff --git a/packages/cli/generator/plugin/files.ts b/packages/cli/generator/plugin/files.ts index 6cae2fe582..e080cf7e5c 100644 --- a/packages/cli/generator/plugin/files.ts +++ b/packages/cli/generator/plugin/files.ts @@ -18,7 +18,7 @@ import { scalar, } from "./args.js"; import { builderLines } from "./emit/builder.js"; -import { handler, imports } from "./emit/handler.js"; +import { ACCOUNT_OR_ZONE_HELP, handler, imports } from "./emit/handler.js"; import { context, escapeSingle, outputKind } from "./emit/index.js"; import { operationLiteral, operationPath, usesPathTag } from "./emit/sdk.js"; import { @@ -91,17 +91,22 @@ export function summary(method: Method): string { return first === "" ? description : first; } -/** `getLeafUsage`: the usage of a leaf command, followed by its full description. */ +/** + * `getLeafUsage`: the usage of a leaf command, followed by its full + * description and, for an account-or-zone command, how it picks its scope. + */ export function leafUsage( method: Method, resource: string, group: string | undefined, - command: string + command: string, + accountOrZone = false ): string { const segments = group === undefined ? [] : group.split("/").filter((s) => s !== ""); const path = ["$0", resource, ...segments, command]; - return `${path.join(" ")}\n\n${method.description.trim()}`; + const usage = `${path.join(" ")}\n\n${method.description.trim()}`; + return accountOrZone ? `${usage}\n\n${ACCOUNT_OR_ZONE_HELP}` : usage; } /** @@ -417,7 +422,13 @@ class Walk { const handlerLines = handler(ctx); const importSet = imports(ctx); const builder = builderLines(ctx); - const usage = leafUsage(method, resource, group, command); + const usage = leafUsage( + method, + resource, + group, + command, + ctx.hasAccountOrZoneScope + ); const builderBody = `return yargs\n .usage(${quote(usage)})\n${builder.join("\n")};`; const declarations = "type Args = InferArgs;\n"; const telemetryPath = diff --git a/packages/cli/src/__tests__/commands/account-or-zone.test.ts b/packages/cli/src/__tests__/commands/account-or-zone.test.ts index e42ed3ef00..c1c4bd5af4 100644 --- a/packages/cli/src/__tests__/commands/account-or-zone.test.ts +++ b/packages/cli/src/__tests__/commands/account-or-zone.test.ts @@ -10,7 +10,12 @@ import { vi, } from "vite-plus/test"; import { captureOutput } from "../helpers/capture-output.js"; -import { server, setupMsw, TEST_BASE_URL } from "../helpers/msw.js"; +import { + createFetchResult, + server, + setupMsw, + TEST_BASE_URL, +} from "../helpers/msw.js"; import { runCf } from "../helpers/run-cf.js"; /** @@ -42,14 +47,19 @@ describe("combined account-or-zone scope", () => { afterEach(() => vi.restoreAllMocks()); - it("uses the account route by default", async () => { - let requested = false; + function loadBalancerRequests(): string[] { + const requests: string[] = []; server.use( - http.get(`${TEST_BASE_URL}/accounts/test-account/load_balancers`, () => { - requested = true; + http.get(`${TEST_BASE_URL}/:scope/:id/load_balancers`, ({ params }) => { + requests.push(`${String(params.scope)}/${String(params.id)}`); return HttpResponse.json({ success: true, result: [] }); }) ); + return requests; + } + + it("uses the account route by default", async () => { + const requests = loadBalancerRequests(); const { exitCode } = await runCf( ["load-balancers", "account", "list"], @@ -57,17 +67,11 @@ describe("combined account-or-zone scope", () => { ); expect(exitCode).toBe(0); - expect(requested).toBe(true); + expect(requests).toEqual(["accounts/test-account"]); }); it("uses the zone route when --zone is explicitly provided", async () => { - let requested = false; - server.use( - http.get(`${TEST_BASE_URL}/zones/${ZONE_ID}/load_balancers`, () => { - requested = true; - return HttpResponse.json({ success: true, result: [] }); - }) - ); + const requests = loadBalancerRequests(); const { exitCode } = await runCf( ["load-balancers", "account", "list", "--zone", ZONE_ID], @@ -75,7 +79,19 @@ describe("combined account-or-zone scope", () => { ); expect(exitCode).toBe(0); - expect(requested).toBe(true); + expect(requests).toEqual([`zones/${ZONE_ID}`]); + }); + + it("keeps the account route when only CLOUDFLARE_ZONE_ID is set", async () => { + const requests = loadBalancerRequests(); + + const { exitCode } = await runCf(["load-balancers", "account", "list"], { + ...ENV, + CLOUDFLARE_ZONE_ID: ZONE_ID, + }); + + expect(exitCode).toBe(0); + expect(requests).toEqual(["accounts/test-account"]); }); it.each([ @@ -132,6 +148,80 @@ describe("combined account-or-zone scope", () => { }); }); + it("explains how the scope is picked in help", async () => { + const help = async (command: string[]) => { + output.clear(); + await runCf([...command, "--help"]); + return output.stdout().replace(/\s+/g, " "); + }; + const scope = + "Runs against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored."; + + expect(await help(["load-balancers", "account", "list"])).toContain(scope); + expect(await help(["zones", "list"])).not.toContain(scope); + }); + + it.each([ + [["--zone", "--dry-run"]], + [["--zone=", "--dry-run"]], + [["--zone", "", "--dry-run"]], + ])( + "rejects an empty zone in %j instead of switching scope", + async (flags) => { + await expect( + runCf(["load-balancers", "account", "list", ...flags], ENV) + ).rejects.toThrow("--zone requires a non-empty value."); + expect(output.stdout()).toBe(""); + } + ); + + // A zone name needs an account too: names are looked up in its zones. + it.each([[[]], [["--zone", "example.com"]]])( + "fails before any request when no account can be picked, with %j", + async (flags) => { + const accounts = [ + { id: "023e105f4ecef8ad9ca31a8372d0c353", name: "Acme Corp" }, + { id: "01a7362d577a6c3019a474fd6f485823", name: "Acme Staging" }, + ]; + server.use( + http.get(`${TEST_BASE_URL}/accounts`, () => + HttpResponse.json(createFetchResult(accounts)) + ), + http.get(`${TEST_BASE_URL}/memberships`, () => + HttpResponse.json( + createFetchResult(accounts.map((account) => ({ account }))) + ) + ) + ); + const requests = loadBalancerRequests(); + + await expect( + runCf(["load-balancers", "account", "list", ...flags], { + ...ENV, + CLOUDFLARE_ACCOUNT_ID: undefined, + }) + ).rejects.toThrow("CLOUDFLARE_ACCOUNT_ID"); + expect(requests).toEqual([]); + } + ); + + it("fails before any request when the --zone name isn't found", async () => { + server.use( + http.get(`${TEST_BASE_URL}/zones`, () => + HttpResponse.json(createFetchResult([])) + ) + ); + const requests = loadBalancerRequests(); + + await expect( + runCf( + ["load-balancers", "account", "list", "--zone", "missing.example.com"], + ENV + ) + ).rejects.toThrow("Zone not found: missing.example.com"); + expect(requests).toEqual([]); + }); + it("does not expose either template placeholder as a command argument", () => { const metadata = JSON.parse( readFileSync( diff --git a/packages/cli/src/__tests__/generator/plugin/emit.test.ts b/packages/cli/src/__tests__/generator/plugin/emit.test.ts index db8d99f8fb..a37eb082fb 100644 --- a/packages/cli/src/__tests__/generator/plugin/emit.test.ts +++ b/packages/cli/src/__tests__/generator/plugin/emit.test.ts @@ -3,6 +3,7 @@ import { describe, expect, it } from "vite-plus/test"; import yargs, { type Argv } from "yargs"; import { builderLines } from "../../../../generator/plugin/emit/builder.js"; import { + ACCOUNT_OR_ZONE_HELP, bodyObject, bodyPrompts, dryRun, @@ -80,6 +81,14 @@ describe("descriptions", () => { "$0 test records nested list \n\nFull first line.\nFull second line." ); }); + + it("follows the description with how an account-or-zone command picks its scope", () => { + expect( + leafUsage(list(undefined, description), "test", undefined, "list", true) + ).toBe( + `$0 test list\n\nFull first line.\nFull second line.\n\n${ACCOUNT_OR_ZONE_HELP}` + ); + }); }); describe("delete confirmation", () => { diff --git a/packages/cli/src/__tests__/zone-flag.test.ts b/packages/cli/src/__tests__/zone-flag.test.ts new file mode 100644 index 0000000000..cab5e08576 --- /dev/null +++ b/packages/cli/src/__tests__/zone-flag.test.ts @@ -0,0 +1,62 @@ +import { runInTempDir } from "@cloudflare/workers-utils/test-helpers"; +import { + afterEach, + beforeEach, + describe, + expect, + it, + vi, +} from "vite-plus/test"; +import { captureOutput } from "./helpers/capture-output.js"; +import { runCf } from "./helpers/run-cf.js"; + +describe("--zone global flag", () => { + runInTempDir(); + + const ENV = { CI: "true", CLOUDFLARE_ACCOUNT_ID: "account-id" }; + + let output: ReturnType; + + beforeEach(() => { + output = captureOutput(); + }); + + afterEach(() => vi.restoreAllMocks()); + + it("passes a zone name to zone-scoped commands", async () => { + await runCf( + ["dns", "records", "list", "-z", "example.com", "--dry-run"], + ENV + ); + + expect(output.stdout()).toContain("/zones/example.com/dns_records"); + }); + + it.each([[["-z"]], [["--zone="]], [["--no-zone"]]])( + "rejects %j without a value", + async (flags) => { + await expect( + runCf(["dns", "records", "list", ...flags, "--dry-run"], ENV) + ).rejects.toThrow("--zone requires a non-empty value."); + expect(output.stdout()).toBe(""); + } + ); + + it("rejects repeated values", async () => { + await expect( + runCf( + [ + "dns", + "records", + "list", + "--zone", + "a.example.com", + "--zone", + "b.example.com", + "--dry-run", + ], + ENV + ) + ).rejects.toThrow("--zone can only be specified once."); + }); +}); diff --git a/packages/cli/src/commands/_generated/accounts/subscriptions/create.ts b/packages/cli/src/commands/_generated/accounts/subscriptions/create.ts index e9f5b6fde5..a5d842bc3a 100644 --- a/packages/cli/src/commands/_generated/accounts/subscriptions/create.ts +++ b/packages/cli/src/commands/_generated/accounts/subscriptions/create.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 accounts subscriptions create\n\nCreates an account or zone subscription." + "$0 accounts subscriptions create\n\nCreates an account or zone subscription.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("app-install-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/accounts/subscriptions/get.ts b/packages/cli/src/commands/_generated/accounts/subscriptions/get.ts index bd2850e7ae..0c795d5405 100644 --- a/packages/cli/src/commands/_generated/accounts/subscriptions/get.ts +++ b/packages/cli/src/commands/_generated/accounts/subscriptions/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 accounts subscriptions get\n\nLists all of an account or zone's subscriptions." + "$0 accounts subscriptions get\n\nLists all of an account or zone's subscriptions.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/custom-csrs/create.ts b/packages/cli/src/commands/_generated/custom-csrs/create.ts index 84a2d31a9f..95fa3d1675 100644 --- a/packages/cli/src/commands/_generated/custom-csrs/create.ts +++ b/packages/cli/src/commands/_generated/custom-csrs/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-csrs create\n\nGenerate a new custom Certificate Signing Request (CSR) for an account or zone. Cloudflare generates and securely stores the private key associated with the CSR." + "$0 custom-csrs create\n\nGenerate a new custom Certificate Signing Request (CSR) for an account or zone. Cloudflare generates and securely stores the private key associated with the CSR.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("common-name", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-csrs/delete.ts b/packages/cli/src/commands/_generated/custom-csrs/delete.ts index 16f2bee6ac..666dc1800b 100644 --- a/packages/cli/src/commands/_generated/custom-csrs/delete.ts +++ b/packages/cli/src/commands/_generated/custom-csrs/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-csrs delete \n\nDelete a custom Certificate Signing Request (CSR) and its associated private key." + "$0 custom-csrs delete \n\nDelete a custom Certificate Signing Request (CSR) and its associated private key.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("custom-csr-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-csrs/get.ts b/packages/cli/src/commands/_generated/custom-csrs/get.ts index 036c65beef..e26eeb6377 100644 --- a/packages/cli/src/commands/_generated/custom-csrs/get.ts +++ b/packages/cli/src/commands/_generated/custom-csrs/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-csrs get \n\nRetrieve details for a specific custom Certificate Signing Request (CSR)." + "$0 custom-csrs get \n\nRetrieve details for a specific custom Certificate Signing Request (CSR).\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("custom-csr-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-csrs/list.ts b/packages/cli/src/commands/_generated/custom-csrs/list.ts index 25cd910d89..a10ed57b7d 100644 --- a/packages/cli/src/commands/_generated/custom-csrs/list.ts +++ b/packages/cli/src/commands/_generated/custom-csrs/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-csrs list\n\nList all custom Certificate Signing Requests (CSRs) for an account or zone." + "$0 custom-csrs list\n\nList all custom Certificate Signing Requests (CSRs) for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("page", { type: "number", diff --git a/packages/cli/src/commands/_generated/custom-nameservers/create.ts b/packages/cli/src/commands/_generated/custom-nameservers/create.ts index 0eda3a5f53..7e7c0f0c80 100644 --- a/packages/cli/src/commands/_generated/custom-nameservers/create.ts +++ b/packages/cli/src/commands/_generated/custom-nameservers/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-nameservers create\n\nAdds a custom nameserver to the account or zone for use as a vanity nameserver on zones." + "$0 custom-nameservers create\n\nAdds a custom nameserver to the account or zone for use as a vanity nameserver on zones.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("ns-name", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-nameservers/get.ts b/packages/cli/src/commands/_generated/custom-nameservers/get.ts index 6519838f51..50f834a264 100644 --- a/packages/cli/src/commands/_generated/custom-nameservers/get.ts +++ b/packages/cli/src/commands/_generated/custom-nameservers/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-nameservers get\n\nList an account or zone's custom nameservers." + "$0 custom-nameservers get\n\nList an account or zone's custom nameservers.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-assets/create.ts b/packages/cli/src/commands/_generated/custom-pages/account-assets/create.ts index bb544badb7..8ff34462ba 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-assets/create.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-assets/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-assets create\n\nCreates a custom asset for an account or zone." + "$0 custom-pages account-assets create\n\nCreates a custom asset for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("description", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-assets/delete.ts b/packages/cli/src/commands/_generated/custom-pages/account-assets/delete.ts index 7f16ece9ea..8fa36d8b71 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-assets/delete.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-assets/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-assets delete \n\nDeletes a custom asset from an account or zone." + "$0 custom-pages account-assets delete \n\nDeletes a custom asset from an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("asset-name", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-assets/get.ts b/packages/cli/src/commands/_generated/custom-pages/account-assets/get.ts index 17b0efbc4f..143ac1770c 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-assets/get.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-assets/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-assets get \n\nReturns a custom asset for an account or zone." + "$0 custom-pages account-assets get \n\nReturns a custom asset for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("asset-name", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-assets/list.ts b/packages/cli/src/commands/_generated/custom-pages/account-assets/list.ts index a33d8a6f77..2a7f98fee8 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-assets/list.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-assets/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-assets list\n\nLists custom assets for an account or zone." + "$0 custom-pages account-assets list\n\nLists custom assets for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("page", { type: "number", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-assets/update.ts b/packages/cli/src/commands/_generated/custom-pages/account-assets/update.ts index d80d5d69ab..3315844778 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-assets/update.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-assets/update.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-assets update \n\nUpdates a custom asset for an account or zone." + "$0 custom-pages account-assets update \n\nUpdates a custom asset for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("asset-name", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/get.ts b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/get.ts index 758e0b124d..215faec733 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/get.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-custom-pages get \n\nReturns the configuration for a custom page type." + "$0 custom-pages account-custom-pages get \n\nReturns the configuration for a custom page type.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("identifier", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/list.ts b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/list.ts index b3d7383865..6da65f802a 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/list.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-custom-pages list\n\nLists all custom page configurations for an account or zone." + "$0 custom-pages account-custom-pages list\n\nLists all custom page configurations for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/preview-tokens/create.ts b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/preview-tokens/create.ts index 392f91d595..53613e252c 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/preview-tokens/create.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/preview-tokens/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-custom-pages preview-tokens create\n\nCreates a signed JWT for previewing an account or zone-level custom page before it is published." + "$0 custom-pages account-custom-pages preview-tokens create\n\nCreates a signed JWT for previewing an account or zone-level custom page before it is published.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("act", { type: "string", diff --git a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/update.ts b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/update.ts index e7461ee9e2..1414113a3a 100644 --- a/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/update.ts +++ b/packages/cli/src/commands/_generated/custom-pages/account-custom-pages/update.ts @@ -27,7 +27,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 custom-pages account-custom-pages update \n\nUpdates the configuration for a custom page type." + "$0 custom-pages account-custom-pages update \n\nUpdates the configuration for a custom page type.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("identifier", { type: "string", diff --git a/packages/cli/src/commands/_generated/dns/settings/account/edit.ts b/packages/cli/src/commands/_generated/dns/settings/account/edit.ts index e5f9299efc..3fc7144166 100644 --- a/packages/cli/src/commands/_generated/dns/settings/account/edit.ts +++ b/packages/cli/src/commands/_generated/dns/settings/account/edit.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 dns settings account edit\n\nUpdate DNS settings for an account or zone" + "$0 dns settings account edit\n\nUpdate DNS settings for an account or zone\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("enforce-dns-only", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/dns/settings/account/get.ts b/packages/cli/src/commands/_generated/dns/settings/account/get.ts index 4733161e98..754b928749 100644 --- a/packages/cli/src/commands/_generated/dns/settings/account/get.ts +++ b/packages/cli/src/commands/_generated/dns/settings/account/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 dns settings account get\n\nShow DNS settings for an account or zone" + "$0 dns settings account get\n\nShow DNS settings for an account or zone\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/dns/usage/account/get.ts b/packages/cli/src/commands/_generated/dns/usage/account/get.ts index 8467313f08..02e765f96c 100644 --- a/packages/cli/src/commands/_generated/dns/usage/account/get.ts +++ b/packages/cli/src/commands/_generated/dns/usage/account/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 dns usage account get\n\nGet the current DNS record usage and quota for an account or zone. May include internal DNS usage and quota." + "$0 dns usage account get\n\nGet the current DNS record usage and quota for an account or zone. May include internal DNS usage and quota.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/email-routing/rules/list-account.ts b/packages/cli/src/commands/_generated/email-routing/rules/list-account.ts index 646678efe1..a8c662b020 100644 --- a/packages/cli/src/commands/_generated/email-routing/rules/list-account.ts +++ b/packages/cli/src/commands/_generated/email-routing/rules/list-account.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 email-routing rules list-account\n\nLists existing routing rules across all zones in the account or zone." + "$0 email-routing rules list-account\n\nLists existing routing rules across all zones in the account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("page", { type: "number", diff --git a/packages/cli/src/commands/_generated/firewall/access-rules/create.ts b/packages/cli/src/commands/_generated/firewall/access-rules/create.ts index 984827db09..a5f677e0f0 100644 --- a/packages/cli/src/commands/_generated/firewall/access-rules/create.ts +++ b/packages/cli/src/commands/_generated/firewall/access-rules/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 firewall access-rules create\n\nCreates a new IP Access rule for an account or zone. The rule will apply to all zones in the account or zone. Note: To create an IP Access rule that applies to a single zone, refer to the [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints." + "$0 firewall access-rules create\n\nCreates a new IP Access rule for an account or zone. The rule will apply to all zones in the account or zone. Note: To create an IP Access rule that applies to a single zone, refer to the [IP Access rules for a zone](#ip-access-rules-for-a-zone) endpoints.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("configuration-target", { type: "string", diff --git a/packages/cli/src/commands/_generated/firewall/access-rules/delete.ts b/packages/cli/src/commands/_generated/firewall/access-rules/delete.ts index 3f226d4509..10542cf0d9 100644 --- a/packages/cli/src/commands/_generated/firewall/access-rules/delete.ts +++ b/packages/cli/src/commands/_generated/firewall/access-rules/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 firewall access-rules delete \n\nDeletes an existing IP Access rule defined. Note: This operation will affect all zones in the account or zone." + "$0 firewall access-rules delete \n\nDeletes an existing IP Access rule defined. Note: This operation will affect all zones in the account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("rule-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/firewall/access-rules/edit.ts b/packages/cli/src/commands/_generated/firewall/access-rules/edit.ts index df067aff5f..d336334543 100644 --- a/packages/cli/src/commands/_generated/firewall/access-rules/edit.ts +++ b/packages/cli/src/commands/_generated/firewall/access-rules/edit.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 firewall access-rules edit \n\nUpdates an IP Access rule defined. Note: This operation will affect all zones in the account or zone." + "$0 firewall access-rules edit \n\nUpdates an IP Access rule defined. Note: This operation will affect all zones in the account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("rule-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/firewall/access-rules/get.ts b/packages/cli/src/commands/_generated/firewall/access-rules/get.ts index ed2f907795..7a20c6e2cf 100644 --- a/packages/cli/src/commands/_generated/firewall/access-rules/get.ts +++ b/packages/cli/src/commands/_generated/firewall/access-rules/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 firewall access-rules get \n\nFetches the details of an IP Access rule defined." + "$0 firewall access-rules get \n\nFetches the details of an IP Access rule defined.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("rule-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/firewall/access-rules/list.ts b/packages/cli/src/commands/_generated/firewall/access-rules/list.ts index 0345f69dd4..05e18b16bb 100644 --- a/packages/cli/src/commands/_generated/firewall/access-rules/list.ts +++ b/packages/cli/src/commands/_generated/firewall/access-rules/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 firewall access-rules list\n\nFetches IP Access rules of an account or zone. These rules apply to all the zones in the account or zone. You can filter the results using several optional parameters." + "$0 firewall access-rules list\n\nFetches IP Access rules of an account or zone. These rules apply to all the zones in the account or zone. You can filter the results using several optional parameters.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("access-rule-mode", { type: "string", diff --git a/packages/cli/src/commands/_generated/intel/sinkholes/ingresses/list.ts b/packages/cli/src/commands/_generated/intel/sinkholes/ingresses/list.ts index b4715b5585..ec25ad18de 100644 --- a/packages/cli/src/commands/_generated/intel/sinkholes/ingresses/list.ts +++ b/packages/cli/src/commands/_generated/intel/sinkholes/ingresses/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 intel sinkholes ingresses list\n\nReturns all ingress rules associated with the specified sinkhole." + "$0 intel sinkholes ingresses list\n\nReturns all ingress rules associated with the specified sinkhole.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("sinkhole-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/load-balancers/account/create.ts b/packages/cli/src/commands/_generated/load-balancers/account/create.ts index b29784bdc3..21399636d9 100644 --- a/packages/cli/src/commands/_generated/load-balancers/account/create.ts +++ b/packages/cli/src/commands/_generated/load-balancers/account/create.ts @@ -29,7 +29,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 load-balancers account create\n\nCreate a new account or zone-scoped load balancer." + "$0 load-balancers account create\n\nCreate a new account or zone-scoped load balancer.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("adaptive-routing-failover-across-pools", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/load-balancers/account/delete.ts b/packages/cli/src/commands/_generated/load-balancers/account/delete.ts index 38b1581abd..ea75da565a 100644 --- a/packages/cli/src/commands/_generated/load-balancers/account/delete.ts +++ b/packages/cli/src/commands/_generated/load-balancers/account/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 load-balancers account delete \n\nDelete a configured account or zone-scoped load balancer." + "$0 load-balancers account delete \n\nDelete a configured account or zone-scoped load balancer.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("load-balancer-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/load-balancers/account/edit.ts b/packages/cli/src/commands/_generated/load-balancers/account/edit.ts index 67591549ee..8c36e02eba 100644 --- a/packages/cli/src/commands/_generated/load-balancers/account/edit.ts +++ b/packages/cli/src/commands/_generated/load-balancers/account/edit.ts @@ -28,7 +28,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 load-balancers account edit \n\nApply changes to an existing account or zone-scoped load balancer, overwriting the supplied properties." + "$0 load-balancers account edit \n\nApply changes to an existing account or zone-scoped load balancer, overwriting the supplied properties.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("load-balancer-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/load-balancers/account/get.ts b/packages/cli/src/commands/_generated/load-balancers/account/get.ts index ac45e24d8c..d14baac307 100644 --- a/packages/cli/src/commands/_generated/load-balancers/account/get.ts +++ b/packages/cli/src/commands/_generated/load-balancers/account/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 load-balancers account get \n\nFetch a single configured account or zone-scoped load balancer." + "$0 load-balancers account get \n\nFetch a single configured account or zone-scoped load balancer.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("load-balancer-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/load-balancers/account/list.ts b/packages/cli/src/commands/_generated/load-balancers/account/list.ts index f239610a7c..7187371605 100644 --- a/packages/cli/src/commands/_generated/load-balancers/account/list.ts +++ b/packages/cli/src/commands/_generated/load-balancers/account/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 load-balancers account list\n\nList configured account or zone-scoped load balancers." + "$0 load-balancers account list\n\nList configured account or zone-scoped load balancers.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/load-balancers/account/update.ts b/packages/cli/src/commands/_generated/load-balancers/account/update.ts index c438fce6e0..3cd87a9ca4 100644 --- a/packages/cli/src/commands/_generated/load-balancers/account/update.ts +++ b/packages/cli/src/commands/_generated/load-balancers/account/update.ts @@ -29,7 +29,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 load-balancers account update \n\nUpdate a configured account or zone-scoped load balancer." + "$0 load-balancers account update \n\nUpdate a configured account or zone-scoped load balancer.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("load-balancer-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-datasets/fields/get.ts b/packages/cli/src/commands/_generated/logpush/account-datasets/fields/get.ts index fd8efd7f07..98ae08d200 100644 --- a/packages/cli/src/commands/_generated/logpush/account-datasets/fields/get.ts +++ b/packages/cli/src/commands/_generated/logpush/account-datasets/fields/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-datasets fields get \n\nLists all fields available for a dataset. The response result is. an object with key-value pairs, where keys are field names, and values are descriptions." + "$0 logpush account-datasets fields get \n\nLists all fields available for a dataset. The response result is. an object with key-value pairs, where keys are field names, and values are descriptions.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("dataset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-datasets/jobs/get.ts b/packages/cli/src/commands/_generated/logpush/account-datasets/jobs/get.ts index fdfda210dd..099fc99313 100644 --- a/packages/cli/src/commands/_generated/logpush/account-datasets/jobs/get.ts +++ b/packages/cli/src/commands/_generated/logpush/account-datasets/jobs/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-datasets jobs get \n\nLists Logpush jobs for an account or zone for a dataset." + "$0 logpush account-datasets jobs get \n\nLists Logpush jobs for an account or zone for a dataset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("dataset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-jobs/create.ts b/packages/cli/src/commands/_generated/logpush/account-jobs/create.ts index 9a77b7fa39..394b0e6219 100644 --- a/packages/cli/src/commands/_generated/logpush/account-jobs/create.ts +++ b/packages/cli/src/commands/_generated/logpush/account-jobs/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-jobs create\n\nCreates a new Logpush job for an account or zone." + "$0 logpush account-jobs create\n\nCreates a new Logpush job for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dataset", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-jobs/delete.ts b/packages/cli/src/commands/_generated/logpush/account-jobs/delete.ts index eca08c0f65..88ff4bf432 100644 --- a/packages/cli/src/commands/_generated/logpush/account-jobs/delete.ts +++ b/packages/cli/src/commands/_generated/logpush/account-jobs/delete.ts @@ -21,7 +21,9 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs - .usage("$0 logpush account-jobs delete \n\nDeletes a Logpush job.") + .usage( + "$0 logpush account-jobs delete \n\nDeletes a Logpush job.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." + ) .positional("job-id", { type: "string", description: "Unique id of the job.", diff --git a/packages/cli/src/commands/_generated/logpush/account-jobs/get.ts b/packages/cli/src/commands/_generated/logpush/account-jobs/get.ts index 8d597ec4f0..e363ca2e12 100644 --- a/packages/cli/src/commands/_generated/logpush/account-jobs/get.ts +++ b/packages/cli/src/commands/_generated/logpush/account-jobs/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-jobs get \n\nGets the details of a Logpush job." + "$0 logpush account-jobs get \n\nGets the details of a Logpush job.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("job-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-jobs/list.ts b/packages/cli/src/commands/_generated/logpush/account-jobs/list.ts index 047c3bd270..a29d178b19 100644 --- a/packages/cli/src/commands/_generated/logpush/account-jobs/list.ts +++ b/packages/cli/src/commands/_generated/logpush/account-jobs/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-jobs list\n\nLists Logpush jobs for an account or zone." + "$0 logpush account-jobs list\n\nLists Logpush jobs for an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/logpush/account-jobs/update.ts b/packages/cli/src/commands/_generated/logpush/account-jobs/update.ts index 8dbc623061..5a251ee3fc 100644 --- a/packages/cli/src/commands/_generated/logpush/account-jobs/update.ts +++ b/packages/cli/src/commands/_generated/logpush/account-jobs/update.ts @@ -22,7 +22,9 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs - .usage("$0 logpush account-jobs update \n\nUpdates a Logpush job.") + .usage( + "$0 logpush account-jobs update \n\nUpdates a Logpush job.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." + ) .positional("job-id", { type: "string", description: "Unique id of the job.", diff --git a/packages/cli/src/commands/_generated/logpush/account-ownership/create.ts b/packages/cli/src/commands/_generated/logpush/account-ownership/create.ts index 7b81d64469..925d75620e 100644 --- a/packages/cli/src/commands/_generated/logpush/account-ownership/create.ts +++ b/packages/cli/src/commands/_generated/logpush/account-ownership/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-ownership create\n\nGets a new ownership challenge sent to your destination." + "$0 logpush account-ownership create\n\nGets a new ownership challenge sent to your destination.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("destination-conf", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-ownership/validate/create.ts b/packages/cli/src/commands/_generated/logpush/account-ownership/validate/create.ts index 76d232bf8e..6273738cac 100644 --- a/packages/cli/src/commands/_generated/logpush/account-ownership/validate/create.ts +++ b/packages/cli/src/commands/_generated/logpush/account-ownership/validate/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-ownership validate create\n\nValidates ownership challenge of the destination." + "$0 logpush account-ownership validate create\n\nValidates ownership challenge of the destination.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("destination-conf", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-validate/destination-exists-delete.ts b/packages/cli/src/commands/_generated/logpush/account-validate/destination-exists-delete.ts index 4c4a0e4e19..9fdf294821 100644 --- a/packages/cli/src/commands/_generated/logpush/account-validate/destination-exists-delete.ts +++ b/packages/cli/src/commands/_generated/logpush/account-validate/destination-exists-delete.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-validate destination-exists-delete\n\nChecks if there is an existing job with a destination." + "$0 logpush account-validate destination-exists-delete\n\nChecks if there is an existing job with a destination.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("destination-conf", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-validate/destination/delete.ts b/packages/cli/src/commands/_generated/logpush/account-validate/destination/delete.ts index 3ea5ddbfde..4af5a1d672 100644 --- a/packages/cli/src/commands/_generated/logpush/account-validate/destination/delete.ts +++ b/packages/cli/src/commands/_generated/logpush/account-validate/destination/delete.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-validate destination delete\n\nValidates destination." + "$0 logpush account-validate destination delete\n\nValidates destination.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("destination-conf", { type: "string", diff --git a/packages/cli/src/commands/_generated/logpush/account-validate/origin/create.ts b/packages/cli/src/commands/_generated/logpush/account-validate/origin/create.ts index 06c940b596..c12a849b73 100644 --- a/packages/cli/src/commands/_generated/logpush/account-validate/origin/create.ts +++ b/packages/cli/src/commands/_generated/logpush/account-validate/origin/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logpush account-validate origin create\n\nValidates logpull origin with logpull_options." + "$0 logpush account-validate origin create\n\nValidates logpull origin with logpull_options.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("logpull-options", { type: "string", diff --git a/packages/cli/src/commands/_generated/logs/datasets/available.ts b/packages/cli/src/commands/_generated/logs/datasets/available.ts index 11632698fa..dc242d55cd 100644 --- a/packages/cli/src/commands/_generated/logs/datasets/available.ts +++ b/packages/cli/src/commands/_generated/logs/datasets/available.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs datasets available\n\nReturns all dataset types that this account or zone can create. Each entry includes the dataset schema and timestamp field. The schema shows all possible fields for a dataset. However, not all fields may be available for your account or zone. When creating or updating a dataset, only fields available to your account or zone can be enabled. If you request a field that is not available, you will receive an error." + "$0 logs datasets available\n\nReturns all dataset types that this account or zone can create. Each entry includes the dataset schema and timestamp field. The schema shows all possible fields for a dataset. However, not all fields may be available for your account or zone. When creating or updating a dataset, only fields available to your account or zone can be enabled. If you request a field that is not available, you will receive an error.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/logs/datasets/create.ts b/packages/cli/src/commands/_generated/logs/datasets/create.ts index 44b3b4f460..907842da12 100644 --- a/packages/cli/src/commands/_generated/logs/datasets/create.ts +++ b/packages/cli/src/commands/_generated/logs/datasets/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs datasets create\n\nCreate a new Log Explorer dataset for the account or zone. List available account or zone datasets to see the dataset types and fields you can use. The `fields` property is optional. If not specified, all available fields will be enabled. For dataset field definitions, see: https://developers.cloudflare.com/logs/logpush/logpush-job/datasets/" + "$0 logs datasets create\n\nCreate a new Log Explorer dataset for the account or zone. List available account or zone datasets to see the dataset types and fields you can use. The `fields` property is optional. If not specified, all available fields will be enabled. For dataset field definitions, see: https://developers.cloudflare.com/logs/logpush/logpush-job/datasets/\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dataset", { type: "string", diff --git a/packages/cli/src/commands/_generated/logs/datasets/delete.ts b/packages/cli/src/commands/_generated/logs/datasets/delete.ts index 1280d1b738..51b9f1ded1 100644 --- a/packages/cli/src/commands/_generated/logs/datasets/delete.ts +++ b/packages/cli/src/commands/_generated/logs/datasets/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs datasets delete \n\nDeletes a Log Explorer dataset for the account or zone. Dataset deletion must not be protected." + "$0 logs datasets delete \n\nDeletes a Log Explorer dataset for the account or zone. Dataset deletion must not be protected.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("dataset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logs/datasets/get.ts b/packages/cli/src/commands/_generated/logs/datasets/get.ts index f0936590ff..b4cd5479ef 100644 --- a/packages/cli/src/commands/_generated/logs/datasets/get.ts +++ b/packages/cli/src/commands/_generated/logs/datasets/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs datasets get \n\nRetrieve a single Log Explorer dataset by ID for the account or zone." + "$0 logs datasets get \n\nRetrieve a single Log Explorer dataset by ID for the account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("dataset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logs/datasets/list.ts b/packages/cli/src/commands/_generated/logs/datasets/list.ts index 0482fa3b54..3072798485 100644 --- a/packages/cli/src/commands/_generated/logs/datasets/list.ts +++ b/packages/cli/src/commands/_generated/logs/datasets/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs datasets list\n\nReturns all Log Explorer datasets configured for the account or zone. Pass `include_zones=true` to also include zone-level datasets that belong to this account or zone. List responses omit the `fields` property; use the single-dataset endpoint to retrieve field configuration." + "$0 logs datasets list\n\nReturns all Log Explorer datasets configured for the account or zone. Pass `include_zones=true` to also include zone-level datasets that belong to this account or zone. List responses omit the `fields` property; use the single-dataset endpoint to retrieve field configuration.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("include-zones", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/logs/datasets/update.ts b/packages/cli/src/commands/_generated/logs/datasets/update.ts index 9711c488f8..e7ce68b267 100644 --- a/packages/cli/src/commands/_generated/logs/datasets/update.ts +++ b/packages/cli/src/commands/_generated/logs/datasets/update.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs datasets update \n\nUpdates the enabled state and/or field configuration of an account or zone dataset." + "$0 logs datasets update \n\nUpdates the enabled state and/or field configuration of an account or zone dataset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("dataset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/logs/query.ts b/packages/cli/src/commands/_generated/logs/query.ts index 78bcbdb299..75e65bd08b 100644 --- a/packages/cli/src/commands/_generated/logs/query.ts +++ b/packages/cli/src/commands/_generated/logs/query.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 logs query\n\nRun a SQL query against account or zone-level datasets. Timestamp fields are RFC3339 strings. Filter with: WHERE {timestamp_field} >= now() - INTERVAL '30' DAY WHERE {timestamp_field} >= '2026-04-01T00:00:00Z' WHERE {timestamp_field} BETWEEN '2026-04-01T00:00:00Z' AND '2026-04-30T23:59:59Z' List configured account or zone datasets to see enabled account or zone-level datasets. Zone-level datasets will not appear here. List available account or zone datasets to inspect their schemas and timestamp fields. For more information about the datasets, and the meaning of each field, check out https://developers.cloudflare.com/logs/logpush/logpush-job/datasets/" + "$0 logs query\n\nRun a SQL query against account or zone-level datasets. Timestamp fields are RFC3339 strings. Filter with: WHERE {timestamp_field} >= now() - INTERVAL '30' DAY WHERE {timestamp_field} >= '2026-04-01T00:00:00Z' WHERE {timestamp_field} BETWEEN '2026-04-01T00:00:00Z' AND '2026-04-30T23:59:59Z' List configured account or zone datasets to see enabled account or zone-level datasets. Zone-level datasets will not appear here. List available account or zone datasets to inspect their schemas and timestamp fields. For more information about the datasets, and the meaning of each field, check out https://developers.cloudflare.com/logs/logpush/logpush-job/datasets/\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/monetization/account-eligibility/check.ts b/packages/cli/src/commands/_generated/monetization/account-eligibility/check.ts index 1905ec3b14..7ebfb27589 100644 --- a/packages/cli/src/commands/_generated/monetization/account-eligibility/check.ts +++ b/packages/cli/src/commands/_generated/monetization/account-eligibility/check.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 monetization account-eligibility check\n\nChecks the account or zone for Monetization Gateway eligibility and returns its pending, approved, or rejected decision." + "$0 monetization account-eligibility check\n\nChecks the account or zone for Monetization Gateway eligibility and returns its pending, approved, or rejected decision.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("accepted-terms-of-service", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/monetization/account-eligibility/get.ts b/packages/cli/src/commands/_generated/monetization/account-eligibility/get.ts index fa616715bf..afddcb58b6 100644 --- a/packages/cli/src/commands/_generated/monetization/account-eligibility/get.ts +++ b/packages/cli/src/commands/_generated/monetization/account-eligibility/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 monetization account-eligibility get\n\nReturns the account or zone's latest stored monetization eligibility result." + "$0 monetization account-eligibility get\n\nReturns the account or zone's latest stored monetization eligibility result.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/pay-per-use/usage-stats/get-account.ts b/packages/cli/src/commands/_generated/pay-per-use/usage-stats/get-account.ts index cc7e9dbb0a..4bd4dfc6ef 100644 --- a/packages/cli/src/commands/_generated/pay-per-use/usage-stats/get-account.ts +++ b/packages/cli/src/commands/_generated/pay-per-use/usage-stats/get-account.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 pay-per-use usage-stats get-account\n\nReturns reported usage and the full gross value across all Pay Per Use zones in a publisher account or zone over an explicit UTC range of at most 31 days. Usage from every domain and snapshotted price is summed by buyer. Ranges up to and including 7 days use hourly data points; longer ranges use daily data points. Because source data is aggregated hourly, both requested bounds are rounded down to the selected UTC interval and the resolved bounds are returned in the response. The resolved range must contain at least one complete interval. Empty periods are omitted. Buyers and their data points are paginated, while totals cover every buyer in the range. Values are raw usage counts and USD microcents; total_price_usd_microcents is the full value before the publisher revenue share." + "$0 pay-per-use usage-stats get-account\n\nReturns reported usage and the full gross value across all Pay Per Use zones in a publisher account or zone over an explicit UTC range of at most 31 days. Usage from every domain and snapshotted price is summed by buyer. Ranges up to and including 7 days use hourly data points; longer ranges use daily data points. Because source data is aggregated hourly, both requested bounds are rounded down to the selected UTC interval and the resolved bounds are returned in the response. The resolved range must contain at least one complete interval. Empty periods are omitted. Buyers and their data points are paginated, while totals cover every buyer in the range. Values are raw usage counts and USD microcents; total_price_usd_microcents is the full value before the publisher revenue share.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("since", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/create.ts b/packages/cli/src/commands/_generated/rulesets/create.ts index ad43e65b15..8b3dd0d190 100644 --- a/packages/cli/src/commands/_generated/rulesets/create.ts +++ b/packages/cli/src/commands/_generated/rulesets/create.ts @@ -23,7 +23,9 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs - .usage("$0 rulesets create\n\nCreates a ruleset.") + .usage( + "$0 rulesets create\n\nCreates a ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." + ) .option("validate-only", { type: "boolean", description: diff --git a/packages/cli/src/commands/_generated/rulesets/delete.ts b/packages/cli/src/commands/_generated/rulesets/delete.ts index 19ca925467..0163cc6b91 100644 --- a/packages/cli/src/commands/_generated/rulesets/delete.ts +++ b/packages/cli/src/commands/_generated/rulesets/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets delete \n\nDeletes all versions of an existing account or zone ruleset." + "$0 rulesets delete \n\nDeletes all versions of an existing account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("id", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/entrypoint/get.ts b/packages/cli/src/commands/_generated/rulesets/entrypoint/get.ts index 254a9d2f41..1952b10e19 100644 --- a/packages/cli/src/commands/_generated/rulesets/entrypoint/get.ts +++ b/packages/cli/src/commands/_generated/rulesets/entrypoint/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets entrypoint get \n\nFetches the latest version of the account or zone entry point ruleset for a given phase." + "$0 rulesets entrypoint get \n\nFetches the latest version of the account or zone entry point ruleset for a given phase.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("phase", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/entrypoint/update.ts b/packages/cli/src/commands/_generated/rulesets/entrypoint/update.ts index 91e9bc2503..1c8bdad04d 100644 --- a/packages/cli/src/commands/_generated/rulesets/entrypoint/update.ts +++ b/packages/cli/src/commands/_generated/rulesets/entrypoint/update.ts @@ -29,7 +29,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets entrypoint update \n\nUpdates an account or zone entry point ruleset, creating a new version." + "$0 rulesets entrypoint update \n\nUpdates an account or zone entry point ruleset, creating a new version.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("phase", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/get.ts b/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/get.ts index bc9a152204..d9e9a58abc 100644 --- a/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/get.ts +++ b/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets entrypoint versions get \n\nFetches a specific version of an account or zone entry point ruleset." + "$0 rulesets entrypoint versions get \n\nFetches a specific version of an account or zone entry point ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("ruleset-version", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/list.ts b/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/list.ts index bd87cdf0d2..bd43c0af28 100644 --- a/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/list.ts +++ b/packages/cli/src/commands/_generated/rulesets/entrypoint/versions/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets entrypoint versions list\n\nFetches the versions of an account or zone entry point ruleset." + "$0 rulesets entrypoint versions list\n\nFetches the versions of an account or zone entry point ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("phase", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/get.ts b/packages/cli/src/commands/_generated/rulesets/get.ts index d266fbcfb5..10aa46cc8c 100644 --- a/packages/cli/src/commands/_generated/rulesets/get.ts +++ b/packages/cli/src/commands/_generated/rulesets/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets get \n\nFetches the latest version of an account or zone ruleset." + "$0 rulesets get \n\nFetches the latest version of an account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("id", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/list.ts b/packages/cli/src/commands/_generated/rulesets/list.ts index 5c609f9be4..2e1a65b5d2 100644 --- a/packages/cli/src/commands/_generated/rulesets/list.ts +++ b/packages/cli/src/commands/_generated/rulesets/list.ts @@ -20,7 +20,9 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs - .usage("$0 rulesets list\n\nFetches all rulesets.") + .usage( + "$0 rulesets list\n\nFetches all rulesets.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." + ) .option("cursor", { type: "string", description: "The cursor to use for the next page.", diff --git a/packages/cli/src/commands/_generated/rulesets/rules/create.ts b/packages/cli/src/commands/_generated/rulesets/rules/create.ts index 377da1473a..72d933713f 100644 --- a/packages/cli/src/commands/_generated/rulesets/rules/create.ts +++ b/packages/cli/src/commands/_generated/rulesets/rules/create.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets rules create \n\nAdds a new rule to an account or zone ruleset. The rule will be added to the end of the existing list of rules in the ruleset by default." + "$0 rulesets rules create \n\nAdds a new rule to an account or zone ruleset. The rule will be added to the end of the existing list of rules in the ruleset by default.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("ruleset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/rules/delete.ts b/packages/cli/src/commands/_generated/rulesets/rules/delete.ts index fdda01fafd..2efb45df12 100644 --- a/packages/cli/src/commands/_generated/rulesets/rules/delete.ts +++ b/packages/cli/src/commands/_generated/rulesets/rules/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets rules delete \n\nDeletes an existing rule from an account or zone ruleset." + "$0 rulesets rules delete \n\nDeletes an existing rule from an account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("rule-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/rules/update.ts b/packages/cli/src/commands/_generated/rulesets/rules/update.ts index 995565ae68..22e22f3e89 100644 --- a/packages/cli/src/commands/_generated/rulesets/rules/update.ts +++ b/packages/cli/src/commands/_generated/rulesets/rules/update.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets rules update \n\nUpdates an existing rule in an account or zone ruleset." + "$0 rulesets rules update \n\nUpdates an existing rule in an account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("rule-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/update.ts b/packages/cli/src/commands/_generated/rulesets/update.ts index d00ff2ab97..df0932b133 100644 --- a/packages/cli/src/commands/_generated/rulesets/update.ts +++ b/packages/cli/src/commands/_generated/rulesets/update.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets update \n\nUpdates an account or zone ruleset, creating a new version." + "$0 rulesets update \n\nUpdates an account or zone ruleset, creating a new version.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("ruleset-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/versions/by-tag/get.ts b/packages/cli/src/commands/_generated/rulesets/versions/by-tag/get.ts index 216baf91c2..23dd29d57d 100644 --- a/packages/cli/src/commands/_generated/rulesets/versions/by-tag/get.ts +++ b/packages/cli/src/commands/_generated/rulesets/versions/by-tag/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets versions by-tag get \n\nFetches the rules of a managed account or zone ruleset version for a given tag." + "$0 rulesets versions by-tag get \n\nFetches the rules of a managed account or zone ruleset version for a given tag.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("tag", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/versions/delete.ts b/packages/cli/src/commands/_generated/rulesets/versions/delete.ts index f311fa934a..5e2ae03520 100644 --- a/packages/cli/src/commands/_generated/rulesets/versions/delete.ts +++ b/packages/cli/src/commands/_generated/rulesets/versions/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets versions delete \n\nDeletes an existing version of an account or zone ruleset." + "$0 rulesets versions delete \n\nDeletes an existing version of an account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("ruleset-version", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/versions/get.ts b/packages/cli/src/commands/_generated/rulesets/versions/get.ts index a5151a2a8a..dc9349a65d 100644 --- a/packages/cli/src/commands/_generated/rulesets/versions/get.ts +++ b/packages/cli/src/commands/_generated/rulesets/versions/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets versions get \n\nFetches a specific version of an account or zone ruleset." + "$0 rulesets versions get \n\nFetches a specific version of an account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("ruleset-version", { type: "string", diff --git a/packages/cli/src/commands/_generated/rulesets/versions/list.ts b/packages/cli/src/commands/_generated/rulesets/versions/list.ts index ff4748829b..1ea75b530e 100644 --- a/packages/cli/src/commands/_generated/rulesets/versions/list.ts +++ b/packages/cli/src/commands/_generated/rulesets/versions/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 rulesets versions list\n\nFetches the versions of an account or zone ruleset." + "$0 rulesets versions list\n\nFetches the versions of an account or zone ruleset.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("id", { type: "string", diff --git a/packages/cli/src/commands/_generated/security-insights/audit-logs/get.ts b/packages/cli/src/commands/_generated/security-insights/audit-logs/get.ts index 7a8c1d4c08..8e210cb268 100644 --- a/packages/cli/src/commands/_generated/security-insights/audit-logs/get.ts +++ b/packages/cli/src/commands/_generated/security-insights/audit-logs/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights audit-logs get \n\nLists audit log entries for a specific Security Center insight, showing changes to its status and classification over time." + "$0 security-insights audit-logs get \n\nLists audit log entries for a specific Security Center insight, showing changes to its status and classification over time.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("issue-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/security-insights/audit-logs/list.ts b/packages/cli/src/commands/_generated/security-insights/audit-logs/list.ts index 0469715fbc..9a6baf0b9d 100644 --- a/packages/cli/src/commands/_generated/security-insights/audit-logs/list.ts +++ b/packages/cli/src/commands/_generated/security-insights/audit-logs/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights audit-logs list\n\nLists audit log entries for all Security Center insights in the account or zone, showing changes to insight status and classification." + "$0 security-insights audit-logs list\n\nLists audit log entries for all Security Center insights in the account or zone, showing changes to insight status and classification.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("per-page", { type: "number", diff --git a/packages/cli/src/commands/_generated/security-insights/classify.ts b/packages/cli/src/commands/_generated/security-insights/classify.ts index 29bf9a50dd..e7d9a0e8d4 100644 --- a/packages/cli/src/commands/_generated/security-insights/classify.ts +++ b/packages/cli/src/commands/_generated/security-insights/classify.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights classify \n\nUpdates the user classification for a Security Center insight. Valid values are 'false_positive' or 'accept_risk'. To reset, set classification to null. Cannot change directly between classification values - must reset to null first." + "$0 security-insights classify \n\nUpdates the user classification for a Security Center insight. Valid values are 'false_positive' or 'accept_risk'. To reset, set classification to null. Cannot change directly between classification values - must reset to null first.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("issue-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/security-insights/count/by-class.ts b/packages/cli/src/commands/_generated/security-insights/count/by-class.ts index f723079401..ee204dabac 100644 --- a/packages/cli/src/commands/_generated/security-insights/count/by-class.ts +++ b/packages/cli/src/commands/_generated/security-insights/count/by-class.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights count by-class\n\nRetrieves Security Center insight counts aggregated by classification class." + "$0 security-insights count by-class\n\nRetrieves Security Center insight counts aggregated by classification class.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dismissed", { type: "boolean", description: "Dismissed" }) .option("issue-class", { type: "string", description: "Issue class" }) diff --git a/packages/cli/src/commands/_generated/security-insights/count/by-partner.ts b/packages/cli/src/commands/_generated/security-insights/count/by-partner.ts index ef3120c914..3fa8652c0d 100644 --- a/packages/cli/src/commands/_generated/security-insights/count/by-partner.ts +++ b/packages/cli/src/commands/_generated/security-insights/count/by-partner.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights count by-partner\n\nRetrieves the uncapped count of active, non-dismissed, unclassified RiskRecon insights for the account or zone." + "$0 security-insights count by-partner\n\nRetrieves the uncapped count of active, non-dismissed, unclassified RiskRecon insights for the account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("source", { type: "string", diff --git a/packages/cli/src/commands/_generated/security-insights/count/by-severity.ts b/packages/cli/src/commands/_generated/security-insights/count/by-severity.ts index 23e43cb30b..7cecaec933 100644 --- a/packages/cli/src/commands/_generated/security-insights/count/by-severity.ts +++ b/packages/cli/src/commands/_generated/security-insights/count/by-severity.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights count by-severity\n\nRetrieves Security Center insight counts aggregated by severity level (critical, high, medium, low)." + "$0 security-insights count by-severity\n\nRetrieves Security Center insight counts aggregated by severity level (critical, high, medium, low).\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dismissed", { type: "boolean", description: "Dismissed" }) .option("issue-class", { type: "string", description: "Issue class" }) diff --git a/packages/cli/src/commands/_generated/security-insights/count/by-type.ts b/packages/cli/src/commands/_generated/security-insights/count/by-type.ts index a5a1b5419f..26dba02c05 100644 --- a/packages/cli/src/commands/_generated/security-insights/count/by-type.ts +++ b/packages/cli/src/commands/_generated/security-insights/count/by-type.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights count by-type\n\nRetrieves Security Center insight counts aggregated by insight type." + "$0 security-insights count by-type\n\nRetrieves Security Center insight counts aggregated by insight type.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dismissed", { type: "boolean", description: "Dismissed" }) .option("issue-class", { type: "string", description: "Issue class" }) diff --git a/packages/cli/src/commands/_generated/security-insights/dismiss.ts b/packages/cli/src/commands/_generated/security-insights/dismiss.ts index 97dc88cf8d..013707cb21 100644 --- a/packages/cli/src/commands/_generated/security-insights/dismiss.ts +++ b/packages/cli/src/commands/_generated/security-insights/dismiss.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights dismiss \n\nArchives a Security Center insight for an account or zone, removing it from the active insights list while preserving historical data." + "$0 security-insights dismiss \n\nArchives a Security Center insight for an account or zone, removing it from the active insights list while preserving historical data.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("issue-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/security-insights/list.ts b/packages/cli/src/commands/_generated/security-insights/list.ts index 48c5907b5a..7305aa1ee8 100644 --- a/packages/cli/src/commands/_generated/security-insights/list.ts +++ b/packages/cli/src/commands/_generated/security-insights/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights list\n\nLists all Security Center insights for the account or zone, showing security findings and recommendations." + "$0 security-insights list\n\nLists all Security Center insights for the account or zone, showing security findings and recommendations.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dismissed", { type: "boolean", description: "Dismissed" }) .option("issue-class", { type: "string", description: "Issue class" }) diff --git a/packages/cli/src/commands/_generated/security-insights/scans/list.ts b/packages/cli/src/commands/_generated/security-insights/scans/list.ts index fb8b01d9ee..c15355fdc6 100644 --- a/packages/cli/src/commands/_generated/security-insights/scans/list.ts +++ b/packages/cli/src/commands/_generated/security-insights/scans/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights scans list\n\nReturns the most recent on-demand scans for the account or zone, up to a maximum of 5. Each scan includes its ID, start time, and current status. This includes both account or zone-wide and zone-scoped scans. Also returns quota information showing how many scans have been used and how many remain in the current 24-hour window." + "$0 security-insights scans list\n\nReturns the most recent on-demand scans for the account or zone, up to a maximum of 5. Each scan includes its ID, start time, and current status. This includes both account or zone-wide and zone-scoped scans. Also returns quota information showing how many scans have been used and how many remain in the current 24-hour window.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/security-insights/scans/start.ts b/packages/cli/src/commands/_generated/security-insights/scans/start.ts index 4cbe1aa92c..7aa8a0af48 100644 --- a/packages/cli/src/commands/_generated/security-insights/scans/start.ts +++ b/packages/cli/src/commands/_generated/security-insights/scans/start.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 security-insights scans start\n\nInitiates an on-demand security scan for the entire account or zone, scanning all zones associated with the account or zone. Rate limited to 5 scans per account or zone per 24-hour window." + "$0 security-insights scans start\n\nInitiates an on-demand security scan for the entire account or zone, scanning all zones associated with the account or zone. Rate limited to 5 scans per account or zone per 24-hour window.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("issue-type", { type: "string", diff --git a/packages/cli/src/commands/_generated/tags/account-resources/delete.ts b/packages/cli/src/commands/_generated/tags/account-resources/delete.ts index 389fae07e4..022875f97a 100644 --- a/packages/cli/src/commands/_generated/tags/account-resources/delete.ts +++ b/packages/cli/src/commands/_generated/tags/account-resources/delete.ts @@ -28,7 +28,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 tags account-resources delete\n\nRemoves all tags from a specific account or zone-level resource." + "$0 tags account-resources delete\n\nRemoves all tags from a specific account or zone-level resource.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("if-match", { type: "string", diff --git a/packages/cli/src/commands/_generated/tags/account-resources/get.ts b/packages/cli/src/commands/_generated/tags/account-resources/get.ts index 9e5ba436e9..ec4ee5ac62 100644 --- a/packages/cli/src/commands/_generated/tags/account-resources/get.ts +++ b/packages/cli/src/commands/_generated/tags/account-resources/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 tags account-resources get\n\nRetrieves tags for a specific account or zone-level resource." + "$0 tags account-resources get\n\nRetrieves tags for a specific account or zone-level resource.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("resource-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/tags/account-resources/update.ts b/packages/cli/src/commands/_generated/tags/account-resources/update.ts index 18117eec61..ed6aa124d8 100644 --- a/packages/cli/src/commands/_generated/tags/account-resources/update.ts +++ b/packages/cli/src/commands/_generated/tags/account-resources/update.ts @@ -27,7 +27,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 tags account-resources update\n\nCreates or updates tags for a specific account or zone-level resource. Replaces all existing tags for the resource." + "$0 tags account-resources update\n\nCreates or updates tags for a specific account or zone-level resource. Replaces all existing tags for the resource.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("if-match", { type: "string", diff --git a/packages/cli/src/commands/_generated/waiting-rooms/account-waiting-rooms/list.ts b/packages/cli/src/commands/_generated/waiting-rooms/account-waiting-rooms/list.ts index e3fe6489d5..0eaa104725 100644 --- a/packages/cli/src/commands/_generated/waiting-rooms/account-waiting-rooms/list.ts +++ b/packages/cli/src/commands/_generated/waiting-rooms/account-waiting-rooms/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 waiting-rooms account-waiting-rooms list\n\nLists waiting rooms for account or zone." + "$0 waiting-rooms account-waiting-rooms list\n\nLists waiting rooms for account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("page", { type: "number", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/create.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/create.ts index a84d34700f..0279d095ef 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/create.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications create\n\nAdds a new application to Access." + "$0 zero-trust access applications create\n\nAdds a new application to Access.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/delete.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/delete.ts index 777cb736c4..c3594800ec 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/delete.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications delete \n\nDeletes an application from Access." + "$0 zero-trust access applications delete \n\nDeletes an application from Access.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/get.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/get.ts index 82bdfed672..c1569cd3bd 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications get \n\nFetches information about an Access application." + "$0 zero-trust access applications get \n\nFetches information about an Access application.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/list.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/list.ts index 2a810bfadc..46f5840848 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications list\n\nLists all Access applications in an account or zone." + "$0 zero-trust access applications list\n\nLists all Access applications in an account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("name", { type: "string", description: "The name of the app." }) .option("domain", { type: "string", description: "The domain of the app." }) diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/revoke-tokens.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/revoke-tokens.ts index 45a8ead275..3a82a61aad 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/revoke-tokens.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/revoke-tokens.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications revoke-tokens \n\nRevokes all tokens issued for an application." + "$0 zero-trust access applications revoke-tokens \n\nRevokes all tokens issued for an application.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/settings/update.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/settings/update.ts index 20ca4fc7f0..47659549e9 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/settings/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/settings/update.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications settings update \n\nUpdates Access application settings." + "$0 zero-trust access applications settings update \n\nUpdates Access application settings.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/create.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/create.ts index 26934e457c..371e55d5ef 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/create.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications short-lived-certificates create \n\nGenerates a new short-lived certificate CA and public key." + "$0 zero-trust access applications short-lived-certificates create \n\nGenerates a new short-lived certificate CA and public key.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/delete.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/delete.ts index 92742e5e95..80aaaa597b 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/delete.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications short-lived-certificates delete \n\nDeletes a short-lived certificate CA." + "$0 zero-trust access applications short-lived-certificates delete \n\nDeletes a short-lived certificate CA.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/get.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/get.ts index a893650362..31e9b9d9f2 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications short-lived-certificates get \n\nFetches a short-lived certificate CA and its public key." + "$0 zero-trust access applications short-lived-certificates get \n\nFetches a short-lived certificate CA and its public key.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/list.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/list.ts index 80172832e5..f0e97f3af8 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/short-lived-certificates/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications short-lived-certificates list\n\nLists short-lived certificate CAs and their public keys." + "$0 zero-trust access applications short-lived-certificates list\n\nLists short-lived certificate CAs and their public keys.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("page", { type: "number", description: "Page number of results." }) .option("per-page", { diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/update.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/update.ts index a92bd54260..db381a9e8c 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/update.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications update \n\nUpdates an Access application." + "$0 zero-trust access applications update \n\nUpdates an Access application.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/applications/user-policy-checks/list.ts b/packages/cli/src/commands/_generated/zero-trust/access/applications/user-policy-checks/list.ts index 6265086af3..0d9ff4ce86 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/applications/user-policy-checks/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/applications/user-policy-checks/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access applications user-policy-checks list\n\nTests if a specific user has permission to access an application." + "$0 zero-trust access applications user-policy-checks list\n\nTests if a specific user has permission to access an application.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("app-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/create.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/create.ts index f4ae220771..6f79560f4a 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates create\n\nAdds a new mTLS root certificate to Access." + "$0 zero-trust access mtls-certificates create\n\nAdds a new mTLS root certificate to Access.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("associated-hostnames", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/delete.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/delete.ts index 9930178e95..d2226a23a6 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/delete.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates delete \n\nDeletes an mTLS certificate." + "$0 zero-trust access mtls-certificates delete \n\nDeletes an mTLS certificate.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("certificate-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/get.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/get.ts index 90d62837a5..6f7d3787f4 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates get \n\nFetches a single mTLS certificate." + "$0 zero-trust access mtls-certificates get \n\nFetches a single mTLS certificate.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("certificate-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/list.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/list.ts index 00abee2f8a..7b5f5ae4de 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates list\n\nLists all mTLS root certificates." + "$0 zero-trust access mtls-certificates list\n\nLists all mTLS root certificates.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("page", { type: "number", description: "Page number of results." }) .option("per-page", { diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/get.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/get.ts index 16b2234cb9..a44765274b 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates settings get\n\nList all mTLS hostname settings for this account or zone." + "$0 zero-trust access mtls-certificates settings get\n\nList all mTLS hostname settings for this account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/update.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/update.ts index a03483c4fb..da9625a572 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/settings/update.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates settings update\n\nUpdates an mTLS certificate's hostname settings." + "$0 zero-trust access mtls-certificates settings update\n\nUpdates an mTLS certificate's hostname settings.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("settings", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/update.ts b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/update.ts index da5fa04d96..266a7c0b4d 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/mtls-certificates/update.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access mtls-certificates update \n\nUpdates a configured mTLS certificate." + "$0 zero-trust access mtls-certificates update \n\nUpdates a configured mTLS certificate.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("certificate-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/create.ts b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/create.ts index 647b5be215..7f09a4b276 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access rule-groups create\n\nCreates a new Access group." + "$0 zero-trust access rule-groups create\n\nCreates a new Access group.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("exclude", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/delete.ts b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/delete.ts index 2023179766..ff55ec16a7 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/delete.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access rule-groups delete \n\nDeletes an Access group." + "$0 zero-trust access rule-groups delete \n\nDeletes an Access group.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("group-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/get.ts b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/get.ts index 1ce5738106..274b4e4d7d 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access rule-groups get \n\nFetches a single Access group." + "$0 zero-trust access rule-groups get \n\nFetches a single Access group.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("group-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/list.ts b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/list.ts index ab093bbe67..6b31f7890c 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/list.ts @@ -20,7 +20,9 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs - .usage("$0 zero-trust access rule-groups list\n\nLists all Access groups.") + .usage( + "$0 zero-trust access rule-groups list\n\nLists all Access groups.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." + ) .option("name", { type: "string", description: "The name of the group." }) .option("search", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/update.ts b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/update.ts index c57e91d6fa..1653c989ff 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/rule-groups/update.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access rule-groups update \n\nUpdates a configured Access group." + "$0 zero-trust access rule-groups update \n\nUpdates a configured Access group.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("group-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/create.ts b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/create.ts index 12e516378d..c5c33ffc21 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/create.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access service-tokens create\n\nGenerates a new service token. **Note:** This is the only time you can get the Client Secret. If you lose the Client Secret, you will have to rotate the Client Secret or create a new service token." + "$0 zero-trust access service-tokens create\n\nGenerates a new service token. **Note:** This is the only time you can get the Client Secret. If you lose the Client Secret, you will have to rotate the Client Secret or create a new service token.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("client-secret-version", { type: "number", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/delete.ts b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/delete.ts index f5a5c4bcaa..a7186bcc56 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/delete.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access service-tokens delete \n\nDeletes a service token." + "$0 zero-trust access service-tokens delete \n\nDeletes a service token.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("service-token-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/get.ts b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/get.ts index 9d5f6b3f25..11ac56c607 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access service-tokens get \n\nFetches a single service token." + "$0 zero-trust access service-tokens get \n\nFetches a single service token.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("service-token-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/list.ts b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/list.ts index 8ffcfd9192..19deea6c90 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access service-tokens list\n\nLists all service tokens." + "$0 zero-trust access service-tokens list\n\nLists all service tokens.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("name", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/update.ts b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/update.ts index 9430929651..736a0d829e 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/service-tokens/update.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access service-tokens update \n\nUpdates a configured service token." + "$0 zero-trust access service-tokens update \n\nUpdates a configured service token.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("service-token-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/access/users/revoke.ts b/packages/cli/src/commands/_generated/zero-trust/access/users/revoke.ts index 535fe0eb0b..5e6b4615b4 100644 --- a/packages/cli/src/commands/_generated/zero-trust/access/users/revoke.ts +++ b/packages/cli/src/commands/_generated/zero-trust/access/users/revoke.ts @@ -24,7 +24,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust access users revoke\n\nRevokes a user's access across all applications." + "$0 zero-trust access users revoke\n\nRevokes a user's access across all applications.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("devices", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/zero-trust/identity-providers/create.ts b/packages/cli/src/commands/_generated/zero-trust/identity-providers/create.ts index 7d3e507749..8445e77da9 100644 --- a/packages/cli/src/commands/_generated/zero-trust/identity-providers/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/identity-providers/create.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust identity-providers create\n\nAdds a new identity provider to Access." + "$0 zero-trust identity-providers create\n\nAdds a new identity provider to Access.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/zero-trust/identity-providers/delete.ts b/packages/cli/src/commands/_generated/zero-trust/identity-providers/delete.ts index ede6c38e89..44ed47d159 100644 --- a/packages/cli/src/commands/_generated/zero-trust/identity-providers/delete.ts +++ b/packages/cli/src/commands/_generated/zero-trust/identity-providers/delete.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust identity-providers delete \n\nDeletes an identity provider from Access." + "$0 zero-trust identity-providers delete \n\nDeletes an identity provider from Access.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("identity-provider-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/identity-providers/get.ts b/packages/cli/src/commands/_generated/zero-trust/identity-providers/get.ts index d1eb67de5e..a8a4d33c8b 100644 --- a/packages/cli/src/commands/_generated/zero-trust/identity-providers/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/identity-providers/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust identity-providers get \n\nFetches a configured identity provider." + "$0 zero-trust identity-providers get \n\nFetches a configured identity provider.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("identity-provider-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/identity-providers/list.ts b/packages/cli/src/commands/_generated/zero-trust/identity-providers/list.ts index 8e69a3c32d..0713f79225 100644 --- a/packages/cli/src/commands/_generated/zero-trust/identity-providers/list.ts +++ b/packages/cli/src/commands/_generated/zero-trust/identity-providers/list.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust identity-providers list\n\nLists all configured identity providers." + "$0 zero-trust identity-providers list\n\nLists all configured identity providers.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("scim-enabled", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/identity-providers/update.ts b/packages/cli/src/commands/_generated/zero-trust/identity-providers/update.ts index 3d3ae2aaf4..ccee20e7aa 100644 --- a/packages/cli/src/commands/_generated/zero-trust/identity-providers/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/identity-providers/update.ts @@ -22,7 +22,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust identity-providers update \n\nUpdates a configured identity provider." + "$0 zero-trust identity-providers update \n\nUpdates a configured identity provider.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .positional("identity-provider-id", { type: "string", diff --git a/packages/cli/src/commands/_generated/zero-trust/organization/create.ts b/packages/cli/src/commands/_generated/zero-trust/organization/create.ts index d87d19298e..b88c21e498 100644 --- a/packages/cli/src/commands/_generated/zero-trust/organization/create.ts +++ b/packages/cli/src/commands/_generated/zero-trust/organization/create.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust organization create\n\nSets up a Zero Trust organization for your account or zone." + "$0 zero-trust organization create\n\nSets up a Zero Trust organization for your account or zone.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("allow-authenticate-via-warp", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/zero-trust/organization/get.ts b/packages/cli/src/commands/_generated/zero-trust/organization/get.ts index 71e5205be2..d0223d3358 100644 --- a/packages/cli/src/commands/_generated/zero-trust/organization/get.ts +++ b/packages/cli/src/commands/_generated/zero-trust/organization/get.ts @@ -21,7 +21,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust organization get\n\nReturns the configuration for your Zero Trust organization." + "$0 zero-trust organization get\n\nReturns the configuration for your Zero Trust organization.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("dry-run", { type: "boolean", diff --git a/packages/cli/src/commands/_generated/zero-trust/organization/update.ts b/packages/cli/src/commands/_generated/zero-trust/organization/update.ts index bf54fcee4c..f6bd1c37f8 100644 --- a/packages/cli/src/commands/_generated/zero-trust/organization/update.ts +++ b/packages/cli/src/commands/_generated/zero-trust/organization/update.ts @@ -23,7 +23,7 @@ import { runWithTelemetry } from "#lib/telemetry/index.js"; function builder(yargs: Argv) { return yargs .usage( - "$0 zero-trust organization update\n\nUpdates the configuration for your Zero Trust organization." + "$0 zero-trust organization update\n\nUpdates the configuration for your Zero Trust organization.\n\nRuns against your account. Pass --zone to run against a zone instead. CLOUDFLARE_ZONE_ID is ignored." ) .option("allow-authenticate-via-warp", { type: "boolean", diff --git a/packages/cli/src/lib/global-options.ts b/packages/cli/src/lib/global-options.ts index 55b242a925..e7b03412cd 100644 --- a/packages/cli/src/lib/global-options.ts +++ b/packages/cli/src/lib/global-options.ts @@ -12,6 +12,17 @@ export const GLOBAL_OPTIONS = { alias: "z", description: "Zone ID or domain name (overrides CLOUDFLARE_ZONE_ID)", global: true, + // Passing --zone switches account-or-zone commands to zone scope, so a + // missing value must fail here rather than leave a scope without an ID. + coerce: (zone: unknown) => { + if (Array.isArray(zone)) { + throw new Error("--zone can only be specified once."); + } + if (typeof zone !== "string" || zone === "") { + throw new Error("--zone requires a non-empty value."); + } + return zone; + }, }, profile: { type: "string",