wrangler 0.0.0-e1b8ac4 → 0.0.0-e1c2f5b9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -3
- package/bin/wrangler.js +170 -62
- package/miniflare-dist/index.mjs +1499 -21
- package/package.json +193 -156
- package/src/__tests__/access.test.ts +25 -0
- package/src/__tests__/api-dev.test.ts +238 -0
- package/src/__tests__/api-devregistry.test.js +64 -0
- package/src/__tests__/api.test.ts +80 -0
- package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
- package/src/__tests__/config-cache.test.ts +30 -24
- package/src/__tests__/configuration.test.ts +4152 -3537
- package/src/__tests__/d1.test.ts +123 -0
- package/src/__tests__/delete.test.ts +263 -0
- package/src/__tests__/deployments.test.ts +105 -0
- package/src/__tests__/dev.test.tsx +1559 -1028
- package/src/__tests__/dialogs.test.tsx +40 -0
- package/src/__tests__/generate.test.ts +235 -0
- package/src/__tests__/get-host-from-url.test.ts +16 -0
- package/src/__tests__/guess-worker-format.test.ts +68 -68
- package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
- package/src/__tests__/helpers/mock-account-id.ts +24 -24
- package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
- package/src/__tests__/helpers/mock-bin.ts +20 -20
- package/src/__tests__/helpers/mock-cfetch.ts +165 -99
- package/src/__tests__/helpers/mock-console.ts +58 -39
- package/src/__tests__/helpers/mock-dialogs.ts +94 -94
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
- package/src/__tests__/helpers/mock-http-server.ts +30 -30
- package/src/__tests__/helpers/mock-istty.ts +65 -18
- package/src/__tests__/helpers/mock-known-routes.ts +7 -0
- package/src/__tests__/helpers/mock-kv.ts +27 -27
- package/src/__tests__/helpers/mock-oauth-flow.ts +244 -228
- package/src/__tests__/helpers/mock-process.ts +23 -13
- package/src/__tests__/helpers/mock-stdin.ts +82 -77
- package/src/__tests__/helpers/mock-web-socket.ts +21 -21
- package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
- package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
- package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
- package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
- package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
- package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
- package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
- package/src/__tests__/helpers/msw/index.ts +21 -0
- package/src/__tests__/helpers/run-in-tmp.ts +27 -28
- package/src/__tests__/helpers/run-wrangler.ts +8 -8
- package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
- package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
- package/src/__tests__/helpers/write-worker-source.ts +16 -16
- package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
- package/src/__tests__/https-options.test.ts +142 -109
- package/src/__tests__/index.test.ts +245 -234
- package/src/__tests__/init.test.ts +3027 -1925
- package/src/__tests__/jest.setup.ts +157 -61
- package/src/__tests__/kv.test.ts +1773 -1507
- package/src/__tests__/logger.test.ts +96 -96
- package/src/__tests__/logout.test.ts +47 -0
- package/src/__tests__/metrics.test.ts +495 -0
- package/src/__tests__/middleware.scheduled.test.ts +145 -0
- package/src/__tests__/middleware.test.ts +750 -0
- package/src/__tests__/package-manager.test.ts +303 -303
- package/src/__tests__/pages-deployment-tail.test.ts +884 -0
- package/src/__tests__/pages.test.ts +2424 -735
- package/src/__tests__/parse.test.ts +252 -252
- package/src/__tests__/paths.test.ts +39 -0
- package/src/__tests__/publish.test.ts +7621 -5798
- package/src/__tests__/pubsub.test.ts +490 -0
- package/src/__tests__/queues.test.ts +522 -0
- package/src/__tests__/r2.test.ts +388 -228
- package/src/__tests__/route.test.ts +18 -18
- package/src/__tests__/secret.test.ts +673 -460
- package/src/__tests__/tail.test.ts +776 -567
- package/src/__tests__/test-old-node-version.js +31 -0
- package/src/__tests__/tsconfig-sanity.ts +12 -0
- package/src/__tests__/tsconfig.json +8 -0
- package/src/__tests__/tsconfig.tsbuildinfo +1 -0
- package/src/__tests__/type-generation.test.ts +233 -0
- package/src/__tests__/user.test.ts +117 -120
- package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
- package/src/__tests__/validate-dev-props.test.ts +56 -0
- package/src/__tests__/version.test.ts +35 -0
- package/src/__tests__/whoami.test.tsx +264 -125
- package/src/__tests__/worker-namespace.test.ts +326 -0
- package/src/abort.d.ts +1 -1
- package/src/api/dev.ts +218 -0
- package/src/api/index.ts +2 -0
- package/src/bundle-reporter.tsx +68 -0
- package/src/bundle.ts +785 -166
- package/src/cfetch/index.ts +120 -83
- package/src/cfetch/internal.ts +211 -92
- package/src/cli.ts +23 -8
- package/src/config/config.ts +236 -204
- package/src/config/diagnostics.ts +61 -61
- package/src/config/environment.ts +514 -357
- package/src/config/index.ts +326 -193
- package/src/config/validation-helpers.ts +379 -366
- package/src/config/validation.ts +1973 -1402
- package/src/config-cache.ts +81 -41
- package/src/create-worker-preview.ts +239 -142
- package/src/create-worker-upload-form.ts +309 -238
- package/src/d1/backups.tsx +223 -0
- package/src/d1/constants.ts +2 -0
- package/src/d1/create.tsx +63 -0
- package/src/d1/delete.tsx +56 -0
- package/src/d1/execute.tsx +352 -0
- package/src/d1/formatTimeAgo.ts +14 -0
- package/src/d1/index.ts +101 -0
- package/src/d1/list.tsx +48 -0
- package/src/d1/migrations/apply.tsx +196 -0
- package/src/d1/migrations/create.tsx +77 -0
- package/src/d1/migrations/helpers.ts +147 -0
- package/src/d1/migrations/index.tsx +3 -0
- package/src/d1/migrations/list.tsx +79 -0
- package/src/d1/migrations/options.ts +18 -0
- package/src/d1/options.ts +22 -0
- package/src/d1/types.tsx +24 -0
- package/src/d1/utils.ts +48 -0
- package/src/delete.ts +108 -0
- package/src/deployments.ts +83 -0
- package/src/deprecated/index.ts +145 -0
- package/src/dev/dev-vars.ts +20 -17
- package/src/dev/dev.tsx +544 -329
- package/src/dev/get-local-persistence-path.tsx +31 -0
- package/src/dev/local.tsx +912 -301
- package/src/dev/remote.tsx +591 -230
- package/src/dev/start-server.ts +543 -0
- package/src/dev/use-esbuild.ts +183 -91
- package/src/dev/validate-dev-props.ts +31 -0
- package/src/dev-registry.tsx +201 -0
- package/src/dev.tsx +949 -0
- package/src/dialogs.tsx +132 -99
- package/src/dispatch-namespace.ts +207 -0
- package/src/docs/index.ts +97 -0
- package/src/durable.ts +87 -87
- package/src/entry.ts +235 -228
- package/src/environment-variables/factory.ts +88 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/errors.ts +6 -6
- package/src/generate/index.ts +300 -0
- package/src/git-client.ts +135 -0
- package/src/global-wrangler-config-path.ts +26 -0
- package/src/https-options.ts +84 -80
- package/src/index.tsx +637 -2850
- package/src/init.ts +1025 -0
- package/src/inspect.ts +698 -593
- package/src/intl-polyfill.d.ts +123 -123
- package/src/is-ci.ts +14 -0
- package/src/is-interactive.ts +16 -0
- package/src/jest.d.ts +4 -0
- package/src/kv/helpers.ts +430 -0
- package/src/kv/index.ts +596 -0
- package/src/logger.ts +64 -45
- package/src/metrics/index.ts +5 -0
- package/src/metrics/metrics-config.ts +239 -0
- package/src/metrics/metrics-dispatcher.ts +96 -0
- package/src/metrics/metrics-usage-headers.ts +24 -0
- package/src/metrics/send-event.ts +97 -0
- package/src/miniflare-cli/assets.ts +250 -0
- package/src/miniflare-cli/index.ts +202 -33
- package/src/miniflare-cli/request-context.ts +18 -18
- package/src/miniflare-cli/tsconfig.json +9 -0
- package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
- package/src/miniflare-cli/types.ts +11 -0
- package/src/module-collection.ts +221 -212
- package/src/open-in-browser.ts +4 -4
- package/src/package-manager.ts +173 -128
- package/src/pages/build.tsx +270 -0
- package/src/pages/constants.ts +18 -0
- package/src/pages/deployment-tails.tsx +284 -0
- package/src/pages/deployments.tsx +84 -0
- package/src/pages/dev.tsx +710 -0
- package/src/pages/errors.ts +66 -0
- package/src/pages/functions/buildPlugin.ts +107 -0
- package/src/pages/functions/buildWorker.ts +166 -0
- package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
- package/src/pages/functions/filepath-routing.ts +189 -0
- package/src/pages/functions/identifiers.ts +78 -0
- package/src/pages/functions/routes-consolidation.test.ts +250 -0
- package/src/pages/functions/routes-consolidation.ts +73 -0
- package/src/pages/functions/routes-transformation.test.ts +282 -0
- package/src/pages/functions/routes-transformation.ts +115 -0
- package/src/pages/functions/routes-validation.test.ts +403 -0
- package/src/pages/functions/routes-validation.ts +202 -0
- package/src/pages/functions/routes.ts +151 -0
- package/src/pages/functions/tsconfig.json +8 -0
- package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
- package/src/pages/functions.tsx +82 -0
- package/src/pages/hash.tsx +13 -0
- package/src/pages/index.tsx +102 -0
- package/src/pages/projects.tsx +169 -0
- package/src/pages/prompt-select-project.tsx +31 -0
- package/src/pages/publish.tsx +461 -0
- package/src/pages/types.ts +41 -0
- package/src/pages/upload.tsx +447 -0
- package/src/pages/utils.ts +23 -0
- package/src/parse.ts +202 -138
- package/src/paths.ts +53 -8
- package/src/proxy.ts +623 -405
- package/src/publish/index.ts +270 -0
- package/src/publish/publish.ts +1036 -0
- package/src/pubsub/index.ts +286 -0
- package/src/pubsub/pubsub-commands.tsx +624 -0
- package/src/queues/cli/commands/consumer/add.ts +71 -0
- package/src/queues/cli/commands/consumer/index.ts +22 -0
- package/src/queues/cli/commands/consumer/remove.ts +38 -0
- package/src/queues/cli/commands/create.ts +25 -0
- package/src/queues/cli/commands/delete.ts +26 -0
- package/src/queues/cli/commands/index.ts +36 -0
- package/src/queues/cli/commands/list.ts +25 -0
- package/src/queues/client.ts +135 -0
- package/src/queues/utils.ts +18 -0
- package/src/r2/constants.ts +4 -0
- package/src/r2/helpers.ts +131 -0
- package/src/r2/index.ts +289 -0
- package/src/routes.ts +140 -0
- package/src/secret/index.ts +379 -0
- package/src/selfsigned.d.ts +23 -23
- package/src/sites.tsx +258 -254
- package/src/tail/createTail.ts +379 -0
- package/src/tail/filters.ts +108 -110
- package/src/tail/index.ts +211 -296
- package/src/tail/printing.ts +86 -46
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +181 -0
- package/src/update-check.ts +11 -11
- package/src/user/access.ts +68 -0
- package/src/user/auth-variables.ts +113 -0
- package/src/user/choose-account.tsx +69 -0
- package/src/user/generate-auth-url.ts +33 -0
- package/src/user/generate-random-state.ts +16 -0
- package/src/user/index.ts +2 -0
- package/src/user/user.tsx +1238 -0
- package/src/utils/collectKeyValues.ts +14 -0
- package/src/whoami.tsx +141 -43
- package/src/worker.ts +177 -107
- package/src/yargs-types.ts +24 -0
- package/src/zones.ts +158 -40
- package/templates/__tests__/pages-dev-util.test.ts +128 -0
- package/templates/__tests__/tsconfig-sanity.ts +12 -0
- package/templates/__tests__/tsconfig.json +8 -0
- package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
- package/templates/checked-fetch.js +17 -0
- package/templates/d1-beta-facade.js +205 -0
- package/templates/facade.d.ts +14 -0
- package/templates/first-party-worker-module-facade.ts +19 -0
- package/templates/format-dev-errors.ts +33 -0
- package/templates/init-tests/test-jest-new-worker.js +23 -0
- package/templates/init-tests/test-vitest-new-worker.js +24 -0
- package/templates/init-tests/test-vitest-new-worker.ts +25 -0
- package/templates/middleware/common.ts +62 -0
- package/templates/middleware/loader-modules.ts +82 -0
- package/templates/middleware/loader-sw.ts +233 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
- package/templates/middleware/middleware-pretty-error.ts +40 -0
- package/templates/middleware/middleware-scheduled.ts +15 -0
- package/templates/new-worker-scheduled.js +3 -3
- package/templates/new-worker-scheduled.ts +15 -15
- package/templates/new-worker.js +3 -3
- package/templates/new-worker.ts +15 -15
- package/templates/no-op-worker.js +10 -0
- package/templates/pages-dev-pipeline.ts +31 -0
- package/templates/pages-dev-util.ts +52 -0
- package/templates/pages-shim.ts +12 -0
- package/templates/pages-template-plugin.ts +171 -0
- package/templates/pages-template-worker.ts +189 -0
- package/templates/serve-static-assets.ts +65 -0
- package/templates/service-bindings-module-facade.js +54 -0
- package/templates/service-bindings-sw-facade.js +42 -0
- package/templates/tsconfig-sanity.ts +11 -0
- package/templates/tsconfig.init.json +106 -0
- package/templates/tsconfig.json +6 -103
- package/templates/tsconfig.tsbuildinfo +1 -0
- package/wrangler-dist/cli.d.ts +906 -0
- package/wrangler-dist/cli.js +147920 -108883
- package/pages/functions/buildPlugin.ts +0 -105
- package/pages/functions/buildWorker.ts +0 -151
- package/pages/functions/filepath-routing.ts +0 -189
- package/pages/functions/identifiers.ts +0 -78
- package/pages/functions/routes.ts +0 -156
- package/pages/functions/template-plugin.ts +0 -147
- package/pages/functions/template-worker.ts +0 -143
- package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
- package/src/environment-variables.ts +0 -35
- package/src/generate-auth-url.ts +0 -33
- package/src/generate-random-state.ts +0 -16
- package/src/kv.ts +0 -408
- package/src/miniflare-cli/enum-keys.ts +0 -17
- package/src/pages.tsx +0 -2093
- package/src/publish.ts +0 -726
- package/src/r2.ts +0 -50
- package/src/user.tsx +0 -1202
- package/templates/static-asset-facade.js +0 -43
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { cwd } from "process";
|
|
2
|
+
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
3
|
+
import { useMockIsTTY } from "./helpers/mock-istty";
|
|
4
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
5
|
+
import { runWrangler } from "./helpers/run-wrangler";
|
|
6
|
+
import writeWranglerToml from "./helpers/write-wrangler-toml";
|
|
7
|
+
|
|
8
|
+
function endEventLoop() {
|
|
9
|
+
return new Promise((resolve) => setImmediate(resolve));
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
describe("d1", () => {
|
|
13
|
+
const std = mockConsoleMethods();
|
|
14
|
+
runInTempDir();
|
|
15
|
+
const { setIsTTY } = useMockIsTTY();
|
|
16
|
+
|
|
17
|
+
it("should show help when no argument is passed", async () => {
|
|
18
|
+
await runWrangler("d1");
|
|
19
|
+
await endEventLoop();
|
|
20
|
+
|
|
21
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
22
|
+
"wrangler d1
|
|
23
|
+
|
|
24
|
+
🗄 Interact with a D1 database
|
|
25
|
+
|
|
26
|
+
Commands:
|
|
27
|
+
wrangler d1 list List D1 databases
|
|
28
|
+
wrangler d1 create <name> Create D1 database
|
|
29
|
+
wrangler d1 delete <name> Delete D1 database
|
|
30
|
+
wrangler d1 backup Interact with D1 Backups
|
|
31
|
+
wrangler d1 execute <database> Executed command or SQL file
|
|
32
|
+
wrangler d1 migrations Interact with D1 Migrations
|
|
33
|
+
|
|
34
|
+
Flags:
|
|
35
|
+
-c, --config Path to .toml configuration file [string]
|
|
36
|
+
-e, --env Environment to use for operations and .env files [string]
|
|
37
|
+
-h, --help Show help [boolean]
|
|
38
|
+
-v, --version Show version number [boolean]
|
|
39
|
+
|
|
40
|
+
🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
|
|
41
|
+
Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
|
|
42
|
+
To request features, visit https://community.cloudflare.com/c/developers/d1.
|
|
43
|
+
To give feedback, visit https://discord.gg/cloudflaredev"
|
|
44
|
+
`);
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
it("should show help when an invalid argument is passed", async () => {
|
|
48
|
+
await expect(() => runWrangler("d1 asdf")).rejects.toThrow(
|
|
49
|
+
"Unknown argument: asdf"
|
|
50
|
+
);
|
|
51
|
+
|
|
52
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
53
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mUnknown argument: asdf[0m
|
|
54
|
+
|
|
55
|
+
"
|
|
56
|
+
`);
|
|
57
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
58
|
+
"
|
|
59
|
+
wrangler d1
|
|
60
|
+
|
|
61
|
+
🗄 Interact with a D1 database
|
|
62
|
+
|
|
63
|
+
Commands:
|
|
64
|
+
wrangler d1 list List D1 databases
|
|
65
|
+
wrangler d1 create <name> Create D1 database
|
|
66
|
+
wrangler d1 delete <name> Delete D1 database
|
|
67
|
+
wrangler d1 backup Interact with D1 Backups
|
|
68
|
+
wrangler d1 execute <database> Executed command or SQL file
|
|
69
|
+
wrangler d1 migrations Interact with D1 Migrations
|
|
70
|
+
|
|
71
|
+
Flags:
|
|
72
|
+
-c, --config Path to .toml configuration file [string]
|
|
73
|
+
-e, --env Environment to use for operations and .env files [string]
|
|
74
|
+
-h, --help Show help [boolean]
|
|
75
|
+
-v, --version Show version number [boolean]
|
|
76
|
+
|
|
77
|
+
🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
|
|
78
|
+
Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
|
|
79
|
+
To request features, visit https://community.cloudflare.com/c/developers/d1.
|
|
80
|
+
To give feedback, visit https://discord.gg/cloudflaredev"
|
|
81
|
+
`);
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
describe("migrate", () => {
|
|
85
|
+
describe("apply", () => {
|
|
86
|
+
it("should not attempt to login in local mode", async () => {
|
|
87
|
+
setIsTTY(false);
|
|
88
|
+
writeWranglerToml({
|
|
89
|
+
d1_databases: [
|
|
90
|
+
{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
|
|
91
|
+
],
|
|
92
|
+
});
|
|
93
|
+
// If we get to the point where we are checking for migrations then we have not been asked to log in.
|
|
94
|
+
await expect(
|
|
95
|
+
runWrangler("d1 migrations apply --local DATABASE")
|
|
96
|
+
).rejects.toThrowError(
|
|
97
|
+
`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
|
|
98
|
+
);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
it("should try to read D1 config from wrangler.toml", async () => {
|
|
102
|
+
setIsTTY(false);
|
|
103
|
+
writeWranglerToml();
|
|
104
|
+
await expect(
|
|
105
|
+
runWrangler("d1 migrations apply DATABASE")
|
|
106
|
+
).rejects.toThrowError(
|
|
107
|
+
"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
|
|
108
|
+
);
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
it("should not try to read wrangler.toml in local mode", async () => {
|
|
112
|
+
setIsTTY(false);
|
|
113
|
+
writeWranglerToml();
|
|
114
|
+
// If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
|
|
115
|
+
await expect(
|
|
116
|
+
runWrangler("d1 migrations apply --local DATABASE")
|
|
117
|
+
).rejects.toThrowError(
|
|
118
|
+
`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
|
|
119
|
+
);
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
});
|
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
import { rest } from "msw";
|
|
2
|
+
import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
|
|
3
|
+
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
4
|
+
import { mockConfirm } from "./helpers/mock-dialogs";
|
|
5
|
+
import { msw } from "./helpers/msw";
|
|
6
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
7
|
+
import { runWrangler } from "./helpers/run-wrangler";
|
|
8
|
+
import writeWranglerToml from "./helpers/write-wrangler-toml";
|
|
9
|
+
import type { KVNamespaceInfo } from "../kv/helpers";
|
|
10
|
+
|
|
11
|
+
describe("delete", () => {
|
|
12
|
+
mockAccountId();
|
|
13
|
+
mockApiToken();
|
|
14
|
+
runInTempDir();
|
|
15
|
+
|
|
16
|
+
const std = mockConsoleMethods();
|
|
17
|
+
|
|
18
|
+
it("should delete an entire service by name", async () => {
|
|
19
|
+
mockConfirm({
|
|
20
|
+
text: `Are you sure you want to delete my-script? This action cannot be undone.`,
|
|
21
|
+
result: true,
|
|
22
|
+
});
|
|
23
|
+
mockListKVNamespacesRequest();
|
|
24
|
+
mockDeleteWorkerRequest({ name: "my-script" });
|
|
25
|
+
await runWrangler("delete --name my-script");
|
|
26
|
+
|
|
27
|
+
expect(std).toMatchInlineSnapshot(`
|
|
28
|
+
Object {
|
|
29
|
+
"debug": "",
|
|
30
|
+
"err": "",
|
|
31
|
+
"out": "Successfully deleted my-script",
|
|
32
|
+
"warn": "",
|
|
33
|
+
}
|
|
34
|
+
`);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it("should delete a script by configuration", async () => {
|
|
38
|
+
mockConfirm({
|
|
39
|
+
text: `Are you sure you want to delete test-name? This action cannot be undone.`,
|
|
40
|
+
result: true,
|
|
41
|
+
});
|
|
42
|
+
writeWranglerToml();
|
|
43
|
+
mockListKVNamespacesRequest();
|
|
44
|
+
mockDeleteWorkerRequest();
|
|
45
|
+
await runWrangler("delete");
|
|
46
|
+
|
|
47
|
+
expect(std).toMatchInlineSnapshot(`
|
|
48
|
+
Object {
|
|
49
|
+
"debug": "",
|
|
50
|
+
"err": "",
|
|
51
|
+
"out": "Successfully deleted test-name",
|
|
52
|
+
"warn": "",
|
|
53
|
+
}
|
|
54
|
+
`);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("shouldn't delete a service when doing a --dry-run", async () => {
|
|
58
|
+
await runWrangler("delete --name xyz --dry-run");
|
|
59
|
+
|
|
60
|
+
expect(std).toMatchInlineSnapshot(`
|
|
61
|
+
Object {
|
|
62
|
+
"debug": "",
|
|
63
|
+
"err": "",
|
|
64
|
+
"out": "--dry-run: exiting now.",
|
|
65
|
+
"warn": "",
|
|
66
|
+
}
|
|
67
|
+
`);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it('shouldn\'t delete when the user says "no"', async () => {
|
|
71
|
+
mockConfirm({
|
|
72
|
+
text: `Are you sure you want to delete xyz? This action cannot be undone.`,
|
|
73
|
+
result: false,
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
await runWrangler("delete --name xyz");
|
|
77
|
+
|
|
78
|
+
expect(std).toMatchInlineSnapshot(`
|
|
79
|
+
Object {
|
|
80
|
+
"debug": "",
|
|
81
|
+
"err": "",
|
|
82
|
+
"out": "",
|
|
83
|
+
"warn": "",
|
|
84
|
+
}
|
|
85
|
+
`);
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
it("should delete a site namespace associated with a worker", async () => {
|
|
89
|
+
const kvNamespaces = [
|
|
90
|
+
{
|
|
91
|
+
title: "__my-script-workers_sites_assets",
|
|
92
|
+
id: "id-for-my-script-site-ns",
|
|
93
|
+
},
|
|
94
|
+
// this one isn't associated with the worker
|
|
95
|
+
{
|
|
96
|
+
title: "__test-name-workers_sites_assets",
|
|
97
|
+
id: "id-for-another-site-ns",
|
|
98
|
+
},
|
|
99
|
+
];
|
|
100
|
+
|
|
101
|
+
mockConfirm({
|
|
102
|
+
text: `Are you sure you want to delete my-script? This action cannot be undone.`,
|
|
103
|
+
result: true,
|
|
104
|
+
});
|
|
105
|
+
mockListKVNamespacesRequest(...kvNamespaces);
|
|
106
|
+
// it should only try to delete the site namespace associated with this worker
|
|
107
|
+
msw.use(
|
|
108
|
+
rest.delete(
|
|
109
|
+
"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
|
|
110
|
+
(req, res, ctx) => {
|
|
111
|
+
expect(req.params.accountId).toEqual("some-account-id");
|
|
112
|
+
return res.once(
|
|
113
|
+
ctx.status(200),
|
|
114
|
+
ctx.json({ success: true, errors: [], messages: [], result: null })
|
|
115
|
+
);
|
|
116
|
+
}
|
|
117
|
+
)
|
|
118
|
+
);
|
|
119
|
+
|
|
120
|
+
mockDeleteWorkerRequest({ name: "my-script" });
|
|
121
|
+
await runWrangler("delete --name my-script");
|
|
122
|
+
expect(std).toMatchInlineSnapshot(`
|
|
123
|
+
Object {
|
|
124
|
+
"debug": "",
|
|
125
|
+
"err": "",
|
|
126
|
+
"out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
|
|
127
|
+
Successfully deleted my-script",
|
|
128
|
+
"warn": "",
|
|
129
|
+
}
|
|
130
|
+
`);
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
it("should delete a site namespace associated with a worker, including it's preview namespace", async () => {
|
|
134
|
+
// This is the same test as the previous one, but it includes a preview namespace
|
|
135
|
+
const kvNamespaces = [
|
|
136
|
+
{
|
|
137
|
+
title: "__my-script-workers_sites_assets",
|
|
138
|
+
id: "id-for-my-script-site-ns",
|
|
139
|
+
},
|
|
140
|
+
// this is the preview namespace
|
|
141
|
+
{
|
|
142
|
+
title: "__my-script-workers_sites_assets_preview",
|
|
143
|
+
id: "id-for-my-script-site-preview-ns",
|
|
144
|
+
},
|
|
145
|
+
|
|
146
|
+
// this one isn't associated with the worker
|
|
147
|
+
{
|
|
148
|
+
title: "__test-name-workers_sites_assets",
|
|
149
|
+
id: "id-for-another-site-ns",
|
|
150
|
+
},
|
|
151
|
+
];
|
|
152
|
+
|
|
153
|
+
mockConfirm({
|
|
154
|
+
text: `Are you sure you want to delete my-script? This action cannot be undone.`,
|
|
155
|
+
result: true,
|
|
156
|
+
});
|
|
157
|
+
mockListKVNamespacesRequest(...kvNamespaces);
|
|
158
|
+
// it should only try to delete the site namespace associated with this worker
|
|
159
|
+
|
|
160
|
+
msw.use(
|
|
161
|
+
rest.delete(
|
|
162
|
+
"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-ns",
|
|
163
|
+
(req, res, ctx) => {
|
|
164
|
+
expect(req.params.accountId).toEqual("some-account-id");
|
|
165
|
+
return res.once(
|
|
166
|
+
ctx.status(200),
|
|
167
|
+
ctx.json({
|
|
168
|
+
success: true,
|
|
169
|
+
errors: [],
|
|
170
|
+
messages: [],
|
|
171
|
+
result: {},
|
|
172
|
+
})
|
|
173
|
+
);
|
|
174
|
+
}
|
|
175
|
+
)
|
|
176
|
+
);
|
|
177
|
+
|
|
178
|
+
msw.use(
|
|
179
|
+
rest.delete(
|
|
180
|
+
"*/accounts/:accountId/storage/kv/namespaces/id-for-my-script-site-preview-ns",
|
|
181
|
+
(req, res, ctx) => {
|
|
182
|
+
expect(req.params.accountId).toEqual("some-account-id");
|
|
183
|
+
return res.once(
|
|
184
|
+
ctx.status(200),
|
|
185
|
+
ctx.json({
|
|
186
|
+
success: true,
|
|
187
|
+
errors: [],
|
|
188
|
+
messages: [],
|
|
189
|
+
result: {},
|
|
190
|
+
})
|
|
191
|
+
);
|
|
192
|
+
}
|
|
193
|
+
)
|
|
194
|
+
);
|
|
195
|
+
|
|
196
|
+
mockDeleteWorkerRequest({ name: "my-script" });
|
|
197
|
+
await runWrangler("delete --name my-script");
|
|
198
|
+
expect(std).toMatchInlineSnapshot(`
|
|
199
|
+
Object {
|
|
200
|
+
"debug": "",
|
|
201
|
+
"err": "",
|
|
202
|
+
"out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
|
|
203
|
+
🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets_preview\\"
|
|
204
|
+
Successfully deleted my-script",
|
|
205
|
+
"warn": "",
|
|
206
|
+
}
|
|
207
|
+
`);
|
|
208
|
+
});
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
/** Create a mock handler for the request to upload a worker script. */
|
|
212
|
+
function mockDeleteWorkerRequest(
|
|
213
|
+
options: {
|
|
214
|
+
name?: string;
|
|
215
|
+
env?: string;
|
|
216
|
+
legacyEnv?: boolean;
|
|
217
|
+
} = {}
|
|
218
|
+
) {
|
|
219
|
+
const { env, legacyEnv, name } = options;
|
|
220
|
+
msw.use(
|
|
221
|
+
rest.delete(
|
|
222
|
+
"*/accounts/:accountId/workers/services/:scriptName",
|
|
223
|
+
(req, res, ctx) => {
|
|
224
|
+
expect(req.params.accountId).toEqual("some-account-id");
|
|
225
|
+
expect(req.params.scriptName).toEqual(
|
|
226
|
+
legacyEnv && env
|
|
227
|
+
? `${name ?? "test-name"}-${env}`
|
|
228
|
+
: `${name ?? "test-name"}`
|
|
229
|
+
);
|
|
230
|
+
|
|
231
|
+
expect(req.url.searchParams.get("force")).toEqual("true");
|
|
232
|
+
|
|
233
|
+
return res.once(
|
|
234
|
+
ctx.status(200),
|
|
235
|
+
ctx.json({
|
|
236
|
+
success: true,
|
|
237
|
+
errors: [],
|
|
238
|
+
messages: [],
|
|
239
|
+
result: null,
|
|
240
|
+
})
|
|
241
|
+
);
|
|
242
|
+
}
|
|
243
|
+
)
|
|
244
|
+
);
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
/** Create a mock handler for the request to get a list of all KV namespaces. */
|
|
248
|
+
function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
|
|
249
|
+
msw.use(
|
|
250
|
+
rest.get("*/accounts/:accountId/storage/kv/namespaces", (req, res, ctx) => {
|
|
251
|
+
expect(req.params.accountId).toEqual("some-account-id");
|
|
252
|
+
return res.once(
|
|
253
|
+
ctx.status(200),
|
|
254
|
+
ctx.json({
|
|
255
|
+
success: true,
|
|
256
|
+
errors: [],
|
|
257
|
+
messages: [],
|
|
258
|
+
result: namespaces,
|
|
259
|
+
})
|
|
260
|
+
);
|
|
261
|
+
})
|
|
262
|
+
);
|
|
263
|
+
}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
// import * as fs from "fs";
|
|
2
|
+
// import * as TOML from "@iarna/toml";
|
|
3
|
+
import * as fs from "node:fs";
|
|
4
|
+
import * as TOML from "@iarna/toml";
|
|
5
|
+
import { rest } from "msw";
|
|
6
|
+
import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
|
|
7
|
+
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
8
|
+
import {
|
|
9
|
+
msw,
|
|
10
|
+
mswSuccessOauthHandlers,
|
|
11
|
+
mswSuccessUserHandlers,
|
|
12
|
+
} from "./helpers/msw";
|
|
13
|
+
import { mswSuccessDeployments } from "./helpers/msw";
|
|
14
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
15
|
+
import { runWrangler } from "./helpers/run-wrangler";
|
|
16
|
+
|
|
17
|
+
describe("deployments", () => {
|
|
18
|
+
const std = mockConsoleMethods();
|
|
19
|
+
runInTempDir();
|
|
20
|
+
mockAccountId();
|
|
21
|
+
mockApiToken();
|
|
22
|
+
runInTempDir();
|
|
23
|
+
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
msw.use(
|
|
26
|
+
...mswSuccessDeployments,
|
|
27
|
+
...mswSuccessOauthHandlers,
|
|
28
|
+
...mswSuccessUserHandlers,
|
|
29
|
+
rest.get(
|
|
30
|
+
"*/accounts/:accountId/workers/services/:scriptName",
|
|
31
|
+
(_, response, context) => {
|
|
32
|
+
return response.once(
|
|
33
|
+
context.status(200),
|
|
34
|
+
context.json({
|
|
35
|
+
success: true,
|
|
36
|
+
errors: [],
|
|
37
|
+
messages: [],
|
|
38
|
+
result: {
|
|
39
|
+
default_environment: {
|
|
40
|
+
script: {
|
|
41
|
+
tag: "MOCK-TAG",
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
})
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
)
|
|
49
|
+
);
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
it("should log deployments", async () => {
|
|
53
|
+
fs.writeFileSync(
|
|
54
|
+
"./wrangler.toml",
|
|
55
|
+
TOML.stringify({
|
|
56
|
+
compatibility_date: "2022-01-12",
|
|
57
|
+
name: "test-script-name",
|
|
58
|
+
first_party_worker: true,
|
|
59
|
+
}),
|
|
60
|
+
"utf-8"
|
|
61
|
+
);
|
|
62
|
+
|
|
63
|
+
await runWrangler("deployments");
|
|
64
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
65
|
+
"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
Deployment ID: Galaxy-Class
|
|
69
|
+
Created on: 2021-01-01T00:00:00.000000Z
|
|
70
|
+
Author: Jean-Luc-Picard@federation.org
|
|
71
|
+
Source: Wrangler
|
|
72
|
+
|
|
73
|
+
Deployment ID: Intrepid-Class
|
|
74
|
+
Created on: 2021-02-02T00:00:00.000000Z
|
|
75
|
+
Author: Kathryn-Janeway@federation.org
|
|
76
|
+
Source: Wrangler
|
|
77
|
+
🟩 Active"
|
|
78
|
+
`);
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it("should log deployments for script with passed in name option", async () => {
|
|
82
|
+
await runWrangler("deployments --name something-else");
|
|
83
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
84
|
+
"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
Deployment ID: Galaxy-Class
|
|
88
|
+
Created on: 2021-01-01T00:00:00.000000Z
|
|
89
|
+
Author: Jean-Luc-Picard@federation.org
|
|
90
|
+
Source: Wrangler
|
|
91
|
+
|
|
92
|
+
Deployment ID: Intrepid-Class
|
|
93
|
+
Created on: 2021-02-02T00:00:00.000000Z
|
|
94
|
+
Author: Kathryn-Janeway@federation.org
|
|
95
|
+
Source: Wrangler
|
|
96
|
+
🟩 Active"
|
|
97
|
+
`);
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it("should error on missing script name", async () => {
|
|
101
|
+
await expect(runWrangler("deployments")).rejects.toMatchInlineSnapshot(
|
|
102
|
+
`[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name\`]`
|
|
103
|
+
);
|
|
104
|
+
});
|
|
105
|
+
});
|