wrangler 0.0.0-e88a54e → 0.0.0-e8e684c7
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/Cloudflare_CA.pem +18 -0
- package/README.md +51 -14
- package/bin/wrangler.js +161 -29
- package/kv-asset-handler.js +1 -0
- package/miniflare-dist/index.mjs +5484 -21
- package/package.json +173 -143
- package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
- package/src/__tests__/config-cache.test.ts +42 -0
- package/src/__tests__/configuration.test.ts +4016 -2786
- package/src/__tests__/dev.test.tsx +1305 -483
- package/src/__tests__/generate.test.ts +91 -0
- package/src/__tests__/guess-worker-format.test.ts +75 -48
- 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-bin.ts +20 -20
- package/src/__tests__/helpers/mock-cfetch.ts +182 -93
- package/src/__tests__/helpers/mock-console.ts +59 -32
- package/src/__tests__/helpers/mock-dialogs.ts +121 -33
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
- package/src/__tests__/helpers/mock-http-server.ts +46 -0
- package/src/__tests__/helpers/mock-istty.ts +74 -0
- package/src/__tests__/helpers/mock-known-routes.ts +7 -0
- package/src/__tests__/helpers/mock-kv.ts +26 -26
- package/src/__tests__/helpers/mock-oauth-flow.ts +250 -0
- package/src/__tests__/helpers/mock-process.ts +39 -0
- package/src/__tests__/helpers/mock-stdin.ts +82 -77
- package/src/__tests__/helpers/mock-web-socket.ts +21 -21
- package/src/__tests__/helpers/run-in-tmp.ts +28 -22
- package/src/__tests__/helpers/run-wrangler.ts +8 -8
- package/src/__tests__/helpers/write-worker-source.ts +31 -0
- package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
- package/src/__tests__/https-options.test.ts +144 -108
- package/src/__tests__/index.test.ts +229 -975
- package/src/__tests__/init.test.ts +2170 -0
- package/src/__tests__/jest.setup.ts +122 -34
- package/src/__tests__/kv.test.ts +1376 -1087
- package/src/__tests__/logger.test.ts +141 -0
- package/src/__tests__/metrics.test.ts +450 -0
- package/src/__tests__/package-manager.test.ts +312 -165
- package/src/__tests__/pages.test.ts +1270 -39
- package/src/__tests__/parse.test.ts +253 -245
- package/src/__tests__/publish.test.ts +6878 -2627
- package/src/__tests__/pubsub.test.ts +367 -0
- package/src/__tests__/r2.test.ts +328 -190
- package/src/__tests__/route.test.ts +22 -22
- package/src/__tests__/secret.test.ts +474 -407
- package/src/__tests__/tail.test.ts +679 -441
- package/src/__tests__/test-old-node-version.js +31 -0
- package/src/__tests__/user.test.ts +155 -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 +276 -87
- package/src/__tests__/worker-namespace.test.ts +329 -0
- package/src/abort.d.ts +3 -0
- package/src/api/dev.ts +93 -0
- package/src/api/index.ts +1 -0
- package/src/bundle-reporter.tsx +29 -0
- package/src/bundle.ts +441 -110
- package/src/cfetch/index.ts +83 -66
- package/src/cfetch/internal.ts +251 -92
- package/src/cli.ts +22 -14
- package/src/config/README.md +1 -1
- package/src/config/config.ts +224 -179
- package/src/config/diagnostics.ts +61 -61
- package/src/config/environment.ts +430 -311
- package/src/config/index.ts +227 -38
- package/src/config/validation-helpers.ts +414 -303
- package/src/config/validation.ts +1745 -973
- package/src/config-cache.ts +85 -0
- package/src/create-worker-preview.ts +209 -118
- package/src/create-worker-upload-form.ts +275 -201
- package/src/dev/dev-vars.ts +36 -0
- package/src/dev/dev.tsx +488 -307
- package/src/dev/local.tsx +427 -210
- package/src/dev/remote.tsx +407 -188
- package/src/dev/use-esbuild.ts +156 -78
- package/src/dev/validate-dev-props.ts +31 -0
- package/src/dev-registry.tsx +160 -0
- package/src/dev.tsx +696 -0
- package/src/dialogs.tsx +115 -57
- package/src/dispatch-namespace.ts +206 -0
- package/src/durable.ts +102 -0
- package/src/entry.ts +267 -147
- package/src/environment-variables.ts +25 -23
- package/src/errors.ts +11 -0
- package/src/faye-websocket.d.ts +6 -0
- package/src/generate.ts +131 -0
- package/src/git-client.ts +42 -0
- package/src/global-wrangler-config-path.ts +26 -0
- package/src/https-options.ts +85 -80
- package/src/index.tsx +2191 -2304
- package/src/init.ts +622 -0
- package/src/inspect.ts +687 -557
- package/src/intl-polyfill.d.ts +139 -0
- package/src/is-ci.ts +14 -0
- package/src/is-interactive.ts +12 -0
- package/src/kv.ts +353 -242
- package/src/logger.ts +73 -0
- 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 +92 -0
- package/src/miniflare-cli/assets.ts +554 -0
- package/src/miniflare-cli/enum-keys.ts +8 -8
- package/src/miniflare-cli/index.ts +199 -29
- package/src/miniflare-cli/request-context.ts +40 -0
- package/src/module-collection.ts +213 -213
- package/src/open-in-browser.ts +8 -16
- package/src/package-manager.ts +183 -90
- package/src/pages/build.tsx +238 -0
- package/src/pages/constants.ts +12 -0
- package/src/pages/deployments.tsx +106 -0
- package/src/pages/dev.tsx +528 -0
- package/src/pages/errors.ts +22 -0
- package/src/pages/functions/buildPlugin.ts +109 -0
- package/src/pages/functions/buildWorker.ts +155 -0
- package/src/pages/functions/filepath-routing.test.ts +234 -0
- 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 +271 -0
- package/src/pages/functions/routes-transformation.ts +122 -0
- package/src/pages/functions/routes.ts +151 -0
- package/src/pages/functions.tsx +96 -0
- package/src/pages/index.tsx +94 -0
- package/src/pages/projects.tsx +169 -0
- package/src/pages/publish.tsx +391 -0
- package/src/pages/types.ts +49 -0
- package/src/pages/upload.tsx +413 -0
- package/src/pages/utils.ts +12 -0
- package/src/parse.ts +224 -121
- package/src/paths.ts +6 -6
- package/src/preview.ts +31 -0
- package/src/proxy.ts +416 -370
- package/src/publish.ts +796 -321
- package/src/pubsub/index.ts +286 -0
- package/src/pubsub/pubsub-commands.tsx +623 -0
- package/src/r2.ts +100 -19
- package/src/selfsigned.d.ts +23 -23
- package/src/sites.tsx +281 -189
- package/src/tail/filters.ts +111 -109
- package/src/tail/index.ts +230 -217
- package/src/tail/printing.ts +92 -47
- package/src/update-check.ts +19 -0
- package/src/user/choose-account.tsx +69 -0
- package/src/user/env-vars.ts +46 -0
- package/src/user/generate-auth-url.ts +33 -0
- package/src/user/generate-random-state.ts +16 -0
- package/src/user/index.ts +3 -0
- package/src/user/user.tsx +1191 -0
- package/src/whoami.tsx +142 -42
- package/src/worker.ts +135 -94
- package/src/zones.ts +167 -0
- package/templates/checked-fetch.js +17 -0
- package/templates/first-party-worker-module-facade.ts +18 -0
- package/templates/format-dev-errors.ts +32 -0
- package/templates/gitignore +171 -0
- package/templates/new-worker-scheduled.js +17 -0
- package/templates/new-worker-scheduled.ts +32 -0
- package/templates/new-worker.js +3 -3
- package/templates/new-worker.ts +18 -3
- package/templates/no-op-worker.js +10 -0
- package/templates/pages-shim.ts +9 -0
- package/templates/pages-template-plugin.ts +167 -0
- package/templates/pages-template-worker.ts +172 -0
- package/templates/serve-static-assets.ts +63 -0
- package/templates/service-bindings-module-facade.js +54 -0
- package/templates/service-bindings-sw-facade.js +42 -0
- package/templates/tsconfig.json +95 -95
- package/wrangler-dist/cli.d.ts +338 -0
- package/wrangler-dist/cli.js +124611 -112403
- package/miniflare-dist/index.mjs.map +0 -7
- package/pages/functions/buildWorker.ts +0 -62
- package/pages/functions/filepath-routing.test.ts +0 -223
- package/pages/functions/filepath-routing.ts +0 -181
- package/pages/functions/identifiers.ts +0 -78
- package/pages/functions/routes.ts +0 -151
- package/pages/functions/template-worker.ts +0 -130
- package/src/__tests__/dev2.test.tsx +0 -154
- package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
- package/src/__tests__/logout.test.ts +0 -52
- package/src/__tests__/sentry.test.ts +0 -146
- package/src/pages.tsx +0 -1047
- package/src/reporting.ts +0 -131
- package/src/user.tsx +0 -1118
- package/templates/static-asset-facade.js +0 -47
- package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
- package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
- package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
- package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
- package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
- package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
- package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
- package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
- package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
- package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
- package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
- package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
- package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
- package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
- package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
- package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
- package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
- package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
- package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
- package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
- package/vendor/wrangler-mime/CHANGELOG.md +0 -289
- package/vendor/wrangler-mime/LICENSE +0 -21
- package/vendor/wrangler-mime/Mime.js +0 -97
- package/vendor/wrangler-mime/README.md +0 -187
- package/vendor/wrangler-mime/cli.js +0 -46
- package/vendor/wrangler-mime/index.js +0 -4
- package/vendor/wrangler-mime/lite.js +0 -4
- package/vendor/wrangler-mime/package.json +0 -52
- package/vendor/wrangler-mime/types/other.js +0 -1
- package/vendor/wrangler-mime/types/standard.js +0 -1
- package/wrangler-dist/cli.js.map +0 -7
package/src/__tests__/kv.test.ts
CHANGED
|
@@ -1,53 +1,60 @@
|
|
|
1
1
|
import { writeFileSync } from "node:fs";
|
|
2
|
-
import { Headers } from "undici";
|
|
2
|
+
import { FormData, Headers } from "undici";
|
|
3
3
|
import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
|
|
4
4
|
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
setMockResponse,
|
|
6
|
+
unsetAllMocks,
|
|
7
|
+
unsetSpecialMockFns,
|
|
8
|
+
setMockFetchKVGetValue,
|
|
9
|
+
setMockRawResponse,
|
|
10
|
+
createFetchResult,
|
|
9
11
|
} from "./helpers/mock-cfetch";
|
|
10
12
|
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
11
|
-
import { mockConfirm } from "./helpers/mock-dialogs";
|
|
13
|
+
import { clearConfirmMocks, mockConfirm } from "./helpers/mock-dialogs";
|
|
14
|
+
import { useMockIsTTY } from "./helpers/mock-istty";
|
|
12
15
|
import { mockKeyListRequest } from "./helpers/mock-kv";
|
|
16
|
+
import { mockGetMemberships } from "./helpers/mock-oauth-flow";
|
|
17
|
+
import { mockProcess } from "./helpers/mock-process";
|
|
13
18
|
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
14
19
|
import { runWrangler } from "./helpers/run-wrangler";
|
|
15
20
|
import type { KeyValue, KVNamespaceInfo, NamespaceKeyInfo } from "../kv";
|
|
16
21
|
|
|
17
22
|
describe("wrangler", () => {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
23
|
+
mockAccountId();
|
|
24
|
+
mockApiToken();
|
|
25
|
+
runInTempDir();
|
|
26
|
+
const std = mockConsoleMethods();
|
|
27
|
+
const proc = mockProcess();
|
|
28
|
+
|
|
29
|
+
afterEach(() => {
|
|
30
|
+
unsetAllMocks();
|
|
31
|
+
clearConfirmMocks();
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
describe("kv:namespace", () => {
|
|
35
|
+
describe("create", () => {
|
|
36
|
+
function mockCreateRequest(expectedTitle: string) {
|
|
37
|
+
setMockResponse(
|
|
38
|
+
"/accounts/:accountId/storage/kv/namespaces",
|
|
39
|
+
"POST",
|
|
40
|
+
([_url, accountId], { body }) => {
|
|
41
|
+
expect(accountId).toEqual("some-account-id");
|
|
42
|
+
const title = JSON.parse(body as string).title;
|
|
43
|
+
expect(title).toEqual(expectedTitle);
|
|
44
|
+
return { id: "some-namespace-id" };
|
|
45
|
+
}
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
it("should error if no namespace is given", async () => {
|
|
50
|
+
await expect(
|
|
51
|
+
runWrangler("kv:namespace create")
|
|
52
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
53
|
+
`"Not enough non-option arguments: got 0, need at least 1"`
|
|
54
|
+
);
|
|
55
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
56
|
+
"
|
|
57
|
+
wrangler kv:namespace create <namespace>
|
|
51
58
|
|
|
52
59
|
Create a new namespace
|
|
53
60
|
|
|
@@ -55,28 +62,30 @@ describe("wrangler", () => {
|
|
|
55
62
|
namespace The name of the new namespace [string] [required]
|
|
56
63
|
|
|
57
64
|
Flags:
|
|
58
|
-
-c, --config
|
|
59
|
-
-h, --help
|
|
60
|
-
-v, --version
|
|
61
|
-
--legacy-env Use legacy environments [boolean]
|
|
65
|
+
-c, --config Path to .toml configuration file [string]
|
|
66
|
+
-h, --help Show help [boolean]
|
|
67
|
+
-v, --version Show version number [boolean]
|
|
62
68
|
|
|
63
69
|
Options:
|
|
64
70
|
-e, --env Perform on a specific environment [string]
|
|
65
|
-
--preview Interact with a preview namespace [boolean]
|
|
71
|
+
--preview Interact with a preview namespace [boolean]"
|
|
72
|
+
`);
|
|
73
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
74
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mNot enough non-option arguments: got 0, need at least 1[0m
|
|
66
75
|
|
|
67
|
-
|
|
76
|
+
"
|
|
68
77
|
`);
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it("should error if the namespace to create contains spaces", async () => {
|
|
81
|
+
await expect(
|
|
82
|
+
runWrangler("kv:namespace create abc def ghi")
|
|
83
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
84
|
+
`"Unknown arguments: def, ghi"`
|
|
85
|
+
);
|
|
86
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
87
|
+
"
|
|
88
|
+
wrangler kv:namespace create <namespace>
|
|
80
89
|
|
|
81
90
|
Create a new namespace
|
|
82
91
|
|
|
@@ -84,29 +93,31 @@ describe("wrangler", () => {
|
|
|
84
93
|
namespace The name of the new namespace [string] [required]
|
|
85
94
|
|
|
86
95
|
Flags:
|
|
87
|
-
-c, --config
|
|
88
|
-
-h, --help
|
|
89
|
-
-v, --version
|
|
90
|
-
--legacy-env Use legacy environments [boolean]
|
|
96
|
+
-c, --config Path to .toml configuration file [string]
|
|
97
|
+
-h, --help Show help [boolean]
|
|
98
|
+
-v, --version Show version number [boolean]
|
|
91
99
|
|
|
92
100
|
Options:
|
|
93
101
|
-e, --env Perform on a specific environment [string]
|
|
94
|
-
--preview Interact with a preview namespace [boolean]
|
|
102
|
+
--preview Interact with a preview namespace [boolean]"
|
|
103
|
+
`);
|
|
104
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
105
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mUnknown arguments: def, ghi[0m
|
|
95
106
|
|
|
96
|
-
|
|
107
|
+
"
|
|
97
108
|
`);
|
|
98
|
-
|
|
109
|
+
});
|
|
99
110
|
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
111
|
+
it("should error if the namespace to create is not valid", async () => {
|
|
112
|
+
await expect(
|
|
113
|
+
runWrangler("kv:namespace create abc-def")
|
|
114
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
115
|
+
`"The namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number."`
|
|
116
|
+
);
|
|
106
117
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
118
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
119
|
+
"
|
|
120
|
+
wrangler kv:namespace create <namespace>
|
|
110
121
|
|
|
111
122
|
Create a new namespace
|
|
112
123
|
|
|
@@ -114,356 +125,410 @@ describe("wrangler", () => {
|
|
|
114
125
|
namespace The name of the new namespace [string] [required]
|
|
115
126
|
|
|
116
127
|
Flags:
|
|
117
|
-
-c, --config
|
|
118
|
-
-h, --help
|
|
119
|
-
-v, --version
|
|
120
|
-
--legacy-env Use legacy environments [boolean]
|
|
128
|
+
-c, --config Path to .toml configuration file [string]
|
|
129
|
+
-h, --help Show help [boolean]
|
|
130
|
+
-v, --version Show version number [boolean]
|
|
121
131
|
|
|
122
132
|
Options:
|
|
123
133
|
-e, --env Perform on a specific environment [string]
|
|
124
|
-
--preview Interact with a preview namespace [boolean]
|
|
134
|
+
--preview Interact with a preview namespace [boolean]"
|
|
135
|
+
`);
|
|
136
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
137
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mThe namespace binding name \\"abc-def\\" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.[0m
|
|
125
138
|
|
|
126
|
-
|
|
139
|
+
"
|
|
127
140
|
`);
|
|
128
|
-
|
|
141
|
+
});
|
|
129
142
|
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
143
|
+
it("should create a namespace", async () => {
|
|
144
|
+
mockCreateRequest("worker-UnitTestNamespace");
|
|
145
|
+
await runWrangler("kv:namespace create UnitTestNamespace");
|
|
146
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
134
147
|
"🌀 Creating namespace with title \\"worker-UnitTestNamespace\\"
|
|
135
148
|
✨ Success!
|
|
136
149
|
Add the following to your configuration file in your kv_namespaces array:
|
|
137
150
|
{ binding = \\"UnitTestNamespace\\", id = \\"some-namespace-id\\" }"
|
|
138
151
|
`);
|
|
139
|
-
|
|
152
|
+
});
|
|
140
153
|
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
154
|
+
it("should create a preview namespace if configured to do so", async () => {
|
|
155
|
+
mockCreateRequest("worker-UnitTestNamespace_preview");
|
|
156
|
+
await runWrangler("kv:namespace create UnitTestNamespace --preview");
|
|
157
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
145
158
|
"🌀 Creating namespace with title \\"worker-UnitTestNamespace_preview\\"
|
|
146
159
|
✨ Success!
|
|
147
160
|
Add the following to your configuration file in your kv_namespaces array:
|
|
148
161
|
{ binding = \\"UnitTestNamespace\\", preview_id = \\"some-namespace-id\\" }"
|
|
149
162
|
`);
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
"🌀 Creating namespace with title \\"
|
|
163
|
+
});
|
|
164
|
+
|
|
165
|
+
it("should create a namespace using configured worker name", async () => {
|
|
166
|
+
writeFileSync("./wrangler.toml", 'name = "other-worker"', "utf-8");
|
|
167
|
+
mockCreateRequest("other-worker-UnitTestNamespace");
|
|
168
|
+
await runWrangler("kv:namespace create UnitTestNamespace");
|
|
169
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
170
|
+
"🌀 Creating namespace with title \\"other-worker-UnitTestNamespace\\"
|
|
158
171
|
✨ Success!
|
|
159
172
|
Add the following to your configuration file in your kv_namespaces array:
|
|
160
173
|
{ binding = \\"UnitTestNamespace\\", id = \\"some-namespace-id\\" }"
|
|
161
174
|
`);
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
it("should create a namespace in an environment if configured to do so", async () => {
|
|
178
|
+
mockCreateRequest("worker-customEnv-UnitTestNamespace");
|
|
179
|
+
await runWrangler(
|
|
180
|
+
"kv:namespace create UnitTestNamespace --env customEnv"
|
|
181
|
+
);
|
|
182
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
170
183
|
"🌀 Creating namespace with title \\"worker-customEnv-UnitTestNamespace\\"
|
|
171
184
|
✨ Success!
|
|
172
185
|
Add the following to your configuration file in your kv_namespaces array under [env.customEnv]:
|
|
173
186
|
{ binding = \\"UnitTestNamespace\\", id = \\"some-namespace-id\\" }"
|
|
174
187
|
`);
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
"
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
-c, --config Path to .toml configuration file [string]
|
|
282
|
-
-h, --help Show help [boolean]
|
|
283
|
-
-v, --version Show version number [boolean]
|
|
284
|
-
--legacy-env Use legacy environments [boolean]
|
|
285
|
-
|
|
286
|
-
Options:
|
|
287
|
-
--binding The name of the namespace to delete [string]
|
|
288
|
-
--namespace-id The id of the namespace to delete [string]
|
|
289
|
-
-e, --env Perform on a specific environment [string]
|
|
290
|
-
--preview Interact with a preview namespace [boolean]
|
|
291
|
-
|
|
292
|
-
Not able to delete namespace.
|
|
293
|
-
A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
|
|
191
|
+
describe("list", () => {
|
|
192
|
+
function mockListRequest(namespaces: unknown[]) {
|
|
193
|
+
const requests = { count: 0 };
|
|
194
|
+
setMockResponse(
|
|
195
|
+
"/accounts/:accountId/storage/kv/namespaces",
|
|
196
|
+
([_url, accountId], init, query) => {
|
|
197
|
+
requests.count++;
|
|
198
|
+
expect(accountId).toEqual("some-account-id");
|
|
199
|
+
expect(query.get("per_page")).toEqual("100");
|
|
200
|
+
expect(query.get("order")).toEqual("title");
|
|
201
|
+
expect(query.get("direction")).toEqual("asc");
|
|
202
|
+
expect(query.get("page")).toEqual(`${requests.count}`);
|
|
203
|
+
expect(init).toEqual({});
|
|
204
|
+
const pageSize = Number(query.get("per_page"));
|
|
205
|
+
const page = Number(query.get("page"));
|
|
206
|
+
return namespaces.slice((page - 1) * pageSize, page * pageSize);
|
|
207
|
+
}
|
|
208
|
+
);
|
|
209
|
+
return requests;
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
it("should list namespaces", async () => {
|
|
213
|
+
const kvNamespaces: KVNamespaceInfo[] = [
|
|
214
|
+
{ title: "title-1", id: "id-1" },
|
|
215
|
+
{ title: "title-2", id: "id-2" },
|
|
216
|
+
];
|
|
217
|
+
mockListRequest(kvNamespaces);
|
|
218
|
+
await runWrangler("kv:namespace list");
|
|
219
|
+
|
|
220
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
221
|
+
const namespaces = JSON.parse(std.out);
|
|
222
|
+
expect(namespaces).toEqual(kvNamespaces);
|
|
223
|
+
});
|
|
224
|
+
|
|
225
|
+
it("should make multiple requests for paginated results", async () => {
|
|
226
|
+
// Create a lot of mock namespaces, so that the fetch requests will be paginated
|
|
227
|
+
const kvNamespaces: KVNamespaceInfo[] = [];
|
|
228
|
+
for (let i = 0; i < 550; i++) {
|
|
229
|
+
kvNamespaces.push({ title: "title-" + i, id: "id-" + i });
|
|
230
|
+
}
|
|
231
|
+
const requests = mockListRequest(kvNamespaces);
|
|
232
|
+
await runWrangler("kv:namespace list");
|
|
233
|
+
const namespaces = JSON.parse(std.out);
|
|
234
|
+
expect(namespaces).toEqual(kvNamespaces);
|
|
235
|
+
expect(requests.count).toEqual(6);
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
|
|
239
|
+
describe("delete", () => {
|
|
240
|
+
function mockDeleteRequest(expectedNamespaceId: string) {
|
|
241
|
+
const requests = { count: 0 };
|
|
242
|
+
setMockResponse(
|
|
243
|
+
"/accounts/:accountId/storage/kv/namespaces/:namespaceId",
|
|
244
|
+
"DELETE",
|
|
245
|
+
([_url, accountId, namespaceId]) => {
|
|
246
|
+
requests.count++;
|
|
247
|
+
expect(accountId).toEqual("some-account-id");
|
|
248
|
+
expect(namespaceId).toEqual(expectedNamespaceId);
|
|
249
|
+
return null;
|
|
250
|
+
}
|
|
251
|
+
);
|
|
252
|
+
return requests;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
it("should delete a namespace specified by id", async () => {
|
|
256
|
+
const requests = mockDeleteRequest("some-namespace-id");
|
|
257
|
+
await runWrangler(
|
|
258
|
+
`kv:namespace delete --namespace-id some-namespace-id`
|
|
259
|
+
);
|
|
260
|
+
expect(requests.count).toEqual(1);
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
it("should delete a namespace specified by binding name", async () => {
|
|
264
|
+
writeWranglerConfig();
|
|
265
|
+
const requests = mockDeleteRequest("bound-id");
|
|
266
|
+
await runWrangler(
|
|
267
|
+
`kv:namespace delete --binding someBinding --preview false`
|
|
268
|
+
);
|
|
269
|
+
expect(requests.count).toEqual(1);
|
|
270
|
+
});
|
|
271
|
+
|
|
272
|
+
it("should delete a preview namespace specified by binding name", async () => {
|
|
273
|
+
writeWranglerConfig();
|
|
274
|
+
const requests = mockDeleteRequest("preview-bound-id");
|
|
275
|
+
await runWrangler(
|
|
276
|
+
`kv:namespace delete --binding someBinding --preview`
|
|
277
|
+
);
|
|
278
|
+
expect(requests.count).toEqual(1);
|
|
279
|
+
});
|
|
280
|
+
|
|
281
|
+
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
282
|
+
writeWranglerConfig();
|
|
283
|
+
await expect(runWrangler("kv:namespace delete --binding otherBinding"))
|
|
284
|
+
.rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
285
|
+
"Not able to delete namespace.
|
|
286
|
+
A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
|
|
287
|
+
`);
|
|
288
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
289
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mNot able to delete namespace.[0m
|
|
290
|
+
|
|
291
|
+
A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
|
|
292
|
+
|
|
293
|
+
"
|
|
294
294
|
`);
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
it("should delete a namespace specified by binding name in a given environment", async () => {
|
|
298
|
+
writeWranglerConfig();
|
|
299
|
+
const requests = mockDeleteRequest("env-bound-id");
|
|
300
|
+
await runWrangler(
|
|
301
|
+
"kv:namespace delete --binding someBinding --env some-environment --preview false"
|
|
302
|
+
);
|
|
303
|
+
|
|
304
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
305
|
+
"Deleting KV namespace env-bound-id.
|
|
306
|
+
Deleted KV namespace env-bound-id."
|
|
307
|
+
`);
|
|
308
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
309
|
+
expect(requests.count).toEqual(1);
|
|
310
|
+
});
|
|
311
|
+
|
|
312
|
+
it("should delete a preview namespace specified by binding name in a given environment", async () => {
|
|
313
|
+
writeWranglerConfig();
|
|
314
|
+
const requests = mockDeleteRequest("preview-env-bound-id");
|
|
315
|
+
await runWrangler(
|
|
316
|
+
`kv:namespace delete --binding someBinding --env some-environment --preview`
|
|
317
|
+
);
|
|
318
|
+
expect(requests.count).toEqual(1);
|
|
319
|
+
});
|
|
320
|
+
});
|
|
321
|
+
});
|
|
322
|
+
|
|
323
|
+
describe("kv:key", () => {
|
|
324
|
+
describe("put", () => {
|
|
325
|
+
function mockKeyPutRequest(
|
|
326
|
+
expectedNamespaceId: string,
|
|
327
|
+
expectedKV: KeyValue
|
|
328
|
+
) {
|
|
329
|
+
const requests = { count: 0 };
|
|
330
|
+
setMockResponse(
|
|
331
|
+
"/accounts/:accountId/storage/kv/namespaces/:namespaceId/values/:key",
|
|
332
|
+
"PUT",
|
|
333
|
+
([_url, accountId, namespaceId, key], { body }, query) => {
|
|
334
|
+
requests.count++;
|
|
335
|
+
expect(accountId).toEqual("some-account-id");
|
|
336
|
+
expect(namespaceId).toEqual(expectedNamespaceId);
|
|
337
|
+
expect(key).toEqual(expectedKV.key);
|
|
338
|
+
if (expectedKV.metadata) {
|
|
339
|
+
expect(body).toBeInstanceOf(FormData);
|
|
340
|
+
expect((body as FormData).get("value")).toEqual(expectedKV.value);
|
|
341
|
+
expect((body as FormData).get("metadata")).toEqual(
|
|
342
|
+
JSON.stringify(expectedKV.metadata)
|
|
343
|
+
);
|
|
344
|
+
} else {
|
|
345
|
+
expect(body).toEqual(expectedKV.value);
|
|
346
|
+
}
|
|
347
|
+
if (expectedKV.expiration !== undefined) {
|
|
348
|
+
expect(query.get("expiration")).toEqual(
|
|
349
|
+
`${expectedKV.expiration}`
|
|
350
|
+
);
|
|
351
|
+
} else {
|
|
352
|
+
expect(query.has("expiration")).toBe(false);
|
|
353
|
+
}
|
|
354
|
+
if (expectedKV.expiration_ttl) {
|
|
355
|
+
expect(query.get("expiration_ttl")).toEqual(
|
|
356
|
+
`${expectedKV.expiration_ttl}`
|
|
357
|
+
);
|
|
358
|
+
} else {
|
|
359
|
+
expect(query.has("expiration_ttl")).toBe(false);
|
|
360
|
+
}
|
|
361
|
+
return null;
|
|
362
|
+
}
|
|
363
|
+
);
|
|
364
|
+
return requests;
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
it("should put a key in a given namespace specified by namespace-id", async () => {
|
|
368
|
+
const requests = mockKeyPutRequest("some-namespace-id", {
|
|
369
|
+
key: "my-key",
|
|
370
|
+
value: "my-value",
|
|
371
|
+
});
|
|
372
|
+
|
|
373
|
+
await runWrangler(
|
|
374
|
+
"kv:key put my-key my-value --namespace-id some-namespace-id"
|
|
375
|
+
);
|
|
376
|
+
|
|
377
|
+
expect(requests.count).toEqual(1);
|
|
378
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
379
|
+
`"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id."`
|
|
380
|
+
);
|
|
381
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
382
|
+
});
|
|
383
|
+
|
|
384
|
+
it("should encode the key in the api request to put a value", async () => {
|
|
385
|
+
const requests = mockKeyPutRequest("DS9", {
|
|
386
|
+
key: "%2Fmy-key",
|
|
387
|
+
value: "my-value",
|
|
388
|
+
});
|
|
389
|
+
|
|
390
|
+
await runWrangler("kv:key put /my-key my-value --namespace-id DS9");
|
|
391
|
+
|
|
392
|
+
expect(requests.count).toEqual(1);
|
|
393
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
394
|
+
`"Writing the value \\"my-value\\" to key \\"/my-key\\" on namespace DS9."`
|
|
395
|
+
);
|
|
396
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
397
|
+
});
|
|
398
|
+
|
|
399
|
+
it("should put a key in a given namespace specified by binding", async () => {
|
|
400
|
+
writeWranglerConfig();
|
|
401
|
+
const requests = mockKeyPutRequest("bound-id", {
|
|
402
|
+
key: "my-key",
|
|
403
|
+
value: "my-value",
|
|
404
|
+
});
|
|
405
|
+
await runWrangler(
|
|
406
|
+
"kv:key put my-key my-value --binding someBinding --preview false"
|
|
407
|
+
);
|
|
408
|
+
|
|
409
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
410
|
+
`"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace bound-id."`
|
|
411
|
+
);
|
|
412
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
413
|
+
expect(requests.count).toEqual(1);
|
|
414
|
+
});
|
|
415
|
+
|
|
416
|
+
it("should put a key in a given preview namespace specified by binding", async () => {
|
|
417
|
+
writeWranglerConfig();
|
|
418
|
+
const requests = mockKeyPutRequest("preview-bound-id", {
|
|
419
|
+
key: "my-key",
|
|
420
|
+
value: "my-value",
|
|
421
|
+
});
|
|
422
|
+
|
|
423
|
+
await runWrangler(
|
|
424
|
+
"kv:key put my-key my-value --binding someBinding --preview"
|
|
425
|
+
);
|
|
426
|
+
|
|
427
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
428
|
+
`"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace preview-bound-id."`
|
|
429
|
+
);
|
|
430
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
431
|
+
expect(requests.count).toEqual(1);
|
|
432
|
+
});
|
|
433
|
+
|
|
434
|
+
it("should add expiration and ttl properties when putting a key", async () => {
|
|
435
|
+
const requests = mockKeyPutRequest("some-namespace-id", {
|
|
436
|
+
key: "my-key",
|
|
437
|
+
value: "my-value",
|
|
438
|
+
expiration: 10,
|
|
439
|
+
expiration_ttl: 20,
|
|
440
|
+
});
|
|
441
|
+
await runWrangler(
|
|
442
|
+
"kv:key put my-key my-value --namespace-id some-namespace-id --expiration 10 --ttl 20"
|
|
443
|
+
);
|
|
444
|
+
expect(requests.count).toEqual(1);
|
|
445
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
446
|
+
`"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace some-namespace-id."`
|
|
447
|
+
);
|
|
448
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
449
|
+
});
|
|
450
|
+
|
|
451
|
+
it("should put a key to the specified environment in a given namespace", async () => {
|
|
452
|
+
writeWranglerConfig();
|
|
453
|
+
const requests = mockKeyPutRequest("env-bound-id", {
|
|
454
|
+
key: "my-key",
|
|
455
|
+
value: "my-value",
|
|
456
|
+
});
|
|
457
|
+
await runWrangler(
|
|
458
|
+
"kv:key put my-key my-value --binding someBinding --env some-environment --preview false"
|
|
459
|
+
);
|
|
460
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
461
|
+
`"Writing the value \\"my-value\\" to key \\"my-key\\" on namespace env-bound-id."`
|
|
462
|
+
);
|
|
463
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
464
|
+
expect(requests.count).toEqual(1);
|
|
465
|
+
});
|
|
466
|
+
|
|
467
|
+
it("should put a key with a value loaded from a given path", async () => {
|
|
468
|
+
const buf = Buffer.from("file-contents", "utf-8");
|
|
469
|
+
writeFileSync("foo.txt", buf);
|
|
470
|
+
const requests = mockKeyPutRequest("some-namespace-id", {
|
|
471
|
+
key: "my-key",
|
|
472
|
+
value: buf,
|
|
473
|
+
});
|
|
474
|
+
await runWrangler(
|
|
475
|
+
"kv:key put my-key --namespace-id some-namespace-id --path foo.txt"
|
|
476
|
+
);
|
|
477
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
478
|
+
`"Writing the contents of foo.txt to the key \\"my-key\\" on namespace some-namespace-id."`
|
|
479
|
+
);
|
|
480
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
481
|
+
expect(requests.count).toEqual(1);
|
|
482
|
+
});
|
|
483
|
+
|
|
484
|
+
it("should put a key with a binary value loaded from a given path", async () => {
|
|
485
|
+
const buf = Buffer.from(
|
|
486
|
+
"iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAiSURBVHgB7coxEQAACMPAgH/PgAM6dGwu49fA/deIBXrgAj2cAhIFT4QxAAAAAElFTkSuQmCC",
|
|
487
|
+
"base64"
|
|
488
|
+
);
|
|
489
|
+
writeFileSync("test.png", buf);
|
|
490
|
+
const requests = mockKeyPutRequest("another-namespace-id", {
|
|
491
|
+
key: "my-key",
|
|
492
|
+
value: buf,
|
|
493
|
+
});
|
|
494
|
+
await runWrangler(
|
|
495
|
+
"kv:key put my-key --namespace-id another-namespace-id --path test.png"
|
|
496
|
+
);
|
|
497
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
498
|
+
`"Writing the contents of test.png to the key \\"my-key\\" on namespace another-namespace-id."`
|
|
499
|
+
);
|
|
500
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
501
|
+
expect(requests.count).toEqual(1);
|
|
502
|
+
});
|
|
503
|
+
|
|
504
|
+
it("should put a key with metadata", async () => {
|
|
505
|
+
const requests = mockKeyPutRequest("some-namespace-id", {
|
|
506
|
+
key: "dKey",
|
|
507
|
+
value: "dVal",
|
|
508
|
+
metadata: {
|
|
509
|
+
mKey: "mValue",
|
|
510
|
+
},
|
|
511
|
+
});
|
|
512
|
+
await runWrangler(
|
|
513
|
+
`kv:key put dKey dVal --namespace-id some-namespace-id --metadata {"mKey":"mValue"}`
|
|
514
|
+
);
|
|
515
|
+
expect(requests.count).toEqual(1);
|
|
516
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
517
|
+
`"Writing the value \\"dVal\\" to key \\"dKey\\" on namespace some-namespace-id with metadata \\"{\\"mKey\\":\\"mValue\\"}\\"."`
|
|
518
|
+
);
|
|
519
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
520
|
+
});
|
|
521
|
+
|
|
522
|
+
it("should error if no key is provided", async () => {
|
|
523
|
+
await expect(
|
|
524
|
+
runWrangler("kv:key put")
|
|
525
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
526
|
+
`"Not enough non-option arguments: got 0, need at least 1"`
|
|
527
|
+
);
|
|
528
|
+
|
|
529
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
530
|
+
"
|
|
531
|
+
wrangler kv:key put <key> [value]
|
|
467
532
|
|
|
468
533
|
Writes a single key/value pair to the given namespace.
|
|
469
534
|
|
|
@@ -472,10 +537,9 @@ describe("wrangler", () => {
|
|
|
472
537
|
value The value to write [string]
|
|
473
538
|
|
|
474
539
|
Flags:
|
|
475
|
-
-c, --config
|
|
476
|
-
-h, --help
|
|
477
|
-
-v, --version
|
|
478
|
-
--legacy-env Use legacy environments [boolean]
|
|
540
|
+
-c, --config Path to .toml configuration file [string]
|
|
541
|
+
-h, --help Show help [boolean]
|
|
542
|
+
-v, --version Show version number [boolean]
|
|
479
543
|
|
|
480
544
|
Options:
|
|
481
545
|
--binding The binding of the namespace to write to [string]
|
|
@@ -484,22 +548,26 @@ describe("wrangler", () => {
|
|
|
484
548
|
--preview Interact with a preview namespace [boolean]
|
|
485
549
|
--ttl Time for which the entries should be visible [number]
|
|
486
550
|
--expiration Time since the UNIX epoch after which the entry expires [number]
|
|
487
|
-
--
|
|
551
|
+
--metadata Arbitrary JSON that is associated with a key [string]
|
|
552
|
+
--path Read value from the file at a given path [string]"
|
|
553
|
+
`);
|
|
554
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
555
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mNot enough non-option arguments: got 0, need at least 1[0m
|
|
488
556
|
|
|
489
|
-
|
|
557
|
+
"
|
|
490
558
|
`);
|
|
491
|
-
|
|
559
|
+
});
|
|
492
560
|
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
561
|
+
it("should error if no binding nor namespace is provided", async () => {
|
|
562
|
+
await expect(
|
|
563
|
+
runWrangler("kv:key put foo bar")
|
|
564
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
565
|
+
`"Exactly one of the arguments binding and namespace-id is required"`
|
|
566
|
+
);
|
|
499
567
|
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
568
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
569
|
+
"
|
|
570
|
+
wrangler kv:key put <key> [value]
|
|
503
571
|
|
|
504
572
|
Writes a single key/value pair to the given namespace.
|
|
505
573
|
|
|
@@ -508,10 +576,9 @@ describe("wrangler", () => {
|
|
|
508
576
|
value The value to write [string]
|
|
509
577
|
|
|
510
578
|
Flags:
|
|
511
|
-
-c, --config
|
|
512
|
-
-h, --help
|
|
513
|
-
-v, --version
|
|
514
|
-
--legacy-env Use legacy environments [boolean]
|
|
579
|
+
-c, --config Path to .toml configuration file [string]
|
|
580
|
+
-h, --help Show help [boolean]
|
|
581
|
+
-v, --version Show version number [boolean]
|
|
515
582
|
|
|
516
583
|
Options:
|
|
517
584
|
--binding The binding of the namespace to write to [string]
|
|
@@ -520,22 +587,26 @@ describe("wrangler", () => {
|
|
|
520
587
|
--preview Interact with a preview namespace [boolean]
|
|
521
588
|
--ttl Time for which the entries should be visible [number]
|
|
522
589
|
--expiration Time since the UNIX epoch after which the entry expires [number]
|
|
523
|
-
--
|
|
590
|
+
--metadata Arbitrary JSON that is associated with a key [string]
|
|
591
|
+
--path Read value from the file at a given path [string]"
|
|
592
|
+
`);
|
|
593
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
594
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mExactly one of the arguments binding and namespace-id is required[0m
|
|
524
595
|
|
|
525
|
-
|
|
596
|
+
"
|
|
526
597
|
`);
|
|
527
|
-
|
|
598
|
+
});
|
|
528
599
|
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
600
|
+
it("should error if both binding and namespace is provided", async () => {
|
|
601
|
+
await expect(
|
|
602
|
+
runWrangler("kv:key put foo bar --binding x --namespace-id y")
|
|
603
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
604
|
+
`"Arguments binding and namespace-id are mutually exclusive"`
|
|
605
|
+
);
|
|
535
606
|
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
607
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
608
|
+
"
|
|
609
|
+
wrangler kv:key put <key> [value]
|
|
539
610
|
|
|
540
611
|
Writes a single key/value pair to the given namespace.
|
|
541
612
|
|
|
@@ -544,10 +615,9 @@ describe("wrangler", () => {
|
|
|
544
615
|
value The value to write [string]
|
|
545
616
|
|
|
546
617
|
Flags:
|
|
547
|
-
-c, --config
|
|
548
|
-
-h, --help
|
|
549
|
-
-v, --version
|
|
550
|
-
--legacy-env Use legacy environments [boolean]
|
|
618
|
+
-c, --config Path to .toml configuration file [string]
|
|
619
|
+
-h, --help Show help [boolean]
|
|
620
|
+
-v, --version Show version number [boolean]
|
|
551
621
|
|
|
552
622
|
Options:
|
|
553
623
|
--binding The binding of the namespace to write to [string]
|
|
@@ -556,22 +626,26 @@ describe("wrangler", () => {
|
|
|
556
626
|
--preview Interact with a preview namespace [boolean]
|
|
557
627
|
--ttl Time for which the entries should be visible [number]
|
|
558
628
|
--expiration Time since the UNIX epoch after which the entry expires [number]
|
|
559
|
-
--
|
|
629
|
+
--metadata Arbitrary JSON that is associated with a key [string]
|
|
630
|
+
--path Read value from the file at a given path [string]"
|
|
631
|
+
`);
|
|
632
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
633
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mArguments binding and namespace-id are mutually exclusive[0m
|
|
560
634
|
|
|
561
|
-
|
|
635
|
+
"
|
|
562
636
|
`);
|
|
563
|
-
|
|
637
|
+
});
|
|
564
638
|
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
639
|
+
it("should error if no value nor path is provided", async () => {
|
|
640
|
+
await expect(
|
|
641
|
+
runWrangler("kv:key put key --namespace-id 12345")
|
|
642
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
643
|
+
`"Exactly one of the arguments value and path is required"`
|
|
644
|
+
);
|
|
571
645
|
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
646
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
647
|
+
"
|
|
648
|
+
wrangler kv:key put <key> [value]
|
|
575
649
|
|
|
576
650
|
Writes a single key/value pair to the given namespace.
|
|
577
651
|
|
|
@@ -580,10 +654,9 @@ describe("wrangler", () => {
|
|
|
580
654
|
value The value to write [string]
|
|
581
655
|
|
|
582
656
|
Flags:
|
|
583
|
-
-c, --config
|
|
584
|
-
-h, --help
|
|
585
|
-
-v, --version
|
|
586
|
-
--legacy-env Use legacy environments [boolean]
|
|
657
|
+
-c, --config Path to .toml configuration file [string]
|
|
658
|
+
-h, --help Show help [boolean]
|
|
659
|
+
-v, --version Show version number [boolean]
|
|
587
660
|
|
|
588
661
|
Options:
|
|
589
662
|
--binding The binding of the namespace to write to [string]
|
|
@@ -592,22 +665,26 @@ describe("wrangler", () => {
|
|
|
592
665
|
--preview Interact with a preview namespace [boolean]
|
|
593
666
|
--ttl Time for which the entries should be visible [number]
|
|
594
667
|
--expiration Time since the UNIX epoch after which the entry expires [number]
|
|
595
|
-
--
|
|
668
|
+
--metadata Arbitrary JSON that is associated with a key [string]
|
|
669
|
+
--path Read value from the file at a given path [string]"
|
|
670
|
+
`);
|
|
671
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
672
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mExactly one of the arguments value and path is required[0m
|
|
596
673
|
|
|
597
|
-
|
|
674
|
+
"
|
|
598
675
|
`);
|
|
599
|
-
|
|
676
|
+
});
|
|
600
677
|
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
678
|
+
it("should error if both value and path is provided", async () => {
|
|
679
|
+
await expect(
|
|
680
|
+
runWrangler("kv:key put key value --path xyz --namespace-id 12345")
|
|
681
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
682
|
+
`"Arguments value and path are mutually exclusive"`
|
|
683
|
+
);
|
|
607
684
|
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
685
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
686
|
+
"
|
|
687
|
+
wrangler kv:key put <key> [value]
|
|
611
688
|
|
|
612
689
|
Writes a single key/value pair to the given namespace.
|
|
613
690
|
|
|
@@ -616,10 +693,9 @@ describe("wrangler", () => {
|
|
|
616
693
|
value The value to write [string]
|
|
617
694
|
|
|
618
695
|
Flags:
|
|
619
|
-
-c, --config
|
|
620
|
-
-h, --help
|
|
621
|
-
-v, --version
|
|
622
|
-
--legacy-env Use legacy environments [boolean]
|
|
696
|
+
-c, --config Path to .toml configuration file [string]
|
|
697
|
+
-h, --help Show help [boolean]
|
|
698
|
+
-v, --version Show version number [boolean]
|
|
623
699
|
|
|
624
700
|
Options:
|
|
625
701
|
--binding The binding of the namespace to write to [string]
|
|
@@ -628,60 +704,70 @@ describe("wrangler", () => {
|
|
|
628
704
|
--preview Interact with a preview namespace [boolean]
|
|
629
705
|
--ttl Time for which the entries should be visible [number]
|
|
630
706
|
--expiration Time since the UNIX epoch after which the entry expires [number]
|
|
631
|
-
--
|
|
632
|
-
|
|
633
|
-
Arguments value and path are mutually exclusive"
|
|
707
|
+
--metadata Arbitrary JSON that is associated with a key [string]
|
|
708
|
+
--path Read value from the file at a given path [string]"
|
|
634
709
|
`);
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
638
|
-
writeWranglerConfig();
|
|
639
|
-
await expect(
|
|
640
|
-
runWrangler("kv:key put key value --binding otherBinding")
|
|
641
|
-
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
642
|
-
`"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
|
|
643
|
-
);
|
|
710
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
711
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mArguments value and path are mutually exclusive[0m
|
|
644
712
|
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
713
|
+
"
|
|
714
|
+
`);
|
|
715
|
+
});
|
|
716
|
+
|
|
717
|
+
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
718
|
+
writeWranglerConfig();
|
|
719
|
+
await expect(
|
|
720
|
+
runWrangler("kv:key put key value --binding otherBinding")
|
|
721
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
722
|
+
`"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
|
|
723
|
+
);
|
|
724
|
+
|
|
725
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
726
|
+
"
|
|
727
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
728
|
+
`);
|
|
729
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
730
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mA namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".[0m
|
|
648
731
|
|
|
649
|
-
|
|
732
|
+
"
|
|
733
|
+
`);
|
|
734
|
+
});
|
|
735
|
+
|
|
736
|
+
it("should error if a given binding has both preview and non-preview and --preview is not specified", async () => {
|
|
737
|
+
writeWranglerConfig();
|
|
738
|
+
const requests = mockKeyPutRequest("preview-bound-id", {
|
|
739
|
+
key: "my-key",
|
|
740
|
+
value: "my-value",
|
|
741
|
+
});
|
|
742
|
+
await expect(
|
|
743
|
+
runWrangler("kv:key put my-key my-value --binding someBinding")
|
|
744
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
745
|
+
`"someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace."`
|
|
746
|
+
);
|
|
747
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
748
|
+
"
|
|
749
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
650
750
|
`);
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
const requests = mockKeyPutRequest("preview-bound-id", {
|
|
656
|
-
key: "my-key",
|
|
657
|
-
value: "my-value",
|
|
658
|
-
});
|
|
659
|
-
await expect(
|
|
660
|
-
runWrangler("kv:key put my-key my-value --binding someBinding")
|
|
661
|
-
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
662
|
-
`"someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace."`
|
|
663
|
-
);
|
|
664
|
-
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
665
|
-
expect(std.err).toMatchInlineSnapshot(`
|
|
666
|
-
"someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
|
|
667
|
-
|
|
668
|
-
[32m%s[0m If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
|
|
751
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
752
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1msomeBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.[0m
|
|
753
|
+
|
|
754
|
+
"
|
|
669
755
|
`);
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
756
|
+
expect(requests.count).toEqual(0);
|
|
757
|
+
});
|
|
758
|
+
});
|
|
759
|
+
|
|
760
|
+
describe("list", () => {
|
|
761
|
+
it("should list the keys of a namespace specified by namespace-id", async () => {
|
|
762
|
+
const keys = [
|
|
763
|
+
{ name: "key-1" },
|
|
764
|
+
{ name: "key-2", expiration: 123456789 },
|
|
765
|
+
{ name: "key-3", expiration_ttl: 666 },
|
|
766
|
+
];
|
|
767
|
+
mockKeyListRequest("some-namespace-id", keys);
|
|
768
|
+
await runWrangler("kv:key list --namespace-id some-namespace-id");
|
|
769
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
770
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
685
771
|
"[
|
|
686
772
|
{
|
|
687
773
|
\\"name\\": \\"key-1\\"
|
|
@@ -696,16 +782,16 @@ describe("wrangler", () => {
|
|
|
696
782
|
}
|
|
697
783
|
]"
|
|
698
784
|
`);
|
|
699
|
-
|
|
785
|
+
});
|
|
700
786
|
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
787
|
+
it("should list the keys of a namespace specified by binding", async () => {
|
|
788
|
+
writeWranglerConfig();
|
|
789
|
+
const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
|
|
790
|
+
mockKeyListRequest("bound-id", keys);
|
|
705
791
|
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
792
|
+
await runWrangler("kv:key list --binding someBinding");
|
|
793
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
794
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
709
795
|
"[
|
|
710
796
|
{
|
|
711
797
|
\\"name\\": \\"key-1\\"
|
|
@@ -718,15 +804,15 @@ describe("wrangler", () => {
|
|
|
718
804
|
}
|
|
719
805
|
]"
|
|
720
806
|
`);
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
807
|
+
});
|
|
808
|
+
|
|
809
|
+
it("should list the keys of a preview namespace specified by binding", async () => {
|
|
810
|
+
writeWranglerConfig();
|
|
811
|
+
const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
|
|
812
|
+
mockKeyListRequest("preview-bound-id", keys);
|
|
813
|
+
await runWrangler("kv:key list --binding someBinding --preview");
|
|
814
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
815
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
730
816
|
"[
|
|
731
817
|
{
|
|
732
818
|
\\"name\\": \\"key-1\\"
|
|
@@ -739,17 +825,17 @@ describe("wrangler", () => {
|
|
|
739
825
|
}
|
|
740
826
|
]"
|
|
741
827
|
`);
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
828
|
+
});
|
|
829
|
+
|
|
830
|
+
it("should list the keys of a namespace specified by binding, in a given environment", async () => {
|
|
831
|
+
writeWranglerConfig();
|
|
832
|
+
const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
|
|
833
|
+
mockKeyListRequest("env-bound-id", keys);
|
|
834
|
+
await runWrangler(
|
|
835
|
+
"kv:key list --binding someBinding --env some-environment"
|
|
836
|
+
);
|
|
837
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
838
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
753
839
|
"[
|
|
754
840
|
{
|
|
755
841
|
\\"name\\": \\"key-1\\"
|
|
@@ -762,17 +848,17 @@ describe("wrangler", () => {
|
|
|
762
848
|
}
|
|
763
849
|
]"
|
|
764
850
|
`);
|
|
765
|
-
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
851
|
+
});
|
|
852
|
+
|
|
853
|
+
it("should list the keys of a preview namespace specified by binding, in a given environment", async () => {
|
|
854
|
+
writeWranglerConfig();
|
|
855
|
+
const keys = [{ name: "key-1" }, { name: "key-2" }, { name: "key-3" }];
|
|
856
|
+
mockKeyListRequest("preview-env-bound-id", keys);
|
|
857
|
+
await runWrangler(
|
|
858
|
+
"kv:key list --binding someBinding --preview --env some-environment"
|
|
859
|
+
);
|
|
860
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
861
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
776
862
|
"[
|
|
777
863
|
{
|
|
778
864
|
\\"name\\": \\"key-1\\"
|
|
@@ -785,125 +871,197 @@ describe("wrangler", () => {
|
|
|
785
871
|
}
|
|
786
872
|
]"
|
|
787
873
|
`);
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
805
|
-
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
"
|
|
831
|
-
|
|
832
|
-
|
|
874
|
+
});
|
|
875
|
+
|
|
876
|
+
// We'll run the next test with variations on the cursor
|
|
877
|
+
// that's returned on cloudflare's API after all results
|
|
878
|
+
// have been drained.
|
|
879
|
+
for (const blankCursorValue of [undefined, null, ""] as [
|
|
880
|
+
undefined,
|
|
881
|
+
null,
|
|
882
|
+
""
|
|
883
|
+
]) {
|
|
884
|
+
describe(`cursor - ${blankCursorValue}`, () => {
|
|
885
|
+
it("should make multiple requests for paginated results", async () => {
|
|
886
|
+
// Create a lot of mock keys, so that the fetch requests will be paginated
|
|
887
|
+
const keys: NamespaceKeyInfo[] = [];
|
|
888
|
+
for (let i = 0; i < 550; i++) {
|
|
889
|
+
keys.push({ name: "key-" + i });
|
|
890
|
+
}
|
|
891
|
+
// Ask for the keys in pages of size 100.
|
|
892
|
+
const requests = mockKeyListRequest(
|
|
893
|
+
"some-namespace-id",
|
|
894
|
+
keys,
|
|
895
|
+
100,
|
|
896
|
+
blankCursorValue
|
|
897
|
+
);
|
|
898
|
+
await runWrangler("kv:key list --namespace-id some-namespace-id");
|
|
899
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
900
|
+
expect(JSON.parse(std.out)).toEqual(keys);
|
|
901
|
+
expect(requests.count).toEqual(6);
|
|
902
|
+
});
|
|
903
|
+
});
|
|
904
|
+
}
|
|
905
|
+
|
|
906
|
+
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
907
|
+
writeWranglerConfig();
|
|
908
|
+
await expect(
|
|
909
|
+
runWrangler("kv:key list --binding otherBinding")
|
|
910
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
911
|
+
`"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
|
|
912
|
+
);
|
|
913
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
914
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mA namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".[0m
|
|
915
|
+
|
|
916
|
+
"
|
|
917
|
+
`);
|
|
918
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
919
|
+
"
|
|
920
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
833
921
|
`);
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
862
|
-
|
|
863
|
-
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
|
|
867
|
-
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
|
|
871
|
-
|
|
872
|
-
|
|
873
|
-
|
|
874
|
-
|
|
875
|
-
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
|
|
886
|
-
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
892
|
-
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
903
|
-
|
|
904
|
-
|
|
905
|
-
|
|
906
|
-
|
|
922
|
+
});
|
|
923
|
+
});
|
|
924
|
+
|
|
925
|
+
describe("get", () => {
|
|
926
|
+
afterEach(() => {
|
|
927
|
+
unsetSpecialMockFns();
|
|
928
|
+
});
|
|
929
|
+
|
|
930
|
+
it("should get a key in a given namespace specified by namespace-id", async () => {
|
|
931
|
+
setMockFetchKVGetValue(
|
|
932
|
+
"some-account-id",
|
|
933
|
+
"some-namespace-id",
|
|
934
|
+
"my-key",
|
|
935
|
+
"my-value"
|
|
936
|
+
);
|
|
937
|
+
await runWrangler("kv:key get my-key --namespace-id some-namespace-id");
|
|
938
|
+
expect(proc.write).toEqual(Buffer.from("my-value"));
|
|
939
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
940
|
+
});
|
|
941
|
+
|
|
942
|
+
it("should get a key and decode the value from the response as a utf8 string if the `--text` flag is passed", async () => {
|
|
943
|
+
setMockFetchKVGetValue(
|
|
944
|
+
"some-account-id",
|
|
945
|
+
"some-namespace-id",
|
|
946
|
+
"my-key",
|
|
947
|
+
"my-value"
|
|
948
|
+
);
|
|
949
|
+
await runWrangler(
|
|
950
|
+
"kv:key get my-key --text --namespace-id some-namespace-id"
|
|
951
|
+
);
|
|
952
|
+
expect(proc.write).not.toEqual(Buffer.from("my-value"));
|
|
953
|
+
expect(std).toMatchInlineSnapshot(`
|
|
954
|
+
Object {
|
|
955
|
+
"debug": "",
|
|
956
|
+
"err": "",
|
|
957
|
+
"out": "my-value",
|
|
958
|
+
"warn": "",
|
|
959
|
+
}
|
|
960
|
+
`);
|
|
961
|
+
});
|
|
962
|
+
|
|
963
|
+
it("should get a binary and decode as utf8 text, resulting in improper decoding", async () => {
|
|
964
|
+
const buf = Buffer.from(
|
|
965
|
+
"iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAiSURBVHgB7coxEQAACMPAgH/PgAM6dGwu49fA/deIBXrgAj2cAhIFT4QxAAAAAElFTkSuQmCC",
|
|
966
|
+
"base64"
|
|
967
|
+
);
|
|
968
|
+
setMockFetchKVGetValue(
|
|
969
|
+
"some-account-id",
|
|
970
|
+
"some-namespace-id",
|
|
971
|
+
"my-key",
|
|
972
|
+
buf
|
|
973
|
+
);
|
|
974
|
+
await runWrangler(
|
|
975
|
+
"kv:key get my-key --text --namespace-id some-namespace-id"
|
|
976
|
+
);
|
|
977
|
+
expect(proc.write).not.toEqual(buf);
|
|
978
|
+
expect(JSON.stringify(std)).toMatchInlineSnapshot(
|
|
979
|
+
`"{\\"debug\\":\\"\\",\\"out\\":\\"�PNG\\\\n\\\\u001a\\\\n\\\\u0000\\\\u0000\\\\u0000\\\\rIHDR\\\\u0000\\\\u0000\\\\u0000\\\\n\\\\u0000\\\\u0000\\\\u0000\\\\n\\\\b\\\\u0006\\\\u0000\\\\u0000\\\\u0000�2Ͻ\\\\u0000\\\\u0000\\\\u0000\\\\tpHYs\\\\u0000\\\\u0000\\\\u000b\\\\u0013\\\\u0000\\\\u0000\\\\u000b\\\\u0013\\\\u0001\\\\u0000��\\\\u0018\\\\u0000\\\\u0000\\\\u0000\\\\u0001sRGB\\\\u0000��\\\\u001c�\\\\u0000\\\\u0000\\\\u0000\\\\u0004gAMA\\\\u0000\\\\u0000��\\\\u000b�a\\\\u0005\\\\u0000\\\\u0000\\\\u0000\\\\\\"IDATx\\\\u0001��1\\\\u0011\\\\u0000\\\\u0000\\\\b���π\\\\u0003:tl.����\\\\u0005z�\\\\u0002=�\\\\u0002\\\\u0012\\\\u0005O�1\\\\u0000\\\\u0000\\\\u0000\\\\u0000IEND�B\`�\\",\\"err\\":\\"\\",\\"warn\\":\\"\\"}"`
|
|
980
|
+
);
|
|
981
|
+
});
|
|
982
|
+
|
|
983
|
+
it("should get a binary file by key in a given namespace specified by namespace-id", async () => {
|
|
984
|
+
const buf = Buffer.from(
|
|
985
|
+
"iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAiSURBVHgB7coxEQAACMPAgH/PgAM6dGwu49fA/deIBXrgAj2cAhIFT4QxAAAAAElFTkSuQmCC",
|
|
986
|
+
"base64"
|
|
987
|
+
);
|
|
988
|
+
setMockFetchKVGetValue(
|
|
989
|
+
"some-account-id",
|
|
990
|
+
"some-namespace-id",
|
|
991
|
+
"my-key",
|
|
992
|
+
buf
|
|
993
|
+
);
|
|
994
|
+
await runWrangler("kv:key get my-key --namespace-id some-namespace-id");
|
|
995
|
+
expect(proc.write).toEqual(buf);
|
|
996
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
997
|
+
});
|
|
998
|
+
|
|
999
|
+
it("should get a key in a given namespace specified by binding", async () => {
|
|
1000
|
+
writeWranglerConfig();
|
|
1001
|
+
setMockFetchKVGetValue(
|
|
1002
|
+
"some-account-id",
|
|
1003
|
+
"bound-id",
|
|
1004
|
+
"my-key",
|
|
1005
|
+
"my-value"
|
|
1006
|
+
);
|
|
1007
|
+
await runWrangler(
|
|
1008
|
+
"kv:key get my-key --binding someBinding --preview false"
|
|
1009
|
+
);
|
|
1010
|
+
expect(proc.write).toEqual(Buffer.from("my-value"));
|
|
1011
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1012
|
+
});
|
|
1013
|
+
|
|
1014
|
+
it("should get a key in a given preview namespace specified by binding", async () => {
|
|
1015
|
+
writeWranglerConfig();
|
|
1016
|
+
setMockFetchKVGetValue(
|
|
1017
|
+
"some-account-id",
|
|
1018
|
+
"preview-bound-id",
|
|
1019
|
+
"my-key",
|
|
1020
|
+
"my-value"
|
|
1021
|
+
);
|
|
1022
|
+
await runWrangler("kv:key get my-key --binding someBinding --preview");
|
|
1023
|
+
expect(proc.write).toEqual(Buffer.from("my-value"));
|
|
1024
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1025
|
+
});
|
|
1026
|
+
|
|
1027
|
+
it("should get a key for the specified environment in a given namespace", async () => {
|
|
1028
|
+
writeWranglerConfig();
|
|
1029
|
+
setMockFetchKVGetValue(
|
|
1030
|
+
"some-account-id",
|
|
1031
|
+
"env-bound-id",
|
|
1032
|
+
"my-key",
|
|
1033
|
+
"my-value"
|
|
1034
|
+
);
|
|
1035
|
+
await runWrangler(
|
|
1036
|
+
"kv:key get my-key --binding someBinding --env some-environment --preview false"
|
|
1037
|
+
);
|
|
1038
|
+
expect(proc.write).toEqual(Buffer.from("my-value"));
|
|
1039
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1040
|
+
});
|
|
1041
|
+
|
|
1042
|
+
it("should encode the key in the api request to get a value", async () => {
|
|
1043
|
+
setMockFetchKVGetValue(
|
|
1044
|
+
"some-account-id",
|
|
1045
|
+
"some-namespace-id",
|
|
1046
|
+
"%2Fmy%2Ckey",
|
|
1047
|
+
"my-value"
|
|
1048
|
+
);
|
|
1049
|
+
await runWrangler(
|
|
1050
|
+
"kv:key get /my,key --namespace-id some-namespace-id"
|
|
1051
|
+
);
|
|
1052
|
+
expect(proc.write).toEqual(Buffer.from("my-value"));
|
|
1053
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1054
|
+
});
|
|
1055
|
+
|
|
1056
|
+
it("should error if no key is provided", async () => {
|
|
1057
|
+
await expect(
|
|
1058
|
+
runWrangler("kv:key get")
|
|
1059
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
1060
|
+
`"Not enough non-option arguments: got 0, need at least 1"`
|
|
1061
|
+
);
|
|
1062
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1063
|
+
"
|
|
1064
|
+
wrangler kv:key get <key>
|
|
907
1065
|
|
|
908
1066
|
Reads a single value by key from the given namespace.
|
|
909
1067
|
|
|
@@ -911,30 +1069,33 @@ describe("wrangler", () => {
|
|
|
911
1069
|
key The key value to get. [string] [required]
|
|
912
1070
|
|
|
913
1071
|
Flags:
|
|
914
|
-
-c, --config
|
|
915
|
-
-h, --help
|
|
916
|
-
-v, --version
|
|
917
|
-
--legacy-env Use legacy environments [boolean]
|
|
1072
|
+
-c, --config Path to .toml configuration file [string]
|
|
1073
|
+
-h, --help Show help [boolean]
|
|
1074
|
+
-v, --version Show version number [boolean]
|
|
918
1075
|
|
|
919
1076
|
Options:
|
|
920
1077
|
--binding The name of the namespace to get from [string]
|
|
921
1078
|
--namespace-id The id of the namespace to get from [string]
|
|
922
1079
|
-e, --env Perform on a specific environment [string]
|
|
923
1080
|
--preview Interact with a preview namespace [boolean] [default: false]
|
|
1081
|
+
--text Decode the returned value as a utf8 string [boolean] [default: false]"
|
|
1082
|
+
`);
|
|
1083
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
1084
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mNot enough non-option arguments: got 0, need at least 1[0m
|
|
924
1085
|
|
|
925
|
-
|
|
1086
|
+
"
|
|
926
1087
|
`);
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
|
|
1088
|
+
});
|
|
1089
|
+
|
|
1090
|
+
it("should error if no binding nor namespace is provided", async () => {
|
|
1091
|
+
await expect(
|
|
1092
|
+
runWrangler("kv:key get foo")
|
|
1093
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
1094
|
+
`"Exactly one of the arguments binding and namespace-id is required"`
|
|
1095
|
+
);
|
|
1096
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1097
|
+
"
|
|
1098
|
+
wrangler kv:key get <key>
|
|
938
1099
|
|
|
939
1100
|
Reads a single value by key from the given namespace.
|
|
940
1101
|
|
|
@@ -942,31 +1103,34 @@ describe("wrangler", () => {
|
|
|
942
1103
|
key The key value to get. [string] [required]
|
|
943
1104
|
|
|
944
1105
|
Flags:
|
|
945
|
-
-c, --config
|
|
946
|
-
-h, --help
|
|
947
|
-
-v, --version
|
|
948
|
-
--legacy-env Use legacy environments [boolean]
|
|
1106
|
+
-c, --config Path to .toml configuration file [string]
|
|
1107
|
+
-h, --help Show help [boolean]
|
|
1108
|
+
-v, --version Show version number [boolean]
|
|
949
1109
|
|
|
950
1110
|
Options:
|
|
951
1111
|
--binding The name of the namespace to get from [string]
|
|
952
1112
|
--namespace-id The id of the namespace to get from [string]
|
|
953
1113
|
-e, --env Perform on a specific environment [string]
|
|
954
1114
|
--preview Interact with a preview namespace [boolean] [default: false]
|
|
1115
|
+
--text Decode the returned value as a utf8 string [boolean] [default: false]"
|
|
1116
|
+
`);
|
|
1117
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
1118
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mExactly one of the arguments binding and namespace-id is required[0m
|
|
955
1119
|
|
|
956
|
-
|
|
1120
|
+
"
|
|
957
1121
|
`);
|
|
958
|
-
|
|
1122
|
+
});
|
|
959
1123
|
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
1124
|
+
it("should error if both binding and namespace is provided", async () => {
|
|
1125
|
+
await expect(
|
|
1126
|
+
runWrangler("kv:key get foo --binding x --namespace-id y")
|
|
1127
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
1128
|
+
`"Arguments binding and namespace-id are mutually exclusive"`
|
|
1129
|
+
);
|
|
966
1130
|
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
1131
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1132
|
+
"
|
|
1133
|
+
wrangler kv:key get <key>
|
|
970
1134
|
|
|
971
1135
|
Reads a single value by key from the given namespace.
|
|
972
1136
|
|
|
@@ -974,409 +1138,534 @@ describe("wrangler", () => {
|
|
|
974
1138
|
key The key value to get. [string] [required]
|
|
975
1139
|
|
|
976
1140
|
Flags:
|
|
977
|
-
-c, --config
|
|
978
|
-
-h, --help
|
|
979
|
-
-v, --version
|
|
980
|
-
--legacy-env Use legacy environments [boolean]
|
|
1141
|
+
-c, --config Path to .toml configuration file [string]
|
|
1142
|
+
-h, --help Show help [boolean]
|
|
1143
|
+
-v, --version Show version number [boolean]
|
|
981
1144
|
|
|
982
1145
|
Options:
|
|
983
1146
|
--binding The name of the namespace to get from [string]
|
|
984
1147
|
--namespace-id The id of the namespace to get from [string]
|
|
985
1148
|
-e, --env Perform on a specific environment [string]
|
|
986
1149
|
--preview Interact with a preview namespace [boolean] [default: false]
|
|
1150
|
+
--text Decode the returned value as a utf8 string [boolean] [default: false]"
|
|
1151
|
+
`);
|
|
1152
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
1153
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mArguments binding and namespace-id are mutually exclusive[0m
|
|
987
1154
|
|
|
988
|
-
|
|
1155
|
+
"
|
|
989
1156
|
`);
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
[32m%s[0m If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
|
|
1157
|
+
});
|
|
1158
|
+
|
|
1159
|
+
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
1160
|
+
writeWranglerConfig();
|
|
1161
|
+
await expect(
|
|
1162
|
+
runWrangler("kv:key get key --binding otherBinding")
|
|
1163
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
1164
|
+
`"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
|
|
1165
|
+
);
|
|
1166
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1167
|
+
"
|
|
1168
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
1004
1169
|
`);
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
function mockDeleteRequest(
|
|
1010
|
-
expectedNamespaceId: string,
|
|
1011
|
-
expectedKey: string
|
|
1012
|
-
) {
|
|
1013
|
-
const requests = { count: 0 };
|
|
1014
|
-
setMockResponse(
|
|
1015
|
-
"/accounts/:accountId/storage/kv/namespaces/:namespaceId/values/:key",
|
|
1016
|
-
"DELETE",
|
|
1017
|
-
([_url, accountId, namespaceId, key]) => {
|
|
1018
|
-
requests.count++;
|
|
1019
|
-
expect(accountId).toEqual("some-account-id");
|
|
1020
|
-
expect(namespaceId).toEqual(expectedNamespaceId);
|
|
1021
|
-
expect(key).toEqual(expectedKey);
|
|
1022
|
-
return null;
|
|
1023
|
-
}
|
|
1024
|
-
);
|
|
1025
|
-
return requests;
|
|
1026
|
-
}
|
|
1027
|
-
|
|
1028
|
-
it("should delete a key in a namespace specified by id", async () => {
|
|
1029
|
-
const requests = mockDeleteRequest("some-namespace-id", "someKey");
|
|
1030
|
-
await runWrangler(
|
|
1031
|
-
`kv:key delete --namespace-id some-namespace-id someKey`
|
|
1032
|
-
);
|
|
1033
|
-
expect(requests.count).toEqual(1);
|
|
1034
|
-
});
|
|
1035
|
-
|
|
1036
|
-
it("should delete a key in a namespace specified by binding name", async () => {
|
|
1037
|
-
writeWranglerConfig();
|
|
1038
|
-
const requests = mockDeleteRequest("bound-id", "someKey");
|
|
1039
|
-
await runWrangler(
|
|
1040
|
-
`kv:key delete --binding someBinding --preview false someKey`
|
|
1041
|
-
);
|
|
1042
|
-
expect(requests.count).toEqual(1);
|
|
1043
|
-
});
|
|
1044
|
-
|
|
1045
|
-
it("should delete a key in a preview namespace specified by binding name", async () => {
|
|
1046
|
-
writeWranglerConfig();
|
|
1047
|
-
const requests = mockDeleteRequest("preview-bound-id", "someKey");
|
|
1048
|
-
await runWrangler(
|
|
1049
|
-
`kv:key delete --binding someBinding --preview someKey`
|
|
1050
|
-
);
|
|
1051
|
-
expect(requests.count).toEqual(1);
|
|
1052
|
-
});
|
|
1053
|
-
|
|
1054
|
-
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
1055
|
-
writeWranglerConfig();
|
|
1056
|
-
await expect(
|
|
1057
|
-
runWrangler(`kv:key delete --binding otherBinding someKey`)
|
|
1058
|
-
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
1059
|
-
`"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
|
|
1060
|
-
);
|
|
1061
|
-
|
|
1062
|
-
expect(std.err).toMatchInlineSnapshot(`
|
|
1063
|
-
"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
|
|
1064
|
-
|
|
1065
|
-
[32m%s[0m If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
|
|
1170
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
1171
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mA namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".[0m
|
|
1172
|
+
|
|
1173
|
+
"
|
|
1066
1174
|
`);
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1073
|
-
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1102
|
-
|
|
1103
|
-
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
|
|
1111
|
-
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
|
|
1124
|
-
|
|
1125
|
-
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
|
|
1147
|
-
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1175
|
+
});
|
|
1176
|
+
|
|
1177
|
+
describe("non-interactive", () => {
|
|
1178
|
+
const { setIsTTY } = useMockIsTTY();
|
|
1179
|
+
mockAccountId({ accountId: null });
|
|
1180
|
+
|
|
1181
|
+
it("should error if there are multiple accounts available but not interactive on stdin", async () => {
|
|
1182
|
+
mockGetMemberships([
|
|
1183
|
+
{ id: "xxx", account: { id: "1", name: "one" } },
|
|
1184
|
+
{ id: "yyy", account: { id: "2", name: "two" } },
|
|
1185
|
+
]);
|
|
1186
|
+
setIsTTY({ stdin: false, stdout: true });
|
|
1187
|
+
await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
|
|
1188
|
+
.rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1189
|
+
"More than one account available but unable to select one in non-interactive mode.
|
|
1190
|
+
Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
|
|
1191
|
+
Available accounts are (\\"<name>\\" - \\"<id>\\"):
|
|
1192
|
+
\\"one\\" - \\"1\\")
|
|
1193
|
+
\\"two\\" - \\"2\\")"
|
|
1194
|
+
`);
|
|
1195
|
+
});
|
|
1196
|
+
|
|
1197
|
+
it("should error if there are multiple accounts available but not interactive on stdout", async () => {
|
|
1198
|
+
mockGetMemberships([
|
|
1199
|
+
{ id: "xxx", account: { id: "1", name: "one" } },
|
|
1200
|
+
{ id: "yyy", account: { id: "2", name: "two" } },
|
|
1201
|
+
]);
|
|
1202
|
+
setIsTTY({ stdin: true, stdout: false });
|
|
1203
|
+
await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
|
|
1204
|
+
.rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1205
|
+
"More than one account available but unable to select one in non-interactive mode.
|
|
1206
|
+
Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
|
|
1207
|
+
Available accounts are (\\"<name>\\" - \\"<id>\\"):
|
|
1208
|
+
\\"one\\" - \\"1\\")
|
|
1209
|
+
\\"two\\" - \\"2\\")"
|
|
1210
|
+
`);
|
|
1211
|
+
});
|
|
1212
|
+
|
|
1213
|
+
it("should recommend using a configuration if unable to fetch memberships", async () => {
|
|
1214
|
+
setMockRawResponse("/memberships", () => {
|
|
1215
|
+
return createFetchResult(undefined, false, [
|
|
1216
|
+
{
|
|
1217
|
+
code: 9109,
|
|
1218
|
+
message: "Uauthorized to access requested resource",
|
|
1219
|
+
},
|
|
1220
|
+
]);
|
|
1221
|
+
});
|
|
1222
|
+
await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
|
|
1223
|
+
.rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1224
|
+
"Failed to automatically retrieve account IDs for the logged in user.
|
|
1225
|
+
You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your \`wrangler.toml\`, or by setting the value of CLOUDFLARE_ACCOUNT_ID\\""
|
|
1226
|
+
`);
|
|
1227
|
+
});
|
|
1228
|
+
|
|
1229
|
+
it("should error if there are multiple accounts available but not interactive at all", async () => {
|
|
1230
|
+
mockGetMemberships([
|
|
1231
|
+
{ id: "xxx", account: { id: "1", name: "one" } },
|
|
1232
|
+
{ id: "yyy", account: { id: "2", name: "two" } },
|
|
1233
|
+
]);
|
|
1234
|
+
setIsTTY(false);
|
|
1235
|
+
await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
|
|
1236
|
+
.rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1237
|
+
"More than one account available but unable to select one in non-interactive mode.
|
|
1238
|
+
Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
|
|
1239
|
+
Available accounts are (\\"<name>\\" - \\"<id>\\"):
|
|
1240
|
+
\\"one\\" - \\"1\\")
|
|
1241
|
+
\\"two\\" - \\"2\\")"
|
|
1242
|
+
`);
|
|
1243
|
+
});
|
|
1244
|
+
});
|
|
1245
|
+
});
|
|
1246
|
+
|
|
1247
|
+
describe("delete", () => {
|
|
1248
|
+
function mockDeleteRequest(
|
|
1249
|
+
expectedNamespaceId: string,
|
|
1250
|
+
expectedKey: string
|
|
1251
|
+
) {
|
|
1252
|
+
const requests = { count: 0 };
|
|
1253
|
+
setMockResponse(
|
|
1254
|
+
"/accounts/:accountId/storage/kv/namespaces/:namespaceId/values/:key",
|
|
1255
|
+
"DELETE",
|
|
1256
|
+
([_url, accountId, namespaceId, key]) => {
|
|
1257
|
+
requests.count++;
|
|
1258
|
+
expect(accountId).toEqual("some-account-id");
|
|
1259
|
+
expect(namespaceId).toEqual(expectedNamespaceId);
|
|
1260
|
+
expect(key).toEqual(expectedKey);
|
|
1261
|
+
return null;
|
|
1262
|
+
}
|
|
1263
|
+
);
|
|
1264
|
+
return requests;
|
|
1265
|
+
}
|
|
1266
|
+
|
|
1267
|
+
it("should delete a key in a namespace specified by id", async () => {
|
|
1268
|
+
const requests = mockDeleteRequest("some-namespace-id", "someKey");
|
|
1269
|
+
await runWrangler(
|
|
1270
|
+
`kv:key delete --namespace-id some-namespace-id someKey`
|
|
1271
|
+
);
|
|
1272
|
+
expect(requests.count).toEqual(1);
|
|
1273
|
+
});
|
|
1274
|
+
|
|
1275
|
+
it("should encode the key in the api request to delete a value", async () => {
|
|
1276
|
+
const requests = mockDeleteRequest("voyager", "%2FNCC-74656");
|
|
1277
|
+
await runWrangler(`kv:key delete --namespace-id voyager /NCC-74656`);
|
|
1278
|
+
expect(requests.count).toEqual(1);
|
|
1279
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
1280
|
+
`"Deleting the key \\"/NCC-74656\\" on namespace voyager."`
|
|
1281
|
+
);
|
|
1282
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1283
|
+
});
|
|
1284
|
+
|
|
1285
|
+
it("should delete a key in a namespace specified by binding name", async () => {
|
|
1286
|
+
writeWranglerConfig();
|
|
1287
|
+
const requests = mockDeleteRequest("bound-id", "someKey");
|
|
1288
|
+
await runWrangler(
|
|
1289
|
+
`kv:key delete --binding someBinding --preview false someKey`
|
|
1290
|
+
);
|
|
1291
|
+
expect(requests.count).toEqual(1);
|
|
1292
|
+
});
|
|
1293
|
+
|
|
1294
|
+
it("should delete a key in a preview namespace specified by binding name", async () => {
|
|
1295
|
+
writeWranglerConfig();
|
|
1296
|
+
const requests = mockDeleteRequest("preview-bound-id", "someKey");
|
|
1297
|
+
await runWrangler(
|
|
1298
|
+
`kv:key delete --binding someBinding --preview someKey`
|
|
1299
|
+
);
|
|
1300
|
+
expect(requests.count).toEqual(1);
|
|
1301
|
+
});
|
|
1302
|
+
|
|
1303
|
+
it("should error if a given binding name is not in the configured kv namespaces", async () => {
|
|
1304
|
+
writeWranglerConfig();
|
|
1305
|
+
await expect(
|
|
1306
|
+
runWrangler(`kv:key delete --binding otherBinding someKey`)
|
|
1307
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
1308
|
+
`"A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."`
|
|
1309
|
+
);
|
|
1310
|
+
|
|
1311
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
1312
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mA namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".[0m
|
|
1313
|
+
|
|
1314
|
+
"
|
|
1315
|
+
`);
|
|
1316
|
+
});
|
|
1317
|
+
|
|
1318
|
+
it("should delete a key in a namespace specified by binding name in a given environment", async () => {
|
|
1319
|
+
writeWranglerConfig();
|
|
1320
|
+
const requests = mockDeleteRequest("env-bound-id", "someKey");
|
|
1321
|
+
await runWrangler(
|
|
1322
|
+
`kv:key delete --binding someBinding --env some-environment --preview false someKey`
|
|
1323
|
+
);
|
|
1324
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
1325
|
+
`"Deleting the key \\"someKey\\" on namespace env-bound-id."`
|
|
1326
|
+
);
|
|
1327
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1328
|
+
expect(requests.count).toEqual(1);
|
|
1329
|
+
});
|
|
1330
|
+
|
|
1331
|
+
it("should delete a key in a preview namespace specified by binding name in a given environment", async () => {
|
|
1332
|
+
writeWranglerConfig();
|
|
1333
|
+
const requests = mockDeleteRequest("preview-env-bound-id", "someKey");
|
|
1334
|
+
await runWrangler(
|
|
1335
|
+
`kv:key delete --binding someBinding --env some-environment --preview someKey`
|
|
1336
|
+
);
|
|
1337
|
+
expect(requests.count).toEqual(1);
|
|
1338
|
+
});
|
|
1339
|
+
});
|
|
1340
|
+
});
|
|
1341
|
+
|
|
1342
|
+
describe("kv:bulk", () => {
|
|
1343
|
+
describe("put", () => {
|
|
1344
|
+
function mockPutRequest(
|
|
1345
|
+
expectedNamespaceId: string,
|
|
1346
|
+
expectedKeyValues: KeyValue[]
|
|
1347
|
+
) {
|
|
1348
|
+
const requests = { count: 0 };
|
|
1349
|
+
setMockResponse(
|
|
1350
|
+
"/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
|
|
1351
|
+
"PUT",
|
|
1352
|
+
([_url, accountId, namespaceId], { body }) => {
|
|
1353
|
+
requests.count++;
|
|
1354
|
+
expect(accountId).toEqual("some-account-id");
|
|
1355
|
+
expect(namespaceId).toEqual(expectedNamespaceId);
|
|
1356
|
+
expect(JSON.parse(body as string)).toEqual(
|
|
1357
|
+
expectedKeyValues.slice(
|
|
1358
|
+
(requests.count - 1) * 5000,
|
|
1359
|
+
requests.count * 5000
|
|
1360
|
+
)
|
|
1361
|
+
);
|
|
1362
|
+
return null;
|
|
1363
|
+
}
|
|
1364
|
+
);
|
|
1365
|
+
return requests;
|
|
1366
|
+
}
|
|
1367
|
+
|
|
1368
|
+
it("should put the key-values parsed from a file", async () => {
|
|
1369
|
+
const keyValues: KeyValue[] = [
|
|
1370
|
+
{ key: "someKey1", value: "someValue1" },
|
|
1371
|
+
{ key: "ns:someKey2", value: "123", base64: true },
|
|
1372
|
+
{ key: "someKey3", value: "someValue3", expiration: 100 },
|
|
1373
|
+
{ key: "someKey4", value: "someValue4", expiration_ttl: 500 },
|
|
1374
|
+
];
|
|
1375
|
+
writeFileSync("./keys.json", JSON.stringify(keyValues));
|
|
1376
|
+
const requests = mockPutRequest("some-namespace-id", keyValues);
|
|
1377
|
+
await runWrangler(
|
|
1378
|
+
`kv:bulk put --namespace-id some-namespace-id keys.json`
|
|
1379
|
+
);
|
|
1380
|
+
expect(requests.count).toEqual(1);
|
|
1381
|
+
expect(std.out).toMatchInlineSnapshot(`"Success!"`);
|
|
1382
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1383
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1384
|
+
});
|
|
1385
|
+
|
|
1386
|
+
it("should put the key-values in batches of 5000 parsed from a file", async () => {
|
|
1387
|
+
const keyValues: KeyValue[] = new Array(12000).fill({
|
|
1388
|
+
key: "someKey1",
|
|
1389
|
+
value: "someValue1",
|
|
1390
|
+
});
|
|
1391
|
+
writeFileSync("./keys.json", JSON.stringify(keyValues));
|
|
1392
|
+
const requests = mockPutRequest("some-namespace-id", keyValues);
|
|
1393
|
+
await runWrangler(
|
|
1394
|
+
`kv:bulk put --namespace-id some-namespace-id keys.json`
|
|
1395
|
+
);
|
|
1396
|
+
expect(requests.count).toEqual(3);
|
|
1397
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1398
|
+
"Uploaded 0% (0 out of 12,000)
|
|
1399
|
+
Uploaded 41% (5,000 out of 12,000)
|
|
1400
|
+
Uploaded 83% (10,000 out of 12,000)
|
|
1401
|
+
Uploaded 100% (12,000 out of 12,000)
|
|
1153
1402
|
Success!"
|
|
1154
1403
|
`);
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
|
|
1158
|
-
|
|
1159
|
-
|
|
1160
|
-
|
|
1161
|
-
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
1170
|
-
|
|
1171
|
-
|
|
1172
|
-
it("should error if the array contains items that are not key-value objects", async () => {
|
|
1173
|
-
const keyValues = [
|
|
1174
|
-
123,
|
|
1175
|
-
"a string",
|
|
1176
|
-
{ key: "someKey" },
|
|
1177
|
-
{ value: "someValue" },
|
|
1178
|
-
{ key: "someKey1", value: "someValue1", invalid: true },
|
|
1179
|
-
];
|
|
1180
|
-
writeFileSync("./keys.json", JSON.stringify(keyValues));
|
|
1181
|
-
await expect(
|
|
1182
|
-
runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
|
|
1183
|
-
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1184
|
-
"Unexpected JSON input from \\"keys.json\\".
|
|
1185
|
-
Each item in the array should be an object that matches:
|
|
1186
|
-
|
|
1187
|
-
interface KeyValue {
|
|
1188
|
-
key: string;
|
|
1189
|
-
value: string;
|
|
1190
|
-
expiration?: number;
|
|
1191
|
-
expiration_ttl?: number;
|
|
1192
|
-
metadata?: object;
|
|
1193
|
-
base64?: boolean;
|
|
1194
|
-
}
|
|
1195
|
-
|
|
1196
|
-
The item at index 0 is type: \\"number\\" - 123
|
|
1197
|
-
The item at index 1 is type: \\"string\\" - \\"a string\\"
|
|
1198
|
-
The item at index 2 is {\\"key\\":\\"someKey\\"}
|
|
1199
|
-
The item at index 3 is {\\"value\\":\\"someValue\\"}"
|
|
1200
|
-
`);
|
|
1201
|
-
|
|
1202
|
-
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
1203
|
-
expect(std.warn).toMatchInlineSnapshot(`
|
|
1204
|
-
"Unexpected key-value properties in \\"keys.json\\".
|
|
1205
|
-
The item at index 4 contains unexpected properties: [\\"invalid\\"]."
|
|
1404
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1405
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1406
|
+
});
|
|
1407
|
+
|
|
1408
|
+
it("should error if the file is not a JSON array", async () => {
|
|
1409
|
+
const keyValues = { key: "someKey1", value: "someValue1" };
|
|
1410
|
+
writeFileSync("./keys.json", JSON.stringify(keyValues));
|
|
1411
|
+
await expect(
|
|
1412
|
+
runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
|
|
1413
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1414
|
+
"Unexpected JSON input from \\"keys.json\\".
|
|
1415
|
+
Expected an array of key-value objects but got type \\"object\\"."
|
|
1416
|
+
`);
|
|
1417
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1418
|
+
"
|
|
1419
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
1206
1420
|
`);
|
|
1207
|
-
|
|
1208
|
-
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
|
|
1212
|
-
|
|
1213
|
-
|
|
1214
|
-
|
|
1215
|
-
|
|
1216
|
-
|
|
1217
|
-
|
|
1218
|
-
|
|
1219
|
-
|
|
1220
|
-
|
|
1221
|
-
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
|
|
1225
|
-
|
|
1226
|
-
|
|
1227
|
-
|
|
1228
|
-
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1239
|
-
|
|
1240
|
-
|
|
1241
|
-
|
|
1242
|
-
|
|
1243
|
-
|
|
1244
|
-
|
|
1245
|
-
|
|
1246
|
-
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
|
|
1257
|
-
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1421
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1422
|
+
});
|
|
1423
|
+
|
|
1424
|
+
it("should error if the array contains items that are not key-value objects", async () => {
|
|
1425
|
+
const keyValues = [
|
|
1426
|
+
123,
|
|
1427
|
+
"a string",
|
|
1428
|
+
{ key: "someKey" },
|
|
1429
|
+
{ value: "someValue" },
|
|
1430
|
+
// add a valid object here to make sure it's not included
|
|
1431
|
+
{ key: "someKey1", value: "someValue1" },
|
|
1432
|
+
// this one will only add a warning
|
|
1433
|
+
{ key: "someKey1", value: "someValue1", invalid: true },
|
|
1434
|
+
// back to the invalid ones
|
|
1435
|
+
{ key: 123, value: "somevalue" },
|
|
1436
|
+
{ key: "somekey", value: 123 },
|
|
1437
|
+
{ key: "someKey1", value: "someValue1", expiration: "string" },
|
|
1438
|
+
{ key: "someKey1", value: "someValue1", expiration_ttl: "string" },
|
|
1439
|
+
{
|
|
1440
|
+
key: 123,
|
|
1441
|
+
value: {
|
|
1442
|
+
a: {
|
|
1443
|
+
nested: "object",
|
|
1444
|
+
},
|
|
1445
|
+
},
|
|
1446
|
+
},
|
|
1447
|
+
{ key: "someKey1", value: "someValue1", metadata: 123 },
|
|
1448
|
+
{ key: "someKey1", value: "someValue1", base64: "string" },
|
|
1449
|
+
];
|
|
1450
|
+
writeFileSync("./keys.json", JSON.stringify(keyValues));
|
|
1451
|
+
await expect(
|
|
1452
|
+
runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
|
|
1453
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1454
|
+
"Unexpected JSON input from \\"keys.json\\".
|
|
1455
|
+
Each item in the array should be an object that matches:
|
|
1456
|
+
|
|
1457
|
+
interface KeyValue {
|
|
1458
|
+
key: string;
|
|
1459
|
+
value: string;
|
|
1460
|
+
expiration?: number;
|
|
1461
|
+
expiration_ttl?: number;
|
|
1462
|
+
metadata?: object;
|
|
1463
|
+
base64?: boolean;
|
|
1464
|
+
}
|
|
1465
|
+
|
|
1466
|
+
The item at index 0 is 123
|
|
1467
|
+
The item at index 1 is \\"a string\\"
|
|
1468
|
+
The item at index 2 is {\\"key\\":\\"someKey\\"}
|
|
1469
|
+
The item at index 3 is {\\"value\\":\\"someValue\\"}
|
|
1470
|
+
The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
|
|
1471
|
+
The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
|
|
1472
|
+
The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
|
|
1473
|
+
The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
|
|
1474
|
+
The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
|
|
1475
|
+
The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
|
|
1476
|
+
The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
|
|
1477
|
+
`);
|
|
1478
|
+
|
|
1479
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1480
|
+
"
|
|
1481
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
1482
|
+
`);
|
|
1483
|
+
expect(std.warn).toMatchInlineSnapshot(`
|
|
1484
|
+
"[33m▲ [43;33m[[43;30mWARNING[43;33m][0m [1mUnexpected key-value properties in \\"keys.json\\".[0m
|
|
1485
|
+
|
|
1486
|
+
The item at index 5 contains unexpected properties: [\\"invalid\\"].
|
|
1487
|
+
|
|
1488
|
+
"
|
|
1489
|
+
`);
|
|
1490
|
+
});
|
|
1491
|
+
});
|
|
1492
|
+
|
|
1493
|
+
describe("delete", () => {
|
|
1494
|
+
function mockDeleteRequest(
|
|
1495
|
+
expectedNamespaceId: string,
|
|
1496
|
+
expectedKeys: string[]
|
|
1497
|
+
) {
|
|
1498
|
+
const requests = { count: 0 };
|
|
1499
|
+
setMockResponse(
|
|
1500
|
+
"/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
|
|
1501
|
+
"DELETE",
|
|
1502
|
+
([_url, accountId, namespaceId], { headers, body }) => {
|
|
1503
|
+
requests.count++;
|
|
1504
|
+
expect(accountId).toEqual("some-account-id");
|
|
1505
|
+
expect(namespaceId).toEqual(expectedNamespaceId);
|
|
1506
|
+
expect(new Headers(headers ?? []).get("Content-Type")).toEqual(
|
|
1507
|
+
"application/json"
|
|
1508
|
+
);
|
|
1509
|
+
expect(JSON.parse(body as string)).toEqual(
|
|
1510
|
+
expectedKeys.slice(
|
|
1511
|
+
(requests.count - 1) * 5000,
|
|
1512
|
+
requests.count * 5000
|
|
1513
|
+
)
|
|
1514
|
+
);
|
|
1515
|
+
return null;
|
|
1516
|
+
}
|
|
1517
|
+
);
|
|
1518
|
+
return requests;
|
|
1519
|
+
}
|
|
1520
|
+
|
|
1521
|
+
it("should delete the keys parsed from a file", async () => {
|
|
1522
|
+
const keys = ["someKey1", "ns:someKey2"];
|
|
1523
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1524
|
+
mockConfirm({
|
|
1525
|
+
text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
|
|
1526
|
+
result: true,
|
|
1527
|
+
});
|
|
1528
|
+
const requests = mockDeleteRequest("some-namespace-id", keys);
|
|
1529
|
+
await runWrangler(
|
|
1530
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json`
|
|
1531
|
+
);
|
|
1532
|
+
expect(requests.count).toEqual(1);
|
|
1533
|
+
expect(std.out).toMatchInlineSnapshot(`"Success!"`);
|
|
1534
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1535
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1536
|
+
});
|
|
1537
|
+
|
|
1538
|
+
it("should delete the keys in batches of 5000 parsed from a file", async () => {
|
|
1539
|
+
const keys = new Array(12000).fill("some-key");
|
|
1540
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1541
|
+
mockConfirm({
|
|
1542
|
+
text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
|
|
1543
|
+
result: true,
|
|
1544
|
+
});
|
|
1545
|
+
const requests = mockDeleteRequest("some-namespace-id", keys);
|
|
1546
|
+
await runWrangler(
|
|
1547
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json`
|
|
1548
|
+
);
|
|
1549
|
+
expect(requests.count).toEqual(3);
|
|
1550
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1551
|
+
"Deleted 0% (0 out of 12,000)
|
|
1552
|
+
Deleted 41% (5,000 out of 12,000)
|
|
1553
|
+
Deleted 83% (10,000 out of 12,000)
|
|
1554
|
+
Deleted 100% (12,000 out of 12,000)
|
|
1272
1555
|
Success!"
|
|
1273
1556
|
`);
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1287
|
-
|
|
1288
|
-
|
|
1289
|
-
|
|
1290
|
-
|
|
1291
|
-
|
|
1292
|
-
|
|
1293
|
-
|
|
1294
|
-
|
|
1295
|
-
|
|
1296
|
-
|
|
1297
|
-
|
|
1298
|
-
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
|
|
1302
|
-
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1306
|
-
|
|
1307
|
-
|
|
1308
|
-
|
|
1309
|
-
|
|
1310
|
-
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1327
|
-
|
|
1328
|
-
|
|
1329
|
-
|
|
1330
|
-
|
|
1331
|
-
|
|
1332
|
-
|
|
1333
|
-
|
|
1334
|
-
|
|
1335
|
-
|
|
1336
|
-
|
|
1337
|
-
|
|
1338
|
-
|
|
1339
|
-
|
|
1340
|
-
|
|
1341
|
-
|
|
1342
|
-
|
|
1343
|
-
|
|
1344
|
-
|
|
1345
|
-
|
|
1346
|
-
|
|
1347
|
-
|
|
1348
|
-
|
|
1349
|
-
|
|
1350
|
-
|
|
1351
|
-
|
|
1352
|
-
|
|
1353
|
-
|
|
1354
|
-
|
|
1355
|
-
|
|
1356
|
-
|
|
1357
|
-
|
|
1358
|
-
|
|
1359
|
-
|
|
1360
|
-
|
|
1361
|
-
|
|
1362
|
-
|
|
1363
|
-
|
|
1557
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1558
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1559
|
+
});
|
|
1560
|
+
|
|
1561
|
+
it("should not delete the keys if the user confirms no", async () => {
|
|
1562
|
+
const keys = ["someKey1", "ns:someKey2"];
|
|
1563
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1564
|
+
mockConfirm({
|
|
1565
|
+
text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
|
|
1566
|
+
result: false,
|
|
1567
|
+
});
|
|
1568
|
+
await runWrangler(
|
|
1569
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json`
|
|
1570
|
+
);
|
|
1571
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
1572
|
+
`"Not deleting keys read from \\"keys.json\\"."`
|
|
1573
|
+
);
|
|
1574
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1575
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1576
|
+
});
|
|
1577
|
+
|
|
1578
|
+
it("should delete the keys without asking if --force is provided", async () => {
|
|
1579
|
+
const keys = ["someKey1", "ns:someKey2"];
|
|
1580
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1581
|
+
const requests = mockDeleteRequest("some-namespace-id", keys);
|
|
1582
|
+
await runWrangler(
|
|
1583
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json --force`
|
|
1584
|
+
);
|
|
1585
|
+
expect(requests.count).toEqual(1);
|
|
1586
|
+
expect(std.out).toMatchInlineSnapshot(`"Success!"`);
|
|
1587
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1588
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1589
|
+
});
|
|
1590
|
+
|
|
1591
|
+
it("should delete the keys without asking if -f is provided", async () => {
|
|
1592
|
+
const keys = ["someKey1", "ns:someKey2"];
|
|
1593
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1594
|
+
const requests = mockDeleteRequest("some-namespace-id", keys);
|
|
1595
|
+
await runWrangler(
|
|
1596
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json -f`
|
|
1597
|
+
);
|
|
1598
|
+
expect(requests.count).toEqual(1);
|
|
1599
|
+
expect(std.out).toMatchInlineSnapshot(`"Success!"`);
|
|
1600
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1601
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
1602
|
+
});
|
|
1603
|
+
|
|
1604
|
+
it("should error if the file is not a JSON array", async () => {
|
|
1605
|
+
const keys = 12354;
|
|
1606
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1607
|
+
mockConfirm({
|
|
1608
|
+
text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
|
|
1609
|
+
result: true,
|
|
1610
|
+
});
|
|
1611
|
+
await expect(
|
|
1612
|
+
runWrangler(
|
|
1613
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json`
|
|
1614
|
+
)
|
|
1615
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1616
|
+
"Unexpected JSON input from \\"keys.json\\".
|
|
1617
|
+
Expected an array of strings but got:
|
|
1618
|
+
12354"
|
|
1619
|
+
`);
|
|
1620
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1621
|
+
"
|
|
1622
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
1623
|
+
`);
|
|
1624
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1625
|
+
});
|
|
1626
|
+
|
|
1627
|
+
it("should error if the file contains non-string items", async () => {
|
|
1628
|
+
const keys = ["good", 12354, { key: "someKey" }, null];
|
|
1629
|
+
writeFileSync("./keys.json", JSON.stringify(keys));
|
|
1630
|
+
mockConfirm({
|
|
1631
|
+
text: `Are you sure you want to delete all the keys read from "keys.json" from kv-namespace with id "some-namespace-id"?`,
|
|
1632
|
+
result: true,
|
|
1633
|
+
});
|
|
1634
|
+
await expect(
|
|
1635
|
+
runWrangler(
|
|
1636
|
+
`kv:bulk delete --namespace-id some-namespace-id keys.json`
|
|
1637
|
+
)
|
|
1638
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
|
1639
|
+
"Unexpected JSON input from \\"keys.json\\".
|
|
1640
|
+
Expected an array of strings.
|
|
1641
|
+
The item at index 1 is type: \\"number\\" - 12354
|
|
1642
|
+
The item at index 2 is type: \\"object\\" - {\\"key\\":\\"someKey\\"}
|
|
1643
|
+
The item at index 3 is type: \\"object\\" - null"
|
|
1644
|
+
`);
|
|
1645
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
1646
|
+
"
|
|
1647
|
+
[32mIf you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose[0m"
|
|
1648
|
+
`);
|
|
1649
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
1650
|
+
});
|
|
1651
|
+
});
|
|
1652
|
+
});
|
|
1364
1653
|
});
|
|
1365
1654
|
|
|
1366
1655
|
function writeWranglerConfig() {
|
|
1367
|
-
|
|
1368
|
-
|
|
1369
|
-
|
|
1370
|
-
|
|
1371
|
-
|
|
1372
|
-
|
|
1373
|
-
|
|
1374
|
-
|
|
1375
|
-
|
|
1376
|
-
|
|
1377
|
-
|
|
1378
|
-
|
|
1379
|
-
|
|
1380
|
-
|
|
1381
|
-
|
|
1656
|
+
writeFileSync(
|
|
1657
|
+
"./wrangler.toml",
|
|
1658
|
+
[
|
|
1659
|
+
'name = "other-worker"',
|
|
1660
|
+
"kv_namespaces = [",
|
|
1661
|
+
' { binding = "someBinding", id = "bound-id", preview_id = "preview-bound-id" }',
|
|
1662
|
+
"]",
|
|
1663
|
+
"",
|
|
1664
|
+
"[env.some-environment]",
|
|
1665
|
+
"kv_namespaces = [",
|
|
1666
|
+
' { binding = "someBinding", id = "env-bound-id", preview_id = "preview-env-bound-id" }',
|
|
1667
|
+
"]",
|
|
1668
|
+
].join("\n"),
|
|
1669
|
+
"utf-8"
|
|
1670
|
+
);
|
|
1382
1671
|
}
|