Skip to content

Commit 0737e0f

Browse files
authored
Fix wrangler version secrets with Assets (#6693)
1 parent aea853c commit 0737e0f

File tree

6 files changed

+19
-0
lines changed

6 files changed

+19
-0
lines changed

.changeset/lovely-pigs-bow.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
fix: Persist Workers Assets when doing `wrangler versions secrets put/bulk`

packages/wrangler/src/__tests__/versions/secrets/bulk.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ describe("versions secret put", () => {
5656
"secret_key",
5757
"secret_text",
5858
]);
59+
expect(metadata.keep_assets).toBeTruthy();
5960
});
6061

6162
await runWrangler(
@@ -96,6 +97,7 @@ describe("versions secret put", () => {
9697
"secret_key",
9798
"secret_text",
9899
]);
100+
expect(metadata.keep_assets).toBeTruthy();
99101
});
100102

101103
await runWrangler(`versions secret bulk --name script-name --x-versions`);
@@ -146,6 +148,7 @@ describe("versions secret put", () => {
146148
"secret_key",
147149
"secret_text",
148150
]);
151+
expect(metadata.keep_assets).toBeTruthy();
149152
});
150153

151154
await runWrangler(`versions secret bulk --name script-name --x-versions`);

packages/wrangler/src/__tests__/versions/secrets/put.test.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ describe("versions secret put", () => {
4040
"secret_key",
4141
"secret_text",
4242
]);
43+
expect(metadata.keep_assets).toBeTruthy();
4344
});
4445
await runWrangler(
4546
"versions secret put NEW_SECRET --name script-name --x-versions"
@@ -67,6 +68,7 @@ describe("versions secret put", () => {
6768
"secret_key",
6869
"secret_text",
6970
]);
71+
expect(metadata.keep_assets).toBeTruthy();
7072
});
7173

7274
mockStdIn.send(
@@ -107,6 +109,7 @@ describe("versions secret put", () => {
107109
"secret_key",
108110
"secret_text",
109111
]);
112+
expect(metadata.keep_assets).toBeTruthy();
110113
});
111114
await runWrangler("versions secret put NEW_SECRET --x-versions");
112115

@@ -136,6 +139,7 @@ describe("versions secret put", () => {
136139
"secret_key",
137140
"secret_text",
138141
]);
142+
expect(metadata.keep_assets).toBeTruthy();
139143

140144
expect(metadata.annotations).not.toBeUndefined();
141145
expect(
@@ -172,6 +176,7 @@ describe("versions secret put", () => {
172176
"secret_key",
173177
"secret_text",
174178
]);
179+
expect(metadata.keep_assets).toBeTruthy();
175180

176181
expect(metadata.annotations).not.toBeUndefined();
177182
expect(
@@ -211,6 +216,7 @@ describe("versions secret put", () => {
211216
"secret_key",
212217
"secret_text",
213218
]);
219+
expect(metadata.keep_assets).toBeTruthy();
214220

215221
expect(metadata.annotations).not.toBeUndefined();
216222
expect(
@@ -286,6 +292,7 @@ describe("versions secret put", () => {
286292
"secret_key",
287293
"secret_text",
288294
]);
295+
expect(metadata.keep_assets).toBeTruthy();
289296

290297
expect(metadata.annotations).not.toBeUndefined();
291298
expect(

packages/wrangler/src/deployment-bundle/create-worker-upload-form.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
179179
tail_consumers,
180180
limits,
181181
annotations,
182+
keep_assets,
182183
experimental_assets,
183184
observability,
184185
} = worker;
@@ -585,6 +586,7 @@ export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
585586
...(tail_consumers && { tail_consumers }),
586587
...(limits && { limits }),
587588
...(annotations && { annotations }),
589+
...(keep_assets !== undefined && { keep_assets }),
588590
...(experimental_assets && {
589591
assets: {
590592
jwt: experimental_assets.jwt,

packages/wrangler/src/deployment-bundle/worker.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ export interface CfWorkerInit {
355355
tail_consumers: CfTailConsumer[] | undefined;
356356
limits: CfUserLimits | undefined;
357357
annotations?: Record<string, string | undefined>;
358+
keep_assets?: boolean | undefined;
358359
experimental_assets: CfExperimentalAssets | undefined;
359360
observability: Observability | undefined;
360361
}

packages/wrangler/src/versions/secrets/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ export async function copyWorkerVersionWithNewSecrets({
209209
"workers/message": versionMessage,
210210
"workers/tag": versionTag,
211211
},
212+
keep_assets: true,
212213
experimental_assets: undefined,
213214
observability: scriptSettings.observability,
214215
};

0 commit comments

Comments
 (0)