Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/long-ants-start.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"wrangler": patch
---

fix: assets only versions upload should include tag and message
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Just as an FYI, this will also support preview aliases (new!) since they're uploaded in version annotations)

56 changes: 56 additions & 0 deletions packages/wrangler/e2e/versions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,62 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
`);
});

it("should upload version of Worker with assets only", async () => {
await helper.seed({
"wrangler.toml": dedent`
name = "${workerName}"
compatibility_date = "2023-01-01"

[assets]
directory = "./public"
`,
"public/asset.txt": `beep boop beep boop`,
"package.json": dedent`
{
"name": "${workerName}",
"version": "0.0.0",
"private": true
}
`,
});

const upload = await helper.run(
`wrangler versions upload --message "Upload via e2e test" --tag "e2e-upload-assets"`
);

expect(normalize(upload.stdout)).toMatchInlineSnapshot(`
"🌀 Building list of assets...
✨ Read 1 file from the assets directory /tmpdir
🌀 Starting asset upload...
🌀 Found 1 new or modified static asset to upload. Proceeding with upload...
+ /asset.txt
Uploaded 1 of 1 assets
✨ Success! Uploaded 1 file (TIMINGS)
Total Upload: xx KiB / gzip: xx KiB
Worker Startup Time: (TIMINGS)
Uploaded tmp-e2e-worker-00000000-0000-0000-0000-000000000000 (TIMINGS)
Worker Version ID: 00000000-0000-0000-0000-000000000000
Version Preview URL: https://tmp-e2e-worker-PREVIEW-URL.SUBDOMAIN.workers.dev
To deploy this version to production traffic use the command wrangler versions deploy
Changes to non-versioned settings (config properties 'logpush' or 'tail_consumers') take effect after your next deployment using the command wrangler versions deploy
Changes to triggers (routes, custom domains, cron schedules, etc) must be applied with the command wrangler triggers deploy"
`);

const versionsView = await helper.run(
`wrangler versions view ${matchVersionId(upload.stdout)}`
);
expect(normalize(versionsView.stdout)).toMatchInlineSnapshot(`
"Version ID: 00000000-0000-0000-0000-000000000000
Created: TIMESTAMP
Author: [email protected]
Source: Unknown (version_upload)
Tag: e2e-upload-assets
Message: Upload via e2e test
------------------------------------------------------------
Compatibility Date: 2023-01-01"
`);
});

it("should include version preview url in output file", async () => {
const outputFile = path.join(helper.tmpPath, "output.jsonnd");
const upload = await helper.run(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
jwt: assets.jwt,
config: assetConfig,
},
...(annotations && { annotations }),
...(compatibility_date && { compatibility_date }),
...(compatibility_flags && { compatibility_flags }),
})
Expand Down
2 changes: 1 addition & 1 deletion packages/wrangler/src/versions/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export type ApiVersion = {
bindings: WorkerMetadataBinding[];
script: {
etag: string;
handlers: string[];
handlers: string[] | null;
placement_mode?: "smart";
last_deployed_from: string;
};
Expand Down
15 changes: 9 additions & 6 deletions packages/wrangler/src/versions/view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ export const versionsViewCommand = createCommand({
Message: version.annotations?.["workers/message"] || BLANK_INPUT,
})
);
logRaw("------------------------------------------------------------");
const scriptInfo: ScriptInfoLog = {
Handlers: version.resources.script.handlers.join(", "),
};
const scriptInfo: ScriptInfoLog = {};
if (version.resources.script.handlers) {
scriptInfo.Handlers = version.resources.script.handlers.join(", ");
}
if (version.resources.script_runtime.compatibility_date) {
scriptInfo["Compatibility Date"] =
version.resources.script_runtime.compatibility_date;
Expand All @@ -91,7 +91,10 @@ export const versionsViewCommand = createCommand({
scriptInfo["Compatibility Flags"] =
version.resources.script_runtime.compatibility_flags.join(", ");
}
logRaw(formatLabelledValues(scriptInfo));
if (Object.keys(scriptInfo).length > 0) {
logRaw("------------------------------------------------------------");
logRaw(formatLabelledValues(scriptInfo));
}

const secrets = version.resources.bindings.filter(
(binding) => binding.type === "secret_text"
Expand Down Expand Up @@ -142,7 +145,7 @@ export const versionsViewCommand = createCommand({
});

type ScriptInfoLog = {
Handlers: string;
Handlers?: string;
"Compatibility Date"?: string;
"Compatibility Flags"?: string;
};
Expand Down
Loading