diff --git a/packages/cli/cli.config.ts b/packages/cli/cli.config.ts index 8ee8b025ab2..d349850eab1 100644 --- a/packages/cli/cli.config.ts +++ b/packages/cli/cli.config.ts @@ -24,7 +24,8 @@ export default defineConfig({ .desc("Use a Superset API key (sk_live_…) instead of OAuth login"), }, audiences: () => - process.env.SUPERSET_CLI_AUDIENCE === "internal" + process.env.SUPERSET_CLI_AUDIENCE === "internal" || + process.env.SUPERSET_SANDBOX_WORKSPACE_ID ? ["internal", "public"] : ["public"], sandbox: () => Boolean(process.env.SUPERSET_SANDBOX_WORKSPACE_ID), diff --git a/packages/cli/src/commands/environments/secrets/delete/command.ts b/packages/cli/src/commands/environments/secrets/delete/command.ts index a65128485de..fba7a90235b 100644 --- a/packages/cli/src/commands/environments/secrets/delete/command.ts +++ b/packages/cli/src/commands/environments/secrets/delete/command.ts @@ -3,6 +3,7 @@ import { command } from "../../../../lib/command"; import { resolveEnvironment } from "../../../../lib/environments"; export default command({ + sandbox: false, description: "Delete a variable from an environment", args: [positional("name").required().desc("Variable name")], options: { diff --git a/packages/cli/src/commands/environments/secrets/meta.ts b/packages/cli/src/commands/environments/secrets/meta.ts index 47fab6c5fb9..8b66dd10c77 100644 --- a/packages/cli/src/commands/environments/secrets/meta.ts +++ b/packages/cli/src/commands/environments/secrets/meta.ts @@ -1,4 +1,3 @@ export default { - sandbox: false, description: "Manage the variables an environment gives its cloud workspaces", }; diff --git a/packages/cli/src/commands/environments/secrets/set/command.ts b/packages/cli/src/commands/environments/secrets/set/command.ts index 3143e92f6f7..4a80415b6f3 100644 --- a/packages/cli/src/commands/environments/secrets/set/command.ts +++ b/packages/cli/src/commands/environments/secrets/set/command.ts @@ -14,6 +14,7 @@ async function readStdin(): Promise { } export default command({ + sandbox: false, description: "Set a variable on an environment, from --body, stdin, or a .env file", args: [ diff --git a/packages/shared/src/environment-secrets.test.ts b/packages/shared/src/environment-secrets.test.ts new file mode 100644 index 00000000000..15114bbefe4 --- /dev/null +++ b/packages/shared/src/environment-secrets.test.ts @@ -0,0 +1,18 @@ +import { describe, expect, test } from "bun:test"; +import { reservedKeyReason } from "./environment-secrets"; + +describe("reservedKeyReason", () => { + test("the provider's own credentials are reserved", () => { + expect(reservedKeyReason("VERCEL_SANDBOX_TOKEN")).toContain( + "VERCEL_SANDBOX_", + ); + expect(reservedKeyReason("SUPERSET_WORKSPACE_ID")).toContain("SUPERSET_"); + expect(reservedKeyReason("path")).toContain("PATH"); + }); + + test("a deploy CLI's token is an ordinary variable", () => { + expect(reservedKeyReason("VERCEL_TOKEN")).toBeNull(); + expect(reservedKeyReason("VERCEL_ORG_ID")).toBeNull(); + expect(reservedKeyReason("EXPO_TOKEN")).toBeNull(); + }); +}); diff --git a/packages/shared/src/environment-secrets.ts b/packages/shared/src/environment-secrets.ts index b16fa8d7d9e..af121684030 100644 --- a/packages/shared/src/environment-secrets.ts +++ b/packages/shared/src/environment-secrets.ts @@ -9,7 +9,7 @@ const RESERVED_PREFIXES: Array<{ prefix: string; reason: string }> = [ reason: "carries the workspace's identity into the sandbox", }, { prefix: "HOST_SERVICE_", reason: "configures the sandbox's own server" }, - { prefix: "VERCEL_", reason: "belongs to the sandbox provider" }, + { prefix: "VERCEL_SANDBOX_", reason: "provisions the box itself" }, ]; const RESERVED_KEYS = new Set([ diff --git a/packages/trpc/src/lib/sandbox/api-credential.ts b/packages/trpc/src/lib/sandbox/api-credential.ts index 7cab7d38223..7f87a582759 100644 --- a/packages/trpc/src/lib/sandbox/api-credential.ts +++ b/packages/trpc/src/lib/sandbox/api-credential.ts @@ -29,6 +29,7 @@ export const SANDBOX_ALLOWED_PROCEDURES: ReadonlySet = new Set([ "cloudWorkspace.access", "cloudWorkspace.hostTicket", "environment.list", + "environment.secrets.list", "page.assets.upload", "page.create", "page.get",