wrangler 0.0.0-e978986 → 0.0.0-ea7ee45

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.
Files changed (181) hide show
  1. package/README.md +7 -1
  2. package/bin/wrangler.js +111 -57
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +9 -2
  5. package/package.json +156 -152
  6. package/src/__tests__/config-cache.test.ts +24 -24
  7. package/src/__tests__/configuration.test.ts +3818 -3363
  8. package/src/__tests__/dev.test.tsx +1128 -949
  9. package/src/__tests__/guess-worker-format.test.ts +68 -68
  10. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  11. package/src/__tests__/helpers/faye-websocket.d.ts +4 -4
  12. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  13. package/src/__tests__/helpers/mock-bin.ts +20 -20
  14. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  15. package/src/__tests__/helpers/mock-console.ts +49 -39
  16. package/src/__tests__/helpers/mock-dialogs.ts +94 -71
  17. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  18. package/src/__tests__/helpers/mock-istty.ts +65 -18
  19. package/src/__tests__/helpers/mock-kv.ts +26 -26
  20. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  21. package/src/__tests__/helpers/mock-process.ts +39 -0
  22. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  23. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  24. package/src/__tests__/helpers/run-in-tmp.ts +27 -27
  25. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  26. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  27. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  28. package/src/__tests__/https-options.test.ts +104 -104
  29. package/src/__tests__/index.test.ts +239 -233
  30. package/src/__tests__/init.test.ts +1605 -1180
  31. package/src/__tests__/jest.setup.ts +63 -33
  32. package/src/__tests__/kv.test.ts +1128 -990
  33. package/src/__tests__/logger.test.ts +100 -74
  34. package/src/__tests__/package-manager.test.ts +303 -303
  35. package/src/__tests__/pages.test.ts +1160 -563
  36. package/src/__tests__/parse.test.ts +252 -252
  37. package/src/__tests__/publish.test.ts +6344 -5299
  38. package/src/__tests__/pubsub.test.ts +276 -0
  39. package/src/__tests__/r2.test.ts +133 -133
  40. package/src/__tests__/route.test.ts +18 -18
  41. package/src/__tests__/secret.test.ts +382 -377
  42. package/src/__tests__/tail.test.ts +530 -530
  43. package/src/__tests__/user.test.ts +123 -111
  44. package/src/__tests__/whoami.test.tsx +198 -83
  45. package/src/__tests__/worker-namespace.test.ts +327 -0
  46. package/src/abort.d.ts +1 -1
  47. package/src/api/dev.ts +39 -0
  48. package/src/api/index.ts +1 -0
  49. package/src/bundle-reporter.tsx +29 -0
  50. package/src/bundle.ts +158 -146
  51. package/src/cfetch/index.ts +80 -80
  52. package/src/cfetch/internal.ts +92 -88
  53. package/src/cli.ts +21 -7
  54. package/src/config/config.ts +204 -195
  55. package/src/config/diagnostics.ts +61 -61
  56. package/src/config/environment.ts +367 -357
  57. package/src/config/index.ts +193 -193
  58. package/src/config/validation-helpers.ts +366 -357
  59. package/src/config/validation.ts +1521 -1367
  60. package/src/config-cache.ts +24 -25
  61. package/src/create-worker-preview.ts +206 -136
  62. package/src/create-worker-upload-form.ts +238 -238
  63. package/src/dev/dev-vars.ts +13 -13
  64. package/src/dev/dev.tsx +334 -336
  65. package/src/dev/local.tsx +304 -272
  66. package/src/dev/remote.tsx +351 -211
  67. package/src/dev/use-esbuild.ts +126 -94
  68. package/src/dev.tsx +526 -0
  69. package/src/dialogs.tsx +97 -97
  70. package/src/durable.ts +87 -87
  71. package/src/entry.ts +234 -228
  72. package/src/environment-variables.ts +23 -23
  73. package/src/errors.ts +6 -6
  74. package/src/generate.ts +33 -0
  75. package/src/git-client.ts +42 -0
  76. package/src/https-options.ts +79 -79
  77. package/src/index.tsx +1775 -2752
  78. package/src/init.ts +549 -0
  79. package/src/inspect.ts +593 -593
  80. package/src/intl-polyfill.d.ts +123 -123
  81. package/src/kv.ts +277 -277
  82. package/src/logger.ts +46 -39
  83. package/src/miniflare-cli/enum-keys.ts +8 -8
  84. package/src/miniflare-cli/index.ts +42 -31
  85. package/src/miniflare-cli/request-context.ts +18 -18
  86. package/src/module-collection.ts +212 -212
  87. package/src/open-in-browser.ts +4 -6
  88. package/src/package-manager.ts +123 -123
  89. package/src/pages/build.tsx +202 -0
  90. package/src/pages/constants.ts +7 -0
  91. package/src/pages/deployments.tsx +101 -0
  92. package/src/pages/dev.tsx +964 -0
  93. package/src/pages/functions/buildPlugin.ts +105 -0
  94. package/src/pages/functions/buildWorker.ts +151 -0
  95. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  96. package/src/pages/functions/filepath-routing.ts +189 -0
  97. package/src/pages/functions/identifiers.ts +78 -0
  98. package/src/pages/functions/routes.ts +151 -0
  99. package/src/pages/index.tsx +84 -0
  100. package/src/pages/projects.tsx +157 -0
  101. package/src/pages/publish.tsx +335 -0
  102. package/src/pages/types.ts +40 -0
  103. package/src/pages/upload.tsx +384 -0
  104. package/src/pages/utils.ts +12 -0
  105. package/src/parse.ts +209 -125
  106. package/src/paths.ts +6 -6
  107. package/src/preview.ts +31 -0
  108. package/src/proxy.ts +400 -389
  109. package/src/publish.ts +688 -505
  110. package/src/pubsub/index.ts +286 -0
  111. package/src/pubsub/pubsub-commands.tsx +594 -0
  112. package/src/r2.ts +19 -19
  113. package/src/selfsigned.d.ts +23 -23
  114. package/src/sites.tsx +278 -201
  115. package/src/tail/filters.ts +108 -108
  116. package/src/tail/index.ts +217 -217
  117. package/src/tail/printing.ts +45 -45
  118. package/src/update-check.ts +11 -11
  119. package/src/user/choose-account.tsx +60 -0
  120. package/src/user/env-vars.ts +46 -0
  121. package/src/user/generate-auth-url.ts +33 -0
  122. package/src/user/generate-random-state.ts +16 -0
  123. package/src/user/index.ts +3 -0
  124. package/src/user/user.tsx +1130 -0
  125. package/src/whoami.tsx +61 -41
  126. package/src/worker-namespace.ts +190 -0
  127. package/src/worker.ts +104 -99
  128. package/src/zones.ts +76 -0
  129. package/templates/checked-fetch.js +17 -0
  130. package/templates/new-worker-scheduled.js +4 -4
  131. package/templates/new-worker-scheduled.ts +16 -16
  132. package/templates/new-worker.js +3 -3
  133. package/templates/new-worker.ts +15 -15
  134. package/templates/no-op-worker.js +10 -0
  135. package/templates/pages-template-plugin.ts +155 -0
  136. package/templates/pages-template-worker.ts +161 -0
  137. package/templates/static-asset-facade.js +32 -36
  138. package/templates/tsconfig.json +95 -95
  139. package/wrangler-dist/cli.js +40620 -39223
  140. package/pages/functions/buildPlugin.ts +0 -105
  141. package/pages/functions/buildWorker.ts +0 -151
  142. package/pages/functions/filepath-routing.ts +0 -189
  143. package/pages/functions/identifiers.ts +0 -78
  144. package/pages/functions/routes.ts +0 -156
  145. package/pages/functions/template-plugin.ts +0 -147
  146. package/pages/functions/template-worker.ts +0 -143
  147. package/src/pages.tsx +0 -2027
  148. package/src/user.tsx +0 -1203
  149. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  150. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  151. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  152. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  153. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  154. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  155. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  156. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  157. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  158. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  159. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  160. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  161. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  163. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  164. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  165. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  166. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  167. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  168. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  169. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  170. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  171. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  172. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  173. package/vendor/wrangler-mime/LICENSE +0 -21
  174. package/vendor/wrangler-mime/Mime.js +0 -97
  175. package/vendor/wrangler-mime/README.md +0 -187
  176. package/vendor/wrangler-mime/cli.js +0 -46
  177. package/vendor/wrangler-mime/index.js +0 -4
  178. package/vendor/wrangler-mime/lite.js +0 -4
  179. package/vendor/wrangler-mime/package.json +0 -52
  180. package/vendor/wrangler-mime/types/other.js +0 -1
  181. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -4,266 +4,271 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
4
4
  import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
5
5
  import { mockConsoleMethods } from "./helpers/mock-console";
6
6
  import {
7
- mockConfirm,
8
- mockPrompt,
9
- clearConfirmMocks,
10
- clearPromptMocks,
7
+ mockConfirm,
8
+ mockPrompt,
9
+ clearConfirmMocks,
10
+ clearPromptMocks,
11
11
  } from "./helpers/mock-dialogs";
12
- import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
12
+ import {
13
+ mockGetMemberships,
14
+ mockGetMembershipsFail,
15
+ } from "./helpers/mock-oauth-flow";
13
16
  import { useMockStdin } from "./helpers/mock-stdin";
14
17
  import { runInTempDir } from "./helpers/run-in-tmp";
15
18
  import { runWrangler } from "./helpers/run-wrangler";
16
19
 
17
20
  describe("wrangler secret", () => {
18
- const std = mockConsoleMethods();
19
- const { mockGetMemberships } = mockOAuthFlow();
20
-
21
- runInTempDir();
22
- mockAccountId();
23
- mockApiToken();
24
-
25
- afterEach(() => {
26
- unsetAllMocks();
27
- clearConfirmMocks();
28
- clearPromptMocks();
29
- });
30
-
31
- describe("put", () => {
32
- function mockPutRequest(
33
- input: { name: string; text: string },
34
- env?: string,
35
- legacyEnv = false
36
- ) {
37
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
38
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
39
- setMockResponse(
40
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
41
- "PUT",
42
- ([_url, accountId, scriptName, envName], { body }) => {
43
- expect(accountId).toEqual("some-account-id");
44
- expect(scriptName).toEqual(
45
- legacyEnv && env ? `script-name-${env}` : "script-name"
46
- );
47
- if (!legacyEnv) {
48
- expect(envName).toEqual(env);
49
- }
50
- const { name, text, type } = JSON.parse(body as string);
51
- expect(type).toEqual("secret_text");
52
- expect(name).toEqual(input.name);
53
- expect(text).toEqual(input.text);
54
-
55
- return { name, type };
56
- }
57
- );
58
- }
59
-
60
- describe("interactive", () => {
61
- useMockStdin({ isTTY: true });
62
-
63
- it("should trim stdin secret value", async () => {
64
- mockPrompt({
65
- text: "Enter a secret value:",
66
- type: "password",
67
- result: `hunter2
21
+ const std = mockConsoleMethods();
22
+
23
+ runInTempDir();
24
+ mockAccountId();
25
+ mockApiToken();
26
+
27
+ afterEach(() => {
28
+ unsetAllMocks();
29
+ clearConfirmMocks();
30
+ clearPromptMocks();
31
+ });
32
+
33
+ describe("put", () => {
34
+ function mockPutRequest(
35
+ input: { name: string; text: string },
36
+ env?: string,
37
+ legacyEnv = false
38
+ ) {
39
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
40
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
41
+ setMockResponse(
42
+ `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
43
+ "PUT",
44
+ ([_url, accountId, scriptName, envName], { body }) => {
45
+ expect(accountId).toEqual("some-account-id");
46
+ expect(scriptName).toEqual(
47
+ legacyEnv && env ? `script-name-${env}` : "script-name"
48
+ );
49
+ if (!legacyEnv) {
50
+ expect(envName).toEqual(env);
51
+ }
52
+ const { name, text, type } = JSON.parse(body as string);
53
+ expect(type).toEqual("secret_text");
54
+ expect(name).toEqual(input.name);
55
+ expect(text).toEqual(input.text);
56
+
57
+ return { name, type };
58
+ }
59
+ );
60
+ }
61
+
62
+ describe("interactive", () => {
63
+ useMockStdin({ isTTY: true });
64
+
65
+ it("should trim stdin secret value", async () => {
66
+ mockPrompt({
67
+ text: "Enter a secret value:",
68
+ type: "password",
69
+ result: `hunter2
68
70
  `,
69
- });
71
+ });
70
72
 
71
- mockPutRequest({ name: `secret-name`, text: `hunter2` });
72
- await runWrangler("secret put secret-name --name script-name");
73
- expect(std.out).toMatchInlineSnapshot(`
73
+ mockPutRequest({ name: `secret-name`, text: `hunter2` });
74
+ await runWrangler("secret put secret-name --name script-name");
75
+ expect(std.out).toMatchInlineSnapshot(`
74
76
  "🌀 Creating the secret for script script-name
75
77
  ✨ Success! Uploaded secret secret-name"
76
78
  `);
77
- });
79
+ });
78
80
 
79
- it("should create a secret", async () => {
80
- mockPrompt({
81
- text: "Enter a secret value:",
82
- type: "password",
83
- result: "the-secret",
84
- });
81
+ it("should create a secret", async () => {
82
+ mockPrompt({
83
+ text: "Enter a secret value:",
84
+ type: "password",
85
+ result: "the-secret",
86
+ });
85
87
 
86
- mockPutRequest({ name: "the-key", text: "the-secret" });
87
- await runWrangler("secret put the-key --name script-name");
88
+ mockPutRequest({ name: "the-key", text: "the-secret" });
89
+ await runWrangler("secret put the-key --name script-name");
88
90
 
89
- expect(std.out).toMatchInlineSnapshot(`
91
+ expect(std.out).toMatchInlineSnapshot(`
90
92
  "🌀 Creating the secret for script script-name
91
93
  ✨ Success! Uploaded secret the-key"
92
94
  `);
93
- expect(std.err).toMatchInlineSnapshot(`""`);
94
- });
95
-
96
- it("should create a secret: legacy envs", async () => {
97
- mockPrompt({
98
- text: "Enter a secret value:",
99
- type: "password",
100
- result: "the-secret",
101
- });
102
-
103
- mockPutRequest(
104
- { name: "the-key", text: "the-secret" },
105
- "some-env",
106
- true
107
- );
108
- await runWrangler(
109
- "secret put the-key --name script-name --env some-env --legacy-env"
110
- );
111
-
112
- expect(std.out).toMatchInlineSnapshot(`
95
+ expect(std.err).toMatchInlineSnapshot(`""`);
96
+ });
97
+
98
+ it("should create a secret: legacy envs", async () => {
99
+ mockPrompt({
100
+ text: "Enter a secret value:",
101
+ type: "password",
102
+ result: "the-secret",
103
+ });
104
+
105
+ mockPutRequest(
106
+ { name: "the-key", text: "the-secret" },
107
+ "some-env",
108
+ true
109
+ );
110
+ await runWrangler(
111
+ "secret put the-key --name script-name --env some-env --legacy-env"
112
+ );
113
+
114
+ expect(std.out).toMatchInlineSnapshot(`
113
115
  "🌀 Creating the secret for script script-name-some-env
114
116
  ✨ Success! Uploaded secret the-key"
115
117
  `);
116
- expect(std.err).toMatchInlineSnapshot(`""`);
117
- });
118
-
119
- it("should create a secret: service envs", async () => {
120
- mockPrompt({
121
- text: "Enter a secret value:",
122
- type: "password",
123
- result: "the-secret",
124
- });
125
-
126
- mockPutRequest(
127
- { name: "the-key", text: "the-secret" },
128
- "some-env",
129
- false
130
- );
131
- await runWrangler(
132
- "secret put the-key --name script-name --env some-env --legacy-env false"
133
- );
134
-
135
- expect(std.out).toMatchInlineSnapshot(`
118
+ expect(std.err).toMatchInlineSnapshot(`""`);
119
+ });
120
+
121
+ it("should create a secret: service envs", async () => {
122
+ mockPrompt({
123
+ text: "Enter a secret value:",
124
+ type: "password",
125
+ result: "the-secret",
126
+ });
127
+
128
+ mockPutRequest(
129
+ { name: "the-key", text: "the-secret" },
130
+ "some-env",
131
+ false
132
+ );
133
+ await runWrangler(
134
+ "secret put the-key --name script-name --env some-env --legacy-env false"
135
+ );
136
+
137
+ expect(std.out).toMatchInlineSnapshot(`
136
138
  "🌀 Creating the secret for script script-name (some-env)
137
139
  ✨ Success! Uploaded secret the-key"
138
140
  `);
139
- expect(std.err).toMatchInlineSnapshot(`""`);
140
- });
141
-
142
- it("should error without a script name", async () => {
143
- let error: Error | undefined;
144
- try {
145
- await runWrangler("secret put the-key");
146
- } catch (e) {
147
- error = e as Error;
148
- }
149
- expect(std.out).toMatchInlineSnapshot(`
141
+ expect(std.err).toMatchInlineSnapshot(`""`);
142
+ });
143
+
144
+ it("should error without a script name", async () => {
145
+ let error: Error | undefined;
146
+ try {
147
+ await runWrangler("secret put the-key");
148
+ } catch (e) {
149
+ error = e as Error;
150
+ }
151
+ expect(std.out).toMatchInlineSnapshot(`
150
152
  "
151
153
  If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
152
154
  `);
153
- expect(std.err).toMatchInlineSnapshot(`
155
+ expect(std.err).toMatchInlineSnapshot(`
154
156
  "X [ERROR] Missing script name
155
157
 
156
158
  "
157
159
  `);
158
- expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
159
- });
160
- });
161
-
162
- describe("non-interactive", () => {
163
- const mockStdIn = useMockStdin({ isTTY: false });
164
-
165
- it("should trim stdin secret value, from piped input", async () => {
166
- mockPutRequest({ name: "the-key", text: "the-secret" });
167
- // Pipe the secret in as three chunks to test that we reconstitute it correctly.
168
- mockStdIn.send(
169
- `the`,
170
- `-`,
171
- `secret
160
+ expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
161
+ });
162
+ });
163
+
164
+ describe("non-interactive", () => {
165
+ const mockStdIn = useMockStdin({ isTTY: false });
166
+
167
+ it("should trim stdin secret value, from piped input", async () => {
168
+ mockPutRequest({ name: "the-key", text: "the-secret" });
169
+ // Pipe the secret in as three chunks to test that we reconstitute it correctly.
170
+ mockStdIn.send(
171
+ `the`,
172
+ `-`,
173
+ `secret
172
174
  ` // whitespace & newline being removed
173
- );
174
- await runWrangler("secret put the-key --name script-name");
175
+ );
176
+ await runWrangler("secret put the-key --name script-name");
175
177
 
176
- expect(std.out).toMatchInlineSnapshot(`
178
+ expect(std.out).toMatchInlineSnapshot(`
177
179
  "🌀 Creating the secret for script script-name
178
180
  ✨ Success! Uploaded secret the-key"
179
181
  `);
180
- expect(std.warn).toMatchInlineSnapshot(`""`);
181
- expect(std.err).toMatchInlineSnapshot(`""`);
182
- });
182
+ expect(std.warn).toMatchInlineSnapshot(`""`);
183
+ expect(std.err).toMatchInlineSnapshot(`""`);
184
+ });
183
185
 
184
- it("should create a secret, from piped input", async () => {
185
- mockPutRequest({ name: "the-key", text: "the-secret" });
186
- // Pipe the secret in as three chunks to test that we reconstitute it correctly.
187
- mockStdIn.send("the", "-", "secret");
188
- await runWrangler("secret put the-key --name script-name");
186
+ it("should create a secret, from piped input", async () => {
187
+ mockPutRequest({ name: "the-key", text: "the-secret" });
188
+ // Pipe the secret in as three chunks to test that we reconstitute it correctly.
189
+ mockStdIn.send("the", "-", "secret");
190
+ await runWrangler("secret put the-key --name script-name");
189
191
 
190
- expect(std.out).toMatchInlineSnapshot(`
192
+ expect(std.out).toMatchInlineSnapshot(`
191
193
  "🌀 Creating the secret for script script-name
192
194
  ✨ Success! Uploaded secret the-key"
193
195
  `);
194
- expect(std.warn).toMatchInlineSnapshot(`""`);
195
- expect(std.err).toMatchInlineSnapshot(`""`);
196
- });
197
-
198
- it("should error if the piped input fails", async () => {
199
- mockPutRequest({ name: "the-key", text: "the-secret" });
200
- mockStdIn.throwError(new Error("Error in stdin stream"));
201
- await expect(
202
- runWrangler("secret put the-key --name script-name")
203
- ).rejects.toThrowErrorMatchingInlineSnapshot(`"Error in stdin stream"`);
204
-
205
- expect(std.out).toMatchInlineSnapshot(`
196
+ expect(std.warn).toMatchInlineSnapshot(`""`);
197
+ expect(std.err).toMatchInlineSnapshot(`""`);
198
+ });
199
+
200
+ it("should error if the piped input fails", async () => {
201
+ mockPutRequest({ name: "the-key", text: "the-secret" });
202
+ mockStdIn.throwError(new Error("Error in stdin stream"));
203
+ await expect(
204
+ runWrangler("secret put the-key --name script-name")
205
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"Error in stdin stream"`);
206
+
207
+ expect(std.out).toMatchInlineSnapshot(`
206
208
  "
207
209
  If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
208
210
  `);
209
- expect(std.warn).toMatchInlineSnapshot(`""`);
210
- });
211
-
212
- describe("with accountId", () => {
213
- mockAccountId({ accountId: null });
214
-
215
- it("should error if a user has no account", async () => {
216
- mockGetMemberships({
217
- success: false,
218
- result: [],
219
- });
220
- await expect(
221
- runWrangler("secret put the-key --name script-name")
222
- ).rejects.toThrowErrorMatchingInlineSnapshot(
223
- `"Failed to automatically retrieve account IDs for the logged in user. In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your \`wrangler.toml\` file."`
224
- );
225
- });
226
-
227
- it("should use the account from wrangler.toml", async () => {
228
- fs.writeFileSync(
229
- "wrangler.toml",
230
- TOML.stringify({
231
- account_id: "some-account-id",
232
- }),
233
- "utf-8"
234
- );
235
- mockStdIn.send("the-secret");
236
- mockPutRequest({ name: "the-key", text: "the-secret" });
237
- await runWrangler("secret put the-key --name script-name");
238
- expect(std.out).toMatchInlineSnapshot(`
211
+ expect(std.warn).toMatchInlineSnapshot(`""`);
212
+ });
213
+
214
+ describe("with accountId", () => {
215
+ mockAccountId({ accountId: null });
216
+
217
+ it("should error if request for memberships fails", async () => {
218
+ mockGetMembershipsFail();
219
+ await expect(
220
+ runWrangler("secret put the-key --name script-name")
221
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
222
+ `"A request to the Cloudflare API (/memberships) failed."`
223
+ );
224
+ });
225
+
226
+ it("should error if a user has no account", async () => {
227
+ mockGetMemberships([]);
228
+ await expect(runWrangler("secret put the-key --name script-name"))
229
+ .rejects.toThrowErrorMatchingInlineSnapshot(`
230
+ "Failed to automatically retrieve account IDs for the logged in user.
231
+ In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your \`wrangler.toml\` file."
232
+ `);
233
+ });
234
+
235
+ it("should use the account from wrangler.toml", async () => {
236
+ fs.writeFileSync(
237
+ "wrangler.toml",
238
+ TOML.stringify({
239
+ account_id: "some-account-id",
240
+ }),
241
+ "utf-8"
242
+ );
243
+ mockStdIn.send("the-secret");
244
+ mockPutRequest({ name: "the-key", text: "the-secret" });
245
+ await runWrangler("secret put the-key --name script-name");
246
+ expect(std.out).toMatchInlineSnapshot(`
239
247
  "🌀 Creating the secret for script script-name
240
248
  ✨ Success! Uploaded secret the-key"
241
249
  `);
242
- expect(std.warn).toMatchInlineSnapshot(`""`);
243
- expect(std.err).toMatchInlineSnapshot(`""`);
244
- });
245
-
246
- it("should error if a user has multiple accounts, and has not specified an account in wrangler.toml", async () => {
247
- mockGetMemberships({
248
- success: true,
249
- result: [
250
- {
251
- id: "1",
252
- account: { id: "account-id-1", name: "account-name-1" },
253
- },
254
- {
255
- id: "2",
256
- account: { id: "account-id-2", name: "account-name-2" },
257
- },
258
- {
259
- id: "3",
260
- account: { id: "account-id-3", name: "account-name-3" },
261
- },
262
- ],
263
- });
264
-
265
- await expect(runWrangler("secret put the-key --name script-name"))
266
- .rejects.toThrowErrorMatchingInlineSnapshot(`
250
+ expect(std.warn).toMatchInlineSnapshot(`""`);
251
+ expect(std.err).toMatchInlineSnapshot(`""`);
252
+ });
253
+
254
+ it("should error if a user has multiple accounts, and has not specified an account in wrangler.toml", async () => {
255
+ mockGetMemberships([
256
+ {
257
+ id: "1",
258
+ account: { id: "account-id-1", name: "account-name-1" },
259
+ },
260
+ {
261
+ id: "2",
262
+ account: { id: "account-id-2", name: "account-name-2" },
263
+ },
264
+ {
265
+ id: "3",
266
+ account: { id: "account-id-3", name: "account-name-3" },
267
+ },
268
+ ]);
269
+
270
+ await expect(runWrangler("secret put the-key --name script-name"))
271
+ .rejects.toThrowErrorMatchingInlineSnapshot(`
267
272
  "More than one account available but unable to select one in non-interactive mode.
268
273
  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
269
274
  Available accounts are (\\"<name>\\" - \\"<id>\\"):
@@ -271,152 +276,152 @@ describe("wrangler secret", () => {
271
276
  \\"account-name-2\\" - \\"account-id-2\\")
272
277
  \\"account-name-3\\" - \\"account-id-3\\")"
273
278
  `);
274
- });
275
- });
276
- });
277
- });
278
-
279
- describe("delete", () => {
280
- function mockDeleteRequest(
281
- input: {
282
- scriptName: string;
283
- secretName: string;
284
- },
285
- env?: string,
286
- legacyEnv = false
287
- ) {
288
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
289
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
290
- setMockResponse(
291
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
292
- "DELETE",
293
- ([_url, accountId, scriptName, envOrSecretName, secretName]) => {
294
- expect(accountId).toEqual("some-account-id");
295
- expect(scriptName).toEqual(
296
- legacyEnv && env ? `script-name-${env}` : "script-name"
297
- );
298
- if (!legacyEnv) {
299
- if (env) {
300
- expect(envOrSecretName).toEqual(env);
301
- expect(secretName).toEqual(input.secretName);
302
- } else {
303
- expect(envOrSecretName).toEqual(input.secretName);
304
- }
305
- } else {
306
- expect(envOrSecretName).toEqual(input.secretName);
307
- }
308
- return null;
309
- }
310
- );
311
- }
312
- it("should delete a secret", async () => {
313
- mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
314
- mockConfirm({
315
- text: "Are you sure you want to permanently delete the variable the-key on the script script-name?",
316
- result: true,
317
- });
318
- await runWrangler("secret delete the-key --name script-name");
319
- expect(std.out).toMatchInlineSnapshot(`
279
+ });
280
+ });
281
+ });
282
+ });
283
+
284
+ describe("delete", () => {
285
+ function mockDeleteRequest(
286
+ input: {
287
+ scriptName: string;
288
+ secretName: string;
289
+ },
290
+ env?: string,
291
+ legacyEnv = false
292
+ ) {
293
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
294
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
295
+ setMockResponse(
296
+ `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
297
+ "DELETE",
298
+ ([_url, accountId, scriptName, envOrSecretName, secretName]) => {
299
+ expect(accountId).toEqual("some-account-id");
300
+ expect(scriptName).toEqual(
301
+ legacyEnv && env ? `script-name-${env}` : "script-name"
302
+ );
303
+ if (!legacyEnv) {
304
+ if (env) {
305
+ expect(envOrSecretName).toEqual(env);
306
+ expect(secretName).toEqual(input.secretName);
307
+ } else {
308
+ expect(envOrSecretName).toEqual(input.secretName);
309
+ }
310
+ } else {
311
+ expect(envOrSecretName).toEqual(input.secretName);
312
+ }
313
+ return null;
314
+ }
315
+ );
316
+ }
317
+ it("should delete a secret", async () => {
318
+ mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
319
+ mockConfirm({
320
+ text: "Are you sure you want to permanently delete the variable the-key on the script script-name?",
321
+ result: true,
322
+ });
323
+ await runWrangler("secret delete the-key --name script-name");
324
+ expect(std.out).toMatchInlineSnapshot(`
320
325
  "🌀 Deleting the secret the-key on script script-name
321
326
  ✨ Success! Deleted secret the-key"
322
327
  `);
323
- expect(std.err).toMatchInlineSnapshot(`""`);
324
- });
325
-
326
- it("should delete a secret: legacy envs", async () => {
327
- mockDeleteRequest(
328
- { scriptName: "script-name", secretName: "the-key" },
329
- "some-env",
330
- true
331
- );
332
- mockConfirm({
333
- text: "Are you sure you want to permanently delete the variable the-key on the script script-name-some-env?",
334
- result: true,
335
- });
336
- await runWrangler(
337
- "secret delete the-key --name script-name --env some-env --legacy-env"
338
- );
339
- expect(std.out).toMatchInlineSnapshot(`
328
+ expect(std.err).toMatchInlineSnapshot(`""`);
329
+ });
330
+
331
+ it("should delete a secret: legacy envs", async () => {
332
+ mockDeleteRequest(
333
+ { scriptName: "script-name", secretName: "the-key" },
334
+ "some-env",
335
+ true
336
+ );
337
+ mockConfirm({
338
+ text: "Are you sure you want to permanently delete the variable the-key on the script script-name-some-env?",
339
+ result: true,
340
+ });
341
+ await runWrangler(
342
+ "secret delete the-key --name script-name --env some-env --legacy-env"
343
+ );
344
+ expect(std.out).toMatchInlineSnapshot(`
340
345
  "🌀 Deleting the secret the-key on script script-name-some-env
341
346
  ✨ Success! Deleted secret the-key"
342
347
  `);
343
- expect(std.err).toMatchInlineSnapshot(`""`);
344
- });
345
-
346
- it("should delete a secret: service envs", async () => {
347
- mockDeleteRequest(
348
- { scriptName: "script-name", secretName: "the-key" },
349
- "some-env"
350
- );
351
- mockConfirm({
352
- text: "Are you sure you want to permanently delete the variable the-key on the script script-name (some-env)?",
353
- result: true,
354
- });
355
- await runWrangler(
356
- "secret delete the-key --name script-name --env some-env --legacy-env false"
357
- );
358
- expect(std.out).toMatchInlineSnapshot(`
348
+ expect(std.err).toMatchInlineSnapshot(`""`);
349
+ });
350
+
351
+ it("should delete a secret: service envs", async () => {
352
+ mockDeleteRequest(
353
+ { scriptName: "script-name", secretName: "the-key" },
354
+ "some-env"
355
+ );
356
+ mockConfirm({
357
+ text: "Are you sure you want to permanently delete the variable the-key on the script script-name (some-env)?",
358
+ result: true,
359
+ });
360
+ await runWrangler(
361
+ "secret delete the-key --name script-name --env some-env --legacy-env false"
362
+ );
363
+ expect(std.out).toMatchInlineSnapshot(`
359
364
  "🌀 Deleting the secret the-key on script script-name (some-env)
360
365
  ✨ Success! Deleted secret the-key"
361
366
  `);
362
- expect(std.err).toMatchInlineSnapshot(`""`);
363
- });
364
-
365
- it("should error without a script name", async () => {
366
- let error: Error | undefined;
367
-
368
- try {
369
- await runWrangler("secret delete the-key");
370
- } catch (e) {
371
- error = e as Error;
372
- }
373
- expect(std.out).toMatchInlineSnapshot(`
367
+ expect(std.err).toMatchInlineSnapshot(`""`);
368
+ });
369
+
370
+ it("should error without a script name", async () => {
371
+ let error: Error | undefined;
372
+
373
+ try {
374
+ await runWrangler("secret delete the-key");
375
+ } catch (e) {
376
+ error = e as Error;
377
+ }
378
+ expect(std.out).toMatchInlineSnapshot(`
374
379
  "
375
380
  If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
376
381
  `);
377
- expect(std.err).toMatchInlineSnapshot(`
382
+ expect(std.err).toMatchInlineSnapshot(`
378
383
  "X [ERROR] Missing script name
379
384
 
380
385
  "
381
386
  `);
382
- expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
383
- });
384
- });
385
-
386
- describe("list", () => {
387
- function mockListRequest(
388
- input: { scriptName: string },
389
- env?: string,
390
- legacyEnv = false
391
- ) {
392
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
393
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
394
- setMockResponse(
395
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
396
- "GET",
397
- ([_url, accountId, scriptName, envName]) => {
398
- expect(accountId).toEqual("some-account-id");
399
- expect(scriptName).toEqual(
400
- legacyEnv && env ? `script-name-${env}` : "script-name"
401
- );
402
- if (!legacyEnv) {
403
- expect(envName).toEqual(env);
404
- }
405
-
406
- return [
407
- {
408
- name: "the-secret-name",
409
- type: "secret_text",
410
- },
411
- ];
412
- }
413
- );
414
- }
415
-
416
- it("should list secrets", async () => {
417
- mockListRequest({ scriptName: "script-name" });
418
- await runWrangler("secret list --name script-name");
419
- expect(std.out).toMatchInlineSnapshot(`
387
+ expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
388
+ });
389
+ });
390
+
391
+ describe("list", () => {
392
+ function mockListRequest(
393
+ input: { scriptName: string },
394
+ env?: string,
395
+ legacyEnv = false
396
+ ) {
397
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
398
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
399
+ setMockResponse(
400
+ `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
401
+ "GET",
402
+ ([_url, accountId, scriptName, envName]) => {
403
+ expect(accountId).toEqual("some-account-id");
404
+ expect(scriptName).toEqual(
405
+ legacyEnv && env ? `script-name-${env}` : "script-name"
406
+ );
407
+ if (!legacyEnv) {
408
+ expect(envName).toEqual(env);
409
+ }
410
+
411
+ return [
412
+ {
413
+ name: "the-secret-name",
414
+ type: "secret_text",
415
+ },
416
+ ];
417
+ }
418
+ );
419
+ }
420
+
421
+ it("should list secrets", async () => {
422
+ mockListRequest({ scriptName: "script-name" });
423
+ await runWrangler("secret list --name script-name");
424
+ expect(std.out).toMatchInlineSnapshot(`
420
425
  "[
421
426
  {
422
427
  \\"name\\": \\"the-secret-name\\",
@@ -424,15 +429,15 @@ describe("wrangler secret", () => {
424
429
  }
425
430
  ]"
426
431
  `);
427
- expect(std.err).toMatchInlineSnapshot(`""`);
428
- });
429
-
430
- it("should list secrets: legacy envs", async () => {
431
- mockListRequest({ scriptName: "script-name" }, "some-env", true);
432
- await runWrangler(
433
- "secret list --name script-name --env some-env --legacy-env"
434
- );
435
- expect(std.out).toMatchInlineSnapshot(`
432
+ expect(std.err).toMatchInlineSnapshot(`""`);
433
+ });
434
+
435
+ it("should list secrets: legacy envs", async () => {
436
+ mockListRequest({ scriptName: "script-name" }, "some-env", true);
437
+ await runWrangler(
438
+ "secret list --name script-name --env some-env --legacy-env"
439
+ );
440
+ expect(std.out).toMatchInlineSnapshot(`
436
441
  "[
437
442
  {
438
443
  \\"name\\": \\"the-secret-name\\",
@@ -440,15 +445,15 @@ describe("wrangler secret", () => {
440
445
  }
441
446
  ]"
442
447
  `);
443
- expect(std.err).toMatchInlineSnapshot(`""`);
444
- });
445
-
446
- it("should list secrets: service envs", async () => {
447
- mockListRequest({ scriptName: "script-name" }, "some-env");
448
- await runWrangler(
449
- "secret list --name script-name --env some-env --legacy-env false"
450
- );
451
- expect(std.out).toMatchInlineSnapshot(`
448
+ expect(std.err).toMatchInlineSnapshot(`""`);
449
+ });
450
+
451
+ it("should list secrets: service envs", async () => {
452
+ mockListRequest({ scriptName: "script-name" }, "some-env");
453
+ await runWrangler(
454
+ "secret list --name script-name --env some-env --legacy-env false"
455
+ );
456
+ expect(std.out).toMatchInlineSnapshot(`
452
457
  "[
453
458
  {
454
459
  \\"name\\": \\"the-secret-name\\",
@@ -456,26 +461,26 @@ describe("wrangler secret", () => {
456
461
  }
457
462
  ]"
458
463
  `);
459
- expect(std.err).toMatchInlineSnapshot(`""`);
460
- });
461
-
462
- it("should error without a script name", async () => {
463
- let error: Error | undefined;
464
- try {
465
- await runWrangler("secret list");
466
- } catch (e) {
467
- error = e as Error;
468
- }
469
- expect(std.out).toMatchInlineSnapshot(`
464
+ expect(std.err).toMatchInlineSnapshot(`""`);
465
+ });
466
+
467
+ it("should error without a script name", async () => {
468
+ let error: Error | undefined;
469
+ try {
470
+ await runWrangler("secret list");
471
+ } catch (e) {
472
+ error = e as Error;
473
+ }
474
+ expect(std.out).toMatchInlineSnapshot(`
470
475
  "
471
476
  If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
472
477
  `);
473
- expect(std.err).toMatchInlineSnapshot(`
478
+ expect(std.err).toMatchInlineSnapshot(`
474
479
  "X [ERROR] Missing script name
475
480
 
476
481
  "
477
482
  `);
478
- expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
479
- });
480
- });
483
+ expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
484
+ });
485
+ });
481
486
  });