wrangler 0.0.0-e492c10 → 0.0.0-e4ca780f

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 (360) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +25 -5
  3. package/bin/wrangler.js +174 -34
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +1590 -81
  6. package/package.json +198 -149
  7. package/src/__tests__/access.test.ts +25 -0
  8. package/src/__tests__/api-dev.test.ts +238 -0
  9. package/src/__tests__/api-devregistry.test.ts +121 -0
  10. package/src/__tests__/api.test.ts +102 -0
  11. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  12. package/src/__tests__/config-cache.test.ts +30 -24
  13. package/src/__tests__/configuration.test.ts +4498 -3114
  14. package/src/__tests__/d1/d1.test.ts +82 -0
  15. package/src/__tests__/d1/execute.test.ts +66 -0
  16. package/src/__tests__/d1/migrate.test.ts +157 -0
  17. package/src/__tests__/d1/splitter.test.ts +255 -0
  18. package/src/__tests__/delete.test.ts +272 -0
  19. package/src/__tests__/deployments.test.ts +369 -0
  20. package/src/__tests__/dev.test.tsx +1592 -802
  21. package/src/__tests__/generate.test.ts +237 -0
  22. package/src/__tests__/get-host-from-url.test.ts +16 -0
  23. package/src/__tests__/guess-worker-format.test.ts +103 -68
  24. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  25. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  26. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  27. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  28. package/src/__tests__/helpers/mock-bin.ts +20 -20
  29. package/src/__tests__/helpers/mock-console.ts +64 -39
  30. package/src/__tests__/helpers/mock-dialogs.ts +104 -55
  31. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  32. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  33. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  34. package/src/__tests__/helpers/mock-istty.ts +65 -18
  35. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  36. package/src/__tests__/helpers/mock-kv.ts +41 -28
  37. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  38. package/src/__tests__/helpers/mock-process.ts +34 -0
  39. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  40. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  41. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  42. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  43. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  44. package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
  45. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  46. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  47. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  48. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  49. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  50. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  51. package/src/__tests__/helpers/msw/index.ts +52 -0
  52. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  53. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  54. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  55. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  56. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  58. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
  60. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  61. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  62. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  63. package/src/__tests__/https-options.test.ts +142 -109
  64. package/src/__tests__/index.test.ts +262 -224
  65. package/src/__tests__/init.test.ts +3168 -1488
  66. package/src/__tests__/jest.setup.ts +152 -50
  67. package/src/__tests__/kv.test.ts +1789 -1432
  68. package/src/__tests__/logger.test.ts +167 -75
  69. package/src/__tests__/logout.test.ts +47 -0
  70. package/src/__tests__/metrics.test.ts +493 -0
  71. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  72. package/src/__tests__/middleware.test.ts +816 -0
  73. package/src/__tests__/mtls-certificates.test.ts +588 -0
  74. package/src/__tests__/package-manager.test.ts +312 -165
  75. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  76. package/src/__tests__/pages/functions-build.test.ts +452 -0
  77. package/src/__tests__/pages/pages.test.ts +81 -0
  78. package/src/__tests__/pages/project-create.test.ts +63 -0
  79. package/src/__tests__/pages/project-list.test.ts +110 -0
  80. package/src/__tests__/pages/project-upload.test.ts +500 -0
  81. package/src/__tests__/pages/publish.test.ts +2864 -0
  82. package/src/__tests__/pages-deployment-tail.test.ts +955 -0
  83. package/src/__tests__/parse.test.ts +358 -248
  84. package/src/__tests__/paths.test.ts +39 -0
  85. package/src/__tests__/publish.test.ts +8322 -4847
  86. package/src/__tests__/pubsub.test.ts +496 -0
  87. package/src/__tests__/queues.test.ts +532 -0
  88. package/src/__tests__/r2.test.ts +369 -205
  89. package/src/__tests__/route.test.ts +18 -18
  90. package/src/__tests__/secret.test.ts +683 -436
  91. package/src/__tests__/tail.test.ts +835 -567
  92. package/src/__tests__/test-old-node-version.js +31 -0
  93. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  94. package/src/__tests__/tsconfig-sanity.ts +12 -0
  95. package/src/__tests__/tsconfig.json +8 -0
  96. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  97. package/src/__tests__/type-generation.test.ts +234 -0
  98. package/src/__tests__/user.test.ts +107 -120
  99. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  100. package/src/__tests__/validate-dev-props.test.ts +56 -0
  101. package/src/__tests__/version.test.ts +35 -0
  102. package/src/__tests__/whoami.test.tsx +165 -98
  103. package/src/__tests__/worker-namespace.test.ts +340 -0
  104. package/src/abort.d.ts +3 -0
  105. package/src/api/dev.ts +316 -0
  106. package/src/api/index.ts +11 -0
  107. package/src/api/mtls-certificate.ts +148 -0
  108. package/src/api/pages/create-worker-bundle-contents.ts +76 -0
  109. package/src/api/pages/index.ts +5 -0
  110. package/src/api/pages/publish.tsx +355 -0
  111. package/src/bundle-reporter.ts +68 -0
  112. package/src/bundle.ts +874 -135
  113. package/src/cfetch/index.ts +123 -69
  114. package/src/cfetch/internal.ts +217 -96
  115. package/src/cli.ts +23 -8
  116. package/src/config/config.ts +244 -196
  117. package/src/config/diagnostics.ts +61 -61
  118. package/src/config/environment.ts +563 -339
  119. package/src/config/index.ts +381 -41
  120. package/src/config/validation-helpers.ts +379 -357
  121. package/src/config/validation.ts +2181 -1263
  122. package/src/config-cache.ts +81 -41
  123. package/src/create-worker-preview.ts +250 -132
  124. package/src/create-worker-upload-form.ts +343 -224
  125. package/src/d1/backups.tsx +219 -0
  126. package/src/d1/constants.ts +2 -0
  127. package/src/d1/create.tsx +68 -0
  128. package/src/d1/delete.ts +53 -0
  129. package/src/d1/execute.tsx +357 -0
  130. package/src/d1/formatTimeAgo.ts +14 -0
  131. package/src/d1/index.ts +100 -0
  132. package/src/d1/list.tsx +60 -0
  133. package/src/d1/migrations/apply.tsx +212 -0
  134. package/src/d1/migrations/create.tsx +79 -0
  135. package/src/d1/migrations/helpers.ts +172 -0
  136. package/src/d1/migrations/index.ts +3 -0
  137. package/src/d1/migrations/list.tsx +95 -0
  138. package/src/d1/migrations/options.ts +23 -0
  139. package/src/d1/options.ts +22 -0
  140. package/src/d1/splitter.ts +161 -0
  141. package/src/d1/types.ts +25 -0
  142. package/src/d1/utils.ts +49 -0
  143. package/src/delete.ts +100 -0
  144. package/src/deployments.ts +368 -0
  145. package/src/deprecated/index.ts +144 -0
  146. package/src/dev/dev-vars.ts +20 -17
  147. package/src/dev/dev.tsx +535 -353
  148. package/src/dev/get-local-persistence-path.ts +31 -0
  149. package/src/dev/local.tsx +900 -292
  150. package/src/dev/remote.tsx +620 -201
  151. package/src/dev/start-server.ts +534 -0
  152. package/src/dev/use-esbuild.ts +182 -97
  153. package/src/dev/validate-dev-props.ts +40 -0
  154. package/src/dev-registry.ts +202 -0
  155. package/src/dev.tsx +929 -0
  156. package/src/dialogs.ts +136 -0
  157. package/src/dispatch-namespace.ts +211 -0
  158. package/src/docs/index.ts +97 -0
  159. package/src/durable.ts +102 -0
  160. package/src/entry.ts +259 -189
  161. package/src/environment-variables/factory.ts +88 -0
  162. package/src/environment-variables/misc-variables.ts +30 -0
  163. package/src/errors.ts +6 -6
  164. package/src/generate/index.ts +298 -0
  165. package/src/git-client.ts +135 -0
  166. package/src/global-wrangler-config-path.ts +26 -0
  167. package/src/https-options.ts +84 -80
  168. package/src/index.ts +758 -0
  169. package/src/init.ts +1032 -0
  170. package/src/inspect.ts +721 -562
  171. package/src/intl-polyfill.d.ts +123 -123
  172. package/src/is-ci.ts +14 -0
  173. package/src/is-interactive.ts +16 -0
  174. package/src/jest.d.ts +4 -0
  175. package/src/kv/helpers.ts +430 -0
  176. package/src/kv/index.ts +594 -0
  177. package/src/logger.ts +96 -43
  178. package/src/metrics/index.ts +5 -0
  179. package/src/metrics/metrics-config.ts +239 -0
  180. package/src/metrics/metrics-dispatcher.ts +96 -0
  181. package/src/metrics/metrics-usage-headers.ts +24 -0
  182. package/src/metrics/send-event.ts +99 -0
  183. package/src/miniflare-cli/assets.ts +251 -0
  184. package/src/miniflare-cli/index.ts +202 -33
  185. package/src/miniflare-cli/request-context.ts +18 -18
  186. package/src/miniflare-cli/tsconfig.json +9 -0
  187. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  188. package/src/miniflare-cli/types.ts +11 -0
  189. package/src/module-collection.ts +290 -215
  190. package/src/mtls-certificate/cli.ts +155 -0
  191. package/src/open-in-browser.ts +5 -14
  192. package/src/package-manager.ts +182 -90
  193. package/src/pages/build.ts +410 -0
  194. package/src/pages/buildFunctions.ts +140 -0
  195. package/src/pages/constants.ts +18 -0
  196. package/src/pages/deployment-tails.ts +281 -0
  197. package/src/pages/deployments.tsx +84 -0
  198. package/src/pages/dev.ts +716 -0
  199. package/src/pages/errors.ts +67 -0
  200. package/src/pages/functions/buildPlugin.ts +113 -0
  201. package/src/pages/functions/buildWorker.ts +291 -0
  202. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  203. package/src/pages/functions/filepath-routing.ts +189 -0
  204. package/src/pages/functions/identifiers.ts +78 -0
  205. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  206. package/src/pages/functions/routes-consolidation.ts +73 -0
  207. package/src/pages/functions/routes-transformation.test.ts +282 -0
  208. package/src/pages/functions/routes-transformation.ts +115 -0
  209. package/src/pages/functions/routes-validation.test.ts +403 -0
  210. package/src/pages/functions/routes-validation.ts +202 -0
  211. package/src/pages/functions/routes.ts +151 -0
  212. package/src/pages/functions/tsconfig.json +8 -0
  213. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  214. package/src/pages/functions.ts +86 -0
  215. package/src/pages/hash.ts +13 -0
  216. package/src/pages/index.ts +102 -0
  217. package/src/pages/projects.tsx +159 -0
  218. package/src/pages/prompt-select-project.tsx +31 -0
  219. package/src/pages/publish.tsx +267 -0
  220. package/src/pages/types.ts +46 -0
  221. package/src/pages/upload.tsx +469 -0
  222. package/src/pages/utils.ts +23 -0
  223. package/src/parse.ts +246 -123
  224. package/src/paths.ts +53 -8
  225. package/src/proxy.ts +628 -383
  226. package/src/publish/index.ts +274 -0
  227. package/src/publish/publish.ts +1060 -0
  228. package/src/pubsub/index.ts +286 -0
  229. package/src/pubsub/pubsub-commands.ts +623 -0
  230. package/src/queues/cli/commands/consumer/add.ts +71 -0
  231. package/src/queues/cli/commands/consumer/index.ts +19 -0
  232. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  233. package/src/queues/cli/commands/create.ts +25 -0
  234. package/src/queues/cli/commands/delete.ts +26 -0
  235. package/src/queues/cli/commands/index.ts +35 -0
  236. package/src/queues/cli/commands/list.ts +25 -0
  237. package/src/queues/client.ts +136 -0
  238. package/src/queues/utils.ts +18 -0
  239. package/src/r2/constants.ts +4 -0
  240. package/src/r2/helpers.ts +132 -0
  241. package/src/r2/index.ts +289 -0
  242. package/src/routes.ts +140 -0
  243. package/src/secret/index.ts +376 -0
  244. package/src/selfsigned.d.ts +23 -23
  245. package/src/sites.ts +372 -0
  246. package/src/tail/createTail.ts +406 -0
  247. package/src/tail/filters.ts +109 -111
  248. package/src/tail/index.ts +208 -296
  249. package/src/tail/printing.ts +101 -46
  250. package/src/traverse-module-graph.ts +53 -0
  251. package/src/tsconfig-sanity.ts +16 -0
  252. package/src/type-generation.ts +181 -0
  253. package/src/update-check.ts +11 -11
  254. package/src/user/access.ts +68 -0
  255. package/src/user/auth-variables.ts +113 -0
  256. package/src/user/choose-account.tsx +39 -0
  257. package/src/user/generate-auth-url.ts +33 -0
  258. package/src/user/generate-random-state.ts +16 -0
  259. package/src/user/index.ts +2 -0
  260. package/src/user/user.ts +1233 -0
  261. package/src/utils/collectKeyValues.ts +14 -0
  262. package/src/utils/render.ts +93 -0
  263. package/src/whoami.ts +135 -0
  264. package/src/worker.ts +203 -101
  265. package/src/yargs-types.ts +37 -0
  266. package/src/zones.ts +191 -0
  267. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  268. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  269. package/templates/__tests__/tsconfig.json +8 -0
  270. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  271. package/templates/checked-fetch.js +23 -0
  272. package/templates/d1-beta-facade.js +244 -0
  273. package/templates/facade.d.ts +14 -0
  274. package/templates/first-party-worker-module-facade.ts +19 -0
  275. package/templates/format-dev-errors.ts +34 -0
  276. package/templates/gitignore +1 -0
  277. package/templates/init-tests/test-jest-new-worker.js +23 -0
  278. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  279. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  280. package/templates/middleware/common.ts +62 -0
  281. package/templates/middleware/loader-modules.ts +84 -0
  282. package/templates/middleware/loader-sw.ts +233 -0
  283. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  284. package/templates/middleware/middleware-pretty-error.ts +40 -0
  285. package/templates/middleware/middleware-scheduled.ts +15 -0
  286. package/templates/new-worker-scheduled.js +17 -0
  287. package/templates/new-worker-scheduled.ts +32 -0
  288. package/templates/new-worker.js +3 -3
  289. package/templates/new-worker.ts +21 -3
  290. package/templates/no-op-worker.js +10 -0
  291. package/templates/pages-dev-pipeline.ts +31 -0
  292. package/templates/pages-dev-util.ts +52 -0
  293. package/templates/pages-shim.ts +12 -0
  294. package/templates/pages-template-plugin.ts +180 -0
  295. package/templates/pages-template-worker.ts +189 -0
  296. package/templates/serve-static-assets.ts +66 -0
  297. package/templates/service-bindings-module-facade.js +55 -0
  298. package/templates/service-bindings-sw-facade.js +42 -0
  299. package/templates/tsconfig-sanity.ts +11 -0
  300. package/templates/tsconfig.init.json +105 -0
  301. package/templates/tsconfig.json +6 -103
  302. package/templates/tsconfig.tsbuildinfo +1 -0
  303. package/wrangler-dist/cli.d.ts +1641 -0
  304. package/wrangler-dist/cli.js +129145 -89350
  305. package/wrangler-dist/wasm-sync.wasm +0 -0
  306. package/pages/functions/buildPlugin.ts +0 -92
  307. package/pages/functions/buildWorker.ts +0 -138
  308. package/pages/functions/filepath-routing.ts +0 -189
  309. package/pages/functions/identifiers.ts +0 -78
  310. package/pages/functions/routes.ts +0 -156
  311. package/pages/functions/template-plugin.ts +0 -146
  312. package/pages/functions/template-worker.ts +0 -143
  313. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  314. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  315. package/src/__tests__/pages.test.ts +0 -327
  316. package/src/dialogs.tsx +0 -87
  317. package/src/environment-variables.ts +0 -35
  318. package/src/index.tsx +0 -2698
  319. package/src/kv.ts +0 -319
  320. package/src/miniflare-cli/enum-keys.ts +0 -17
  321. package/src/pages.tsx +0 -1875
  322. package/src/publish.ts +0 -469
  323. package/src/r2.ts +0 -50
  324. package/src/sites.tsx +0 -293
  325. package/src/user.tsx +0 -1203
  326. package/src/whoami.tsx +0 -70
  327. package/templates/static-asset-facade.js +0 -47
  328. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  329. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  330. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  331. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  332. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  333. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  334. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  335. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  336. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  337. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  338. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  339. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  340. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  341. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  342. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  343. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  344. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  345. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  346. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  347. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  348. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  349. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  350. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  351. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  352. package/vendor/wrangler-mime/LICENSE +0 -21
  353. package/vendor/wrangler-mime/Mime.js +0 -97
  354. package/vendor/wrangler-mime/README.md +0 -187
  355. package/vendor/wrangler-mime/cli.js +0 -46
  356. package/vendor/wrangler-mime/index.js +0 -4
  357. package/vendor/wrangler-mime/lite.js +0 -4
  358. package/vendor/wrangler-mime/package.json +0 -52
  359. package/vendor/wrangler-mime/types/other.js +0 -1
  360. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,446 +1,693 @@
1
1
  import * as fs from "node:fs";
2
+ import { writeFileSync } from "node:fs";
2
3
  import * as TOML from "@iarna/toml";
4
+ import { rest } from "msw";
3
5
  import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
4
- import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
5
6
  import { mockConsoleMethods } from "./helpers/mock-console";
6
- import {
7
- mockConfirm,
8
- mockPrompt,
9
- clearConfirmMocks,
10
- clearPromptMocks,
11
- } from "./helpers/mock-dialogs";
12
- import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
7
+ import { mockConfirm, mockPrompt, clearDialogs } from "./helpers/mock-dialogs";
8
+ import { useMockIsTTY } from "./helpers/mock-istty";
9
+ import { mockGetMembershipsFail } from "./helpers/mock-oauth-flow";
13
10
  import { useMockStdin } from "./helpers/mock-stdin";
11
+ import { msw } from "./helpers/msw";
14
12
  import { runInTempDir } from "./helpers/run-in-tmp";
15
13
  import { runWrangler } from "./helpers/run-wrangler";
16
14
 
15
+ function createFetchResult(result: unknown, success = true) {
16
+ return {
17
+ success,
18
+ errors: [],
19
+ messages: [],
20
+ result,
21
+ };
22
+ }
23
+
24
+ export function mockGetMemberships(
25
+ accounts: { id: string; account: { id: string; name: string } }[]
26
+ ) {
27
+ msw.use(
28
+ rest.get("*/memberships", (req, res, ctx) => {
29
+ return res.once(ctx.json(createFetchResult(accounts)));
30
+ })
31
+ );
32
+ }
33
+
17
34
  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 create a secret", async () => {
64
- mockPrompt({
65
- text: "Enter a secret value:",
66
- type: "password",
67
- result: "the-secret",
68
- });
69
-
70
- mockPutRequest({ name: "the-key", text: "the-secret" });
71
- await runWrangler("secret put the-key --name script-name");
72
-
73
- expect(std.out).toMatchInlineSnapshot(`
74
- "🌀 Creating the secret for script script-name
75
- ✨ Success! Uploaded secret the-key"
76
- `);
77
- expect(std.err).toMatchInlineSnapshot(`""`);
78
- });
79
-
80
- it("should create a secret: legacy envs", async () => {
81
- mockPrompt({
82
- text: "Enter a secret value:",
83
- type: "password",
84
- result: "the-secret",
85
- });
86
-
87
- mockPutRequest(
88
- { name: "the-key", text: "the-secret" },
89
- "some-env",
90
- true
91
- );
92
- await runWrangler(
93
- "secret put the-key --name script-name --env some-env --legacy-env"
94
- );
95
-
96
- expect(std.out).toMatchInlineSnapshot(`
97
- "🌀 Creating the secret for script script-name-some-env
98
- ✨ Success! Uploaded secret the-key"
99
- `);
100
- expect(std.err).toMatchInlineSnapshot(`""`);
101
- });
102
-
103
- it("should create a secret: service envs", async () => {
104
- mockPrompt({
105
- text: "Enter a secret value:",
106
- type: "password",
107
- result: "the-secret",
108
- });
109
-
110
- mockPutRequest(
111
- { name: "the-key", text: "the-secret" },
112
- "some-env",
113
- false
114
- );
115
- await runWrangler(
116
- "secret put the-key --name script-name --env some-env --legacy-env false"
117
- );
118
-
119
- expect(std.out).toMatchInlineSnapshot(`
120
- "🌀 Creating the secret for script script-name (some-env)
121
- ✨ Success! Uploaded secret the-key"
122
- `);
123
- expect(std.err).toMatchInlineSnapshot(`""`);
124
- });
125
-
126
- it("should error without a script name", async () => {
127
- let error: Error | undefined;
128
- try {
129
- await runWrangler("secret put the-key");
130
- } catch (e) {
131
- error = e as Error;
132
- }
133
- expect(std.out).toMatchInlineSnapshot(`
134
- "
135
- If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
136
- `);
137
- expect(std.err).toMatchInlineSnapshot(`
138
- "X [ERROR] Missing script name
139
-
140
- "
141
- `);
142
- expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
143
- });
144
- });
145
-
146
- describe("non-interactive", () => {
147
- const mockStdIn = useMockStdin({ isTTY: false });
148
-
149
- it("should create a secret, from piped input", async () => {
150
- mockPutRequest({ name: "the-key", text: "the-secret" });
151
- // Pipe the secret in as three chunks to test that we reconstitute it correctly.
152
- mockStdIn.send("the", "-", "secret");
153
- await runWrangler("secret put the-key --name script-name");
154
-
155
- expect(std.out).toMatchInlineSnapshot(`
156
- "🌀 Creating the secret for script script-name
157
- ✨ Success! Uploaded secret the-key"
158
- `);
159
- expect(std.warn).toMatchInlineSnapshot(`""`);
160
- expect(std.err).toMatchInlineSnapshot(`""`);
161
- });
162
-
163
- it("should error if the piped input fails", async () => {
164
- mockPutRequest({ name: "the-key", text: "the-secret" });
165
- mockStdIn.throwError(new Error("Error in stdin stream"));
166
- await expect(
167
- runWrangler("secret put the-key --name script-name")
168
- ).rejects.toThrowErrorMatchingInlineSnapshot(`"Error in stdin stream"`);
169
-
170
- expect(std.out).toMatchInlineSnapshot(`
171
- "
172
- If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
173
- `);
174
- expect(std.warn).toMatchInlineSnapshot(`""`);
175
- });
176
-
177
- describe("with accountId", () => {
178
- mockAccountId({ accountId: null });
179
-
180
- it("should error if a user has no account", async () => {
181
- mockGetMemberships({
182
- success: false,
183
- result: [],
184
- });
185
- await expect(
186
- runWrangler("secret put the-key --name script-name")
187
- ).rejects.toThrowErrorMatchingInlineSnapshot(
188
- `"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."`
189
- );
190
- });
191
-
192
- it("should use the account from wrangler.toml", async () => {
193
- fs.writeFileSync(
194
- "wrangler.toml",
195
- TOML.stringify({
196
- account_id: "some-account-id",
197
- }),
198
- "utf-8"
199
- );
200
- mockStdIn.send("the-secret");
201
- mockPutRequest({ name: "the-key", text: "the-secret" });
202
- await runWrangler("secret put the-key --name script-name");
203
- expect(std.out).toMatchInlineSnapshot(`
204
- "🌀 Creating the secret for script script-name
205
- ✨ Success! Uploaded secret the-key"
206
- `);
207
- expect(std.warn).toMatchInlineSnapshot(`""`);
208
- expect(std.err).toMatchInlineSnapshot(`""`);
209
- });
210
-
211
- it("should error if a user has multiple accounts, and has not specified an account in wrangler.toml", async () => {
212
- mockGetMemberships({
213
- success: true,
214
- result: [
215
- {
216
- id: "1",
217
- account: { id: "account-id-1", name: "account-name-1" },
218
- },
219
- {
220
- id: "2",
221
- account: { id: "account-id-2", name: "account-name-2" },
222
- },
223
- {
224
- id: "3",
225
- account: { id: "account-id-3", name: "account-name-3" },
226
- },
227
- ],
228
- });
229
-
230
- await expect(runWrangler("secret put the-key --name script-name"))
231
- .rejects.toThrowErrorMatchingInlineSnapshot(`
232
- "More than one account available but unable to select one in non-interactive mode.
233
- Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
234
- Available accounts are (\\"<name>\\" - \\"<id>\\"):
235
- \\"account-name-1\\" - \\"account-id-1\\")
236
- \\"account-name-2\\" - \\"account-id-2\\")
237
- \\"account-name-3\\" - \\"account-id-3\\")"
238
- `);
239
- });
240
- });
241
- });
242
- });
243
-
244
- describe("delete", () => {
245
- function mockDeleteRequest(
246
- input: {
247
- scriptName: string;
248
- secretName: string;
249
- },
250
- env?: string,
251
- legacyEnv = false
252
- ) {
253
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
254
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
255
- setMockResponse(
256
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
257
- "DELETE",
258
- ([_url, accountId, scriptName, envOrSecretName, secretName]) => {
259
- expect(accountId).toEqual("some-account-id");
260
- expect(scriptName).toEqual(
261
- legacyEnv && env ? `script-name-${env}` : "script-name"
262
- );
263
- if (!legacyEnv) {
264
- if (env) {
265
- expect(envOrSecretName).toEqual(env);
266
- expect(secretName).toEqual(input.secretName);
267
- } else {
268
- expect(envOrSecretName).toEqual(input.secretName);
269
- }
270
- } else {
271
- expect(envOrSecretName).toEqual(input.secretName);
272
- }
273
- return null;
274
- }
275
- );
276
- }
277
- it("should delete a secret", async () => {
278
- mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
279
- mockConfirm({
280
- text: "Are you sure you want to permanently delete the variable the-key on the script script-name?",
281
- result: true,
282
- });
283
- await runWrangler("secret delete the-key --name script-name");
284
- expect(std.out).toMatchInlineSnapshot(`
285
- "🌀 Deleting the secret the-key on script script-name
286
- ✨ Success! Deleted secret the-key"
287
- `);
288
- expect(std.err).toMatchInlineSnapshot(`""`);
289
- });
290
-
291
- it("should delete a secret: legacy envs", async () => {
292
- mockDeleteRequest(
293
- { scriptName: "script-name", secretName: "the-key" },
294
- "some-env",
295
- true
296
- );
297
- mockConfirm({
298
- text: "Are you sure you want to permanently delete the variable the-key on the script script-name-some-env?",
299
- result: true,
300
- });
301
- await runWrangler(
302
- "secret delete the-key --name script-name --env some-env --legacy-env"
303
- );
304
- expect(std.out).toMatchInlineSnapshot(`
305
- "🌀 Deleting the secret the-key on script script-name-some-env
306
- ✨ Success! Deleted secret the-key"
307
- `);
308
- expect(std.err).toMatchInlineSnapshot(`""`);
309
- });
310
-
311
- it("should delete a secret: service envs", async () => {
312
- mockDeleteRequest(
313
- { scriptName: "script-name", secretName: "the-key" },
314
- "some-env"
315
- );
316
- mockConfirm({
317
- text: "Are you sure you want to permanently delete the variable the-key on the script script-name (some-env)?",
318
- result: true,
319
- });
320
- await runWrangler(
321
- "secret delete the-key --name script-name --env some-env --legacy-env false"
322
- );
323
- expect(std.out).toMatchInlineSnapshot(`
324
- "🌀 Deleting the secret the-key on script script-name (some-env)
325
- ✨ Success! Deleted secret the-key"
326
- `);
327
- expect(std.err).toMatchInlineSnapshot(`""`);
328
- });
329
-
330
- it("should error without a script name", async () => {
331
- let error: Error | undefined;
332
-
333
- try {
334
- await runWrangler("secret delete the-key");
335
- } catch (e) {
336
- error = e as Error;
337
- }
338
- expect(std.out).toMatchInlineSnapshot(`
339
- "
340
- If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
341
- `);
342
- expect(std.err).toMatchInlineSnapshot(`
343
- "X [ERROR] Missing script name
344
-
345
- "
346
- `);
347
- expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
348
- });
349
- });
350
-
351
- describe("list", () => {
352
- function mockListRequest(
353
- input: { scriptName: string },
354
- env?: string,
355
- legacyEnv = false
356
- ) {
357
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
358
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
359
- setMockResponse(
360
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
361
- "GET",
362
- ([_url, accountId, scriptName, envName]) => {
363
- expect(accountId).toEqual("some-account-id");
364
- expect(scriptName).toEqual(
365
- legacyEnv && env ? `script-name-${env}` : "script-name"
366
- );
367
- if (!legacyEnv) {
368
- expect(envName).toEqual(env);
369
- }
370
-
371
- return [
372
- {
373
- name: "the-secret-name",
374
- type: "secret_text",
375
- },
376
- ];
377
- }
378
- );
379
- }
380
-
381
- it("should list secrets", async () => {
382
- mockListRequest({ scriptName: "script-name" });
383
- await runWrangler("secret list --name script-name");
384
- expect(std.out).toMatchInlineSnapshot(`
385
- "[
386
- {
387
- \\"name\\": \\"the-secret-name\\",
388
- \\"type\\": \\"secret_text\\"
389
- }
390
- ]"
391
- `);
392
- expect(std.err).toMatchInlineSnapshot(`""`);
393
- });
394
-
395
- it("should list secrets: legacy envs", async () => {
396
- mockListRequest({ scriptName: "script-name" }, "some-env", true);
397
- await runWrangler(
398
- "secret list --name script-name --env some-env --legacy-env"
399
- );
400
- expect(std.out).toMatchInlineSnapshot(`
401
- "[
402
- {
403
- \\"name\\": \\"the-secret-name\\",
404
- \\"type\\": \\"secret_text\\"
405
- }
406
- ]"
407
- `);
408
- expect(std.err).toMatchInlineSnapshot(`""`);
409
- });
410
-
411
- it("should list secrets: service envs", async () => {
412
- mockListRequest({ scriptName: "script-name" }, "some-env");
413
- await runWrangler(
414
- "secret list --name script-name --env some-env --legacy-env false"
415
- );
416
- expect(std.out).toMatchInlineSnapshot(`
417
- "[
418
- {
419
- \\"name\\": \\"the-secret-name\\",
420
- \\"type\\": \\"secret_text\\"
421
- }
422
- ]"
423
- `);
424
- expect(std.err).toMatchInlineSnapshot(`""`);
425
- });
426
-
427
- it("should error without a script name", async () => {
428
- let error: Error | undefined;
429
- try {
430
- await runWrangler("secret list");
431
- } catch (e) {
432
- error = e as Error;
433
- }
434
- expect(std.out).toMatchInlineSnapshot(`
435
- "
436
- If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
437
- `);
438
- expect(std.err).toMatchInlineSnapshot(`
439
- "X [ERROR] Missing script name
440
-
441
- "
442
- `);
443
- expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
444
- });
445
- });
35
+ const std = mockConsoleMethods();
36
+ const { setIsTTY } = useMockIsTTY();
37
+ runInTempDir();
38
+ mockAccountId();
39
+ mockApiToken();
40
+ afterEach(() => {
41
+ clearDialogs();
42
+ });
43
+
44
+ describe("put", () => {
45
+ function mockPutRequest(
46
+ input: { name: string; text: string },
47
+ env?: string,
48
+ legacyEnv = false
49
+ ) {
50
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
51
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
52
+ msw.use(
53
+ rest.put(
54
+ `*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
55
+ async (req, res, ctx) => {
56
+ expect(req.params.accountId).toEqual("some-account-id");
57
+ expect(req.params.scriptName).toEqual(
58
+ legacyEnv && env ? `script-name-${env}` : "script-name"
59
+ );
60
+ if (!legacyEnv) {
61
+ expect(req.params.envName).toEqual(env);
62
+ }
63
+ const { name, text, type } = await req.json();
64
+ expect(type).toEqual("secret_text");
65
+ expect(name).toEqual(input.name);
66
+ expect(text).toEqual(input.text);
67
+
68
+ return res.once(ctx.json(createFetchResult({ name, type })));
69
+ }
70
+ )
71
+ );
72
+ }
73
+
74
+ describe("interactive", () => {
75
+ beforeEach(() => {
76
+ setIsTTY(true);
77
+ });
78
+
79
+ it("should trim stdin secret value", async () => {
80
+ mockPrompt({
81
+ text: "Enter a secret value:",
82
+ options: { isSecret: true },
83
+ result: `hunter2
84
+ `,
85
+ });
86
+
87
+ mockPutRequest({ name: `secret-name`, text: `hunter2` });
88
+ await runWrangler("secret put secret-name --name script-name");
89
+ expect(std.out).toMatchInlineSnapshot(`
90
+ "🌀 Creating the secret for the Worker \\"script-name\\"
91
+ ✨ Success! Uploaded secret secret-name"
92
+ `);
93
+ });
94
+
95
+ it("should create a secret", async () => {
96
+ mockPrompt({
97
+ text: "Enter a secret value:",
98
+ options: { isSecret: true },
99
+ result: "the-secret",
100
+ });
101
+
102
+ mockPutRequest({ name: "the-key", text: "the-secret" });
103
+ await runWrangler("secret put the-key --name script-name");
104
+
105
+ expect(std.out).toMatchInlineSnapshot(`
106
+ "🌀 Creating the secret for the Worker \\"script-name\\"
107
+ ✨ Success! Uploaded secret the-key"
108
+ `);
109
+ expect(std.err).toMatchInlineSnapshot(`""`);
110
+ });
111
+
112
+ it("should create secret:bulk", async () => {
113
+ writeFileSync(
114
+ "secret.json",
115
+ JSON.stringify({
116
+ "secret-name-1": "secret_text",
117
+ "secret-name-2": "secret_text",
118
+ })
119
+ );
120
+
121
+ // User counter to pass different secrets to the request mock
122
+ let counter = 0;
123
+ msw.use(
124
+ rest.put(
125
+ `*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
126
+ (req, res, ctx) => {
127
+ expect(req.params.accountId).toEqual("some-account-id");
128
+ counter++;
129
+
130
+ return res(
131
+ ctx.json(
132
+ createFetchResult({
133
+ name: `secret-name-${counter}`,
134
+ type: "secret_text",
135
+ })
136
+ )
137
+ );
138
+ }
139
+ )
140
+ );
141
+
142
+ await runWrangler("secret:bulk ./secret.json --name script-name");
143
+
144
+ expect(std.out).toMatchInlineSnapshot(`
145
+ "🌀 Creating the secrets for the Worker \\"script-name\\"
146
+ ✨ Successfully created secret for key: secret-name-1
147
+ ✨ Successfully created secret for key: secret-name-2
148
+
149
+ Finished processing secrets JSON file:
150
+ ✨ 2 secrets successfully uploaded"
151
+ `);
152
+ expect(std.err).toMatchInlineSnapshot(`""`);
153
+ });
154
+
155
+ it("should handle network failure on secret:bulk", async () => {
156
+ writeFileSync(
157
+ "secret.json",
158
+ JSON.stringify({
159
+ "secret-name-1": "secret_text",
160
+ "secret-name-2": "secret_text",
161
+ })
162
+ );
163
+
164
+ // User counter to pass different secrets to the request mock
165
+ let counter = 0;
166
+ msw.use(
167
+ rest.put(
168
+ `*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
169
+ (req, res) => {
170
+ expect(req.params.accountId).toEqual("some-account-id");
171
+ counter++;
172
+
173
+ return res.networkError(`Failed to create secret ${counter}`);
174
+ }
175
+ )
176
+ );
177
+
178
+ await runWrangler("secret:bulk ./secret.json --name script-name");
179
+
180
+ expect(std.out).toMatchInlineSnapshot(`
181
+ "🌀 Creating the secrets for the Worker \\"script-name\\"
182
+
183
+ Finished processing secrets JSON file:
184
+ ✨ 0 secrets successfully uploaded
185
+ 🚨 2 secrets failed to upload"
186
+ `);
187
+ expect(std.err).toMatchInlineSnapshot(`
188
+ "X [ERROR] 🚨 Error uploading secret for key: secret-name-1:
189
+
190
+ request to
191
+ https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
192
+ failed, reason: Failed to create secret 1
193
+
194
+
195
+ X [ERROR] 🚨 Error uploading secret for key: secret-name-2:
196
+
197
+ request to
198
+ https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
199
+ failed, reason: Failed to create secret 2
200
+
201
+ "
202
+ `);
203
+ });
204
+
205
+ it("should count success and network failure on secret:bulk", async () => {
206
+ writeFileSync(
207
+ "secret.json",
208
+ JSON.stringify({
209
+ "secret-name-1": "secret_text",
210
+ "secret-name-2": "secret_text",
211
+ "secret-name-3": "secret_text",
212
+ "secret-name-4": "secret_text",
213
+ "secret-name-5": "secret_text",
214
+ "secret-name-6": "secret_text",
215
+ "secret-name-7": "secret_text",
216
+ })
217
+ );
218
+
219
+ // User counter to pass different secrets to the request mock
220
+ let counter = 0;
221
+ msw.use(
222
+ rest.put(
223
+ `*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
224
+ (req, res, ctx) => {
225
+ expect(req.params.accountId).toEqual("some-account-id");
226
+ counter++;
227
+
228
+ if (counter % 2 === 0) {
229
+ return res(
230
+ ctx.json(
231
+ createFetchResult({
232
+ name: `secret-name-${counter}`,
233
+ type: "secret_text",
234
+ })
235
+ )
236
+ );
237
+ } else {
238
+ return res.networkError(`Failed to create secret ${counter}`);
239
+ }
240
+ }
241
+ )
242
+ );
243
+
244
+ await runWrangler("secret:bulk ./secret.json --name script-name");
245
+
246
+ expect(std.out).toMatchInlineSnapshot(`
247
+ "🌀 Creating the secrets for the Worker \\"script-name\\"
248
+ ✨ Successfully created secret for key: secret-name-2
249
+ ✨ Successfully created secret for key: secret-name-4
250
+ ✨ Successfully created secret for key: secret-name-6
251
+
252
+ Finished processing secrets JSON file:
253
+ ✨ 3 secrets successfully uploaded
254
+ 🚨 4 secrets failed to upload"
255
+ `);
256
+ expect(std.err).toMatchInlineSnapshot(`
257
+ "X [ERROR] 🚨 Error uploading secret for key: secret-name-1:
258
+
259
+ request to
260
+ https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
261
+ failed, reason: Failed to create secret 1
262
+
263
+
264
+ X [ERROR] 🚨 Error uploading secret for key: secret-name-3:
265
+
266
+ request to
267
+ https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
268
+ failed, reason: Failed to create secret 3
269
+
270
+
271
+ X [ERROR] 🚨 Error uploading secret for key: secret-name-5:
272
+
273
+ request to
274
+ https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
275
+ failed, reason: Failed to create secret 5
276
+
277
+
278
+ X [ERROR] 🚨 Error uploading secret for key: secret-name-7:
279
+
280
+ request to
281
+ https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
282
+ failed, reason: Failed to create secret 7
283
+
284
+ "
285
+ `);
286
+ });
287
+
288
+ it("should create a secret: legacy envs", async () => {
289
+ mockPrompt({
290
+ text: "Enter a secret value:",
291
+ options: { isSecret: true },
292
+ result: "the-secret",
293
+ });
294
+
295
+ mockPutRequest(
296
+ { name: "the-key", text: "the-secret" },
297
+ "some-env",
298
+ true
299
+ );
300
+ await runWrangler(
301
+ "secret put the-key --name script-name --env some-env --legacy-env"
302
+ );
303
+
304
+ expect(std.out).toMatchInlineSnapshot(`
305
+ "🌀 Creating the secret for the Worker \\"script-name-some-env\\"
306
+ ✨ Success! Uploaded secret the-key"
307
+ `);
308
+ expect(std.err).toMatchInlineSnapshot(`""`);
309
+ });
310
+
311
+ it("should create a secret: service envs", async () => {
312
+ mockPrompt({
313
+ text: "Enter a secret value:",
314
+ options: { isSecret: true },
315
+ result: "the-secret",
316
+ });
317
+
318
+ mockPutRequest(
319
+ { name: "the-key", text: "the-secret" },
320
+ "some-env",
321
+ false
322
+ );
323
+ await runWrangler(
324
+ "secret put the-key --name script-name --env some-env --legacy-env false"
325
+ );
326
+
327
+ expect(std.out).toMatchInlineSnapshot(`
328
+ "🌀 Creating the secret for the Worker \\"script-name\\" (some-env)
329
+ ✨ Success! Uploaded secret the-key"
330
+ `);
331
+ expect(std.err).toMatchInlineSnapshot(`""`);
332
+ });
333
+
334
+ it("should error without a script name", async () => {
335
+ let error: Error | undefined;
336
+ try {
337
+ await runWrangler("secret put the-key");
338
+ } catch (e) {
339
+ error = e as Error;
340
+ }
341
+ expect(std.out).toMatchInlineSnapshot(`
342
+ "
343
+ If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
344
+ `);
345
+ expect(std.err).toMatchInlineSnapshot(`
346
+ "X [ERROR] Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`
347
+
348
+ "
349
+ `);
350
+ expect(error).toMatchInlineSnapshot(
351
+ `[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`]`
352
+ );
353
+ });
354
+ });
355
+
356
+ describe("non-interactive", () => {
357
+ beforeEach(() => {
358
+ setIsTTY(false);
359
+ });
360
+ const mockStdIn = useMockStdin({ isTTY: false });
361
+
362
+ it("should trim stdin secret value, from piped input", async () => {
363
+ mockPutRequest({ name: "the-key", text: "the-secret" });
364
+ // Pipe the secret in as three chunks to test that we reconstitute it correctly.
365
+ mockStdIn.send(
366
+ `the`,
367
+ `-`,
368
+ `secret
369
+ ` // whitespace & newline being removed
370
+ );
371
+ await runWrangler("secret put the-key --name script-name");
372
+
373
+ expect(std.out).toMatchInlineSnapshot(`
374
+ "🌀 Creating the secret for the Worker \\"script-name\\"
375
+ ✨ Success! Uploaded secret the-key"
376
+ `);
377
+ expect(std.warn).toMatchInlineSnapshot(`""`);
378
+ expect(std.err).toMatchInlineSnapshot(`""`);
379
+ });
380
+
381
+ it("should create a secret, from piped input", async () => {
382
+ mockPutRequest({ name: "the-key", text: "the-secret" });
383
+ // Pipe the secret in as three chunks to test that we reconstitute it correctly.
384
+ mockStdIn.send("the", "-", "secret");
385
+ await runWrangler("secret put the-key --name script-name");
386
+
387
+ expect(std.out).toMatchInlineSnapshot(`
388
+ "🌀 Creating the secret for the Worker \\"script-name\\"
389
+ ✨ Success! Uploaded secret the-key"
390
+ `);
391
+ expect(std.warn).toMatchInlineSnapshot(`""`);
392
+ expect(std.err).toMatchInlineSnapshot(`""`);
393
+ });
394
+
395
+ it("should error if the piped input fails", async () => {
396
+ mockPutRequest({ name: "the-key", text: "the-secret" });
397
+ mockStdIn.throwError(new Error("Error in stdin stream"));
398
+ await expect(
399
+ runWrangler("secret put the-key --name script-name")
400
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"Error in stdin stream"`);
401
+
402
+ expect(std.out).toMatchInlineSnapshot(`
403
+ "
404
+ If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
405
+ `);
406
+ expect(std.warn).toMatchInlineSnapshot(`""`);
407
+ });
408
+
409
+ describe("with accountId", () => {
410
+ mockAccountId({ accountId: null });
411
+
412
+ it("should error if request for memberships fails", async () => {
413
+ mockGetMembershipsFail();
414
+ await expect(
415
+ runWrangler("secret put the-key --name script-name")
416
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
417
+ `"A request to the Cloudflare API (/memberships) failed."`
418
+ );
419
+ });
420
+
421
+ it("should error if a user has no account", async () => {
422
+ mockGetMemberships([]);
423
+ await expect(runWrangler("secret put the-key --name script-name"))
424
+ .rejects.toThrowErrorMatchingInlineSnapshot(`
425
+ "Failed to automatically retrieve account IDs for the logged in user.
426
+ 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."
427
+ `);
428
+ });
429
+
430
+ it("should use the account from wrangler.toml", async () => {
431
+ fs.writeFileSync(
432
+ "wrangler.toml",
433
+ TOML.stringify({
434
+ account_id: "some-account-id",
435
+ }),
436
+ "utf-8"
437
+ );
438
+ mockStdIn.send("the-secret");
439
+ mockPutRequest({ name: "the-key", text: "the-secret" });
440
+ await runWrangler("secret put the-key --name script-name");
441
+ expect(std.out).toMatchInlineSnapshot(`
442
+ "🌀 Creating the secret for the Worker \\"script-name\\"
443
+ ✨ Success! Uploaded secret the-key"
444
+ `);
445
+ expect(std.warn).toMatchInlineSnapshot(`""`);
446
+ expect(std.err).toMatchInlineSnapshot(`""`);
447
+ });
448
+
449
+ it("should error if a user has multiple accounts, and has not specified an account in wrangler.toml", async () => {
450
+ mockGetMemberships([
451
+ {
452
+ id: "1",
453
+ account: { id: "account-id-1", name: "account-name-1" },
454
+ },
455
+ {
456
+ id: "2",
457
+ account: { id: "account-id-2", name: "account-name-2" },
458
+ },
459
+ {
460
+ id: "3",
461
+ account: { id: "account-id-3", name: "account-name-3" },
462
+ },
463
+ ]);
464
+
465
+ await expect(runWrangler("secret put the-key --name script-name"))
466
+ .rejects.toThrowErrorMatchingInlineSnapshot(`
467
+ "More than one account available but unable to select one in non-interactive mode.
468
+ Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
469
+ Available accounts are (\`<name>\`: \`<account_id>\`):
470
+ \`account-name-1\`: \`account-id-1\`
471
+ \`account-name-2\`: \`account-id-2\`
472
+ \`account-name-3\`: \`account-id-3\`"
473
+ `);
474
+ });
475
+ });
476
+ });
477
+ });
478
+
479
+ describe("delete", () => {
480
+ beforeEach(() => {
481
+ setIsTTY(true);
482
+ });
483
+ function mockDeleteRequest(
484
+ input: {
485
+ scriptName: string;
486
+ secretName: string;
487
+ },
488
+ env?: string,
489
+ legacyEnv = false
490
+ ) {
491
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
492
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
493
+ msw.use(
494
+ rest.delete(
495
+ `*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
496
+ (req, res, ctx) => {
497
+ expect(req.params.accountId).toEqual("some-account-id");
498
+ expect(req.params.scriptName).toEqual(
499
+ legacyEnv && env ? `script-name-${env}` : "script-name"
500
+ );
501
+ if (!legacyEnv) {
502
+ if (env) {
503
+ expect(req.params.secretName).toEqual(input.secretName);
504
+ }
505
+ }
506
+ return res.once(ctx.json(createFetchResult(null)));
507
+ }
508
+ )
509
+ );
510
+ }
511
+
512
+ it("should delete a secret", async () => {
513
+ mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
514
+ mockConfirm({
515
+ text: "Are you sure you want to permanently delete the secret the-key on the Worker script-name?",
516
+ result: true,
517
+ });
518
+ await runWrangler("secret delete the-key --name script-name");
519
+ expect(std.out).toMatchInlineSnapshot(`
520
+ "🌀 Deleting the secret the-key on the Worker script-name
521
+ ✨ Success! Deleted secret the-key"
522
+ `);
523
+ expect(std.err).toMatchInlineSnapshot(`""`);
524
+ });
525
+
526
+ it("should delete a secret: legacy envs", async () => {
527
+ mockDeleteRequest(
528
+ { scriptName: "script-name", secretName: "the-key" },
529
+ "some-env",
530
+ true
531
+ );
532
+ mockConfirm({
533
+ text: "Are you sure you want to permanently delete the secret the-key on the Worker script-name-some-env?",
534
+ result: true,
535
+ });
536
+ await runWrangler(
537
+ "secret delete the-key --name script-name --env some-env --legacy-env"
538
+ );
539
+ expect(std.out).toMatchInlineSnapshot(`
540
+ "🌀 Deleting the secret the-key on the Worker script-name-some-env
541
+ ✨ Success! Deleted secret the-key"
542
+ `);
543
+ expect(std.err).toMatchInlineSnapshot(`""`);
544
+ });
545
+
546
+ it("should delete a secret: service envs", async () => {
547
+ mockDeleteRequest(
548
+ { scriptName: "script-name", secretName: "the-key" },
549
+ "some-env"
550
+ );
551
+ mockConfirm({
552
+ text: "Are you sure you want to permanently delete the secret the-key on the Worker script-name (some-env)?",
553
+ result: true,
554
+ });
555
+ await runWrangler(
556
+ "secret delete the-key --name script-name --env some-env --legacy-env false"
557
+ );
558
+ expect(std.out).toMatchInlineSnapshot(`
559
+ "🌀 Deleting the secret the-key on the Worker script-name (some-env)
560
+ ✨ Success! Deleted secret the-key"
561
+ `);
562
+ expect(std.err).toMatchInlineSnapshot(`""`);
563
+ });
564
+
565
+ it("should error without a script name", async () => {
566
+ let error: Error | undefined;
567
+
568
+ try {
569
+ await runWrangler("secret delete the-key");
570
+ } catch (e) {
571
+ error = e as Error;
572
+ }
573
+ expect(std.out).toMatchInlineSnapshot(`
574
+ "
575
+ If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
576
+ `);
577
+ expect(std.err).toMatchInlineSnapshot(`
578
+ "X [ERROR] Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`
579
+
580
+ "
581
+ `);
582
+ expect(error).toMatchInlineSnapshot(
583
+ `[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`]`
584
+ );
585
+ });
586
+ });
587
+
588
+ describe("list", () => {
589
+ beforeEach(() => {
590
+ setIsTTY(true);
591
+ });
592
+ function mockListRequest(
593
+ input: { scriptName: string },
594
+ env?: string,
595
+ legacyEnv = false
596
+ ) {
597
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
598
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
599
+ msw.use(
600
+ rest.get(
601
+ `*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
602
+ (req, res, ctx) => {
603
+ expect(req.params.accountId).toEqual("some-account-id");
604
+ expect(req.params.scriptName).toEqual(
605
+ legacyEnv && env ? `script-name-${env}` : "script-name"
606
+ );
607
+ if (!legacyEnv) {
608
+ expect(req.params.envName).toEqual(env);
609
+ }
610
+
611
+ return res.once(
612
+ ctx.json(
613
+ createFetchResult([
614
+ {
615
+ name: "the-secret-name",
616
+ type: "secret_text",
617
+ },
618
+ ])
619
+ )
620
+ );
621
+ }
622
+ )
623
+ );
624
+ }
625
+
626
+ it("should list secrets", async () => {
627
+ mockListRequest({ scriptName: "script-name" });
628
+ await runWrangler("secret list --name script-name");
629
+ expect(std.out).toMatchInlineSnapshot(`
630
+ "[
631
+ {
632
+ \\"name\\": \\"the-secret-name\\",
633
+ \\"type\\": \\"secret_text\\"
634
+ }
635
+ ]"
636
+ `);
637
+ expect(std.err).toMatchInlineSnapshot(`""`);
638
+ });
639
+
640
+ it("should list secrets: legacy envs", async () => {
641
+ mockListRequest({ scriptName: "script-name" }, "some-env", true);
642
+ await runWrangler(
643
+ "secret list --name script-name --env some-env --legacy-env"
644
+ );
645
+ expect(std.out).toMatchInlineSnapshot(`
646
+ "[
647
+ {
648
+ \\"name\\": \\"the-secret-name\\",
649
+ \\"type\\": \\"secret_text\\"
650
+ }
651
+ ]"
652
+ `);
653
+ expect(std.err).toMatchInlineSnapshot(`""`);
654
+ });
655
+
656
+ it("should list secrets: service envs", async () => {
657
+ mockListRequest({ scriptName: "script-name" }, "some-env");
658
+ await runWrangler(
659
+ "secret list --name script-name --env some-env --legacy-env false"
660
+ );
661
+ expect(std.out).toMatchInlineSnapshot(`
662
+ "[
663
+ {
664
+ \\"name\\": \\"the-secret-name\\",
665
+ \\"type\\": \\"secret_text\\"
666
+ }
667
+ ]"
668
+ `);
669
+ expect(std.err).toMatchInlineSnapshot(`""`);
670
+ });
671
+
672
+ it("should error without a script name", async () => {
673
+ let error: Error | undefined;
674
+ try {
675
+ await runWrangler("secret list");
676
+ } catch (e) {
677
+ error = e as Error;
678
+ }
679
+ expect(std.out).toMatchInlineSnapshot(`
680
+ "
681
+ If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
682
+ `);
683
+ expect(std.err).toMatchInlineSnapshot(`
684
+ "X [ERROR] Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`
685
+
686
+ "
687
+ `);
688
+ expect(error).toMatchInlineSnapshot(
689
+ `[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`]`
690
+ );
691
+ });
692
+ });
446
693
  });