Skip to content

Commit 2d275a8

Browse files
Maximo-GukMaximo-Guk
committed
Revert "(feat): Use existing wrangler installation when appropriate (#235)"
This reverts commit 0545ad2.
1 parent 8ef515f commit 2d275a8

File tree

36 files changed

+37
-328
lines changed

36 files changed

+37
-328
lines changed

‎.changeset/friendly-ways-hammer.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler-action": patch
3+
---
4+
5+
Reverts #235 which may have caused the latest version of wrangler to be installed, if no wrangler version was found

‎.github/workflows/deploy.yml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Only build app
3030
uses: ./
3131
with:
32-
workingDirectory: "./test/only-build"
32+
workingDirectory: "./test/base"
3333
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
3434
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
3535
command: deploy --dry-run
@@ -38,11 +38,12 @@ jobs:
3838
uses: ./
3939
with:
4040
quiet: true
41-
workingDirectory: "./test/build-quiet"
41+
workingDirectory: "./test/base"
4242
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
4343
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
4444
command: deploy --dry-run
4545

46+
# START Setup and teardown of Worker Environment Tests
4647
- name: Environment support
4748
uses: ./
4849
with:
@@ -51,20 +52,28 @@ jobs:
5152
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
5253
environment: dev
5354
preCommands: npx wrangler deploy --env dev # https://github.com/cloudflare/wrangler-action/issues/162
54-
postCommands: npx wrangler delete --name wrangler-action-dev-environment-test --force
5555
secrets: |
5656
SECRET1
5757
SECRET2
5858
env:
5959
SECRET1: ${{ secrets.SECRET1 }}
6060
SECRET2: ${{ secrets.SECRET2 }}
6161

62+
- name: Clean up Deployed Environment Worker
63+
uses: ./
64+
with:
65+
workingDirectory: "./test/base"
66+
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
67+
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
68+
command: delete --name wrangler-action-dev-environment-test --force
69+
70+
# END Setup and teardown of Worker Environment Tests
6271
# START Setup and teardown of Workers w/ Secrets Tests
6372
- name: Deploy app secrets w/ hardcoded Wrangler v2
6473
uses: ./
6574
with:
6675
wranglerVersion: "2.20.0"
67-
workingDirectory: "./test/secrets-v2"
76+
workingDirectory: "./test/base"
6877
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6978
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
7079
secrets: |
@@ -75,13 +84,13 @@ jobs:
7584
SECRET2: ${{ secrets.SECRET2 }}
7685

7786
- name: Health Check Deployed Worker
78-
run: node .github/workflows/workerHealthCheck.cjs wrangler-action-test-secrets-v2
87+
run: node .github/workflows/workerHealthCheck.cjs
7988
shell: bash
8089

8190
- name: Deploy app secrets w/ default version
8291
uses: ./
8392
with:
84-
workingDirectory: "./test/secrets-default"
93+
workingDirectory: "./test/base"
8594
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
8695
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
8796
secrets: |
@@ -92,23 +101,22 @@ jobs:
92101
SECRET2: ${{ secrets.SECRET2 }}
93102

94103
- name: Health Check Deployed Worker
95-
run: node .github/workflows/workerHealthCheck.cjs wrangler-action-test-secrets-default
104+
run: node .github/workflows/workerHealthCheck.cjs
96105
shell: bash
97106

98107
- name: Clean Up Deployed Workers
99108
uses: ./
100109
with:
101-
workingDirectory: "./test/secrets-default"
110+
workingDirectory: "./test/base"
102111
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
103112
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
104-
command: delete --name wrangler-action-test-secrets-v2 --force
105-
postCommands: npx wrangler delete --name wrangler-action-test-secrets-default --force
113+
command: delete --name wrangler-action-test --force
106114
# END Setup and teardown of Workers w/ Secrets Tests
107115

108116
- name: Support packageManager variable
109117
uses: ./
110118
with:
111-
workingDirectory: "./test/specify-package-manager"
119+
workingDirectory: "./test/empty"
112120
packageManager: "npm"
113121
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
114122
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
@@ -117,7 +125,7 @@ jobs:
117125
- name: Support unspecified packageManager with no lockfile
118126
uses: ./
119127
with:
120-
workingDirectory: "./test/unspecified-package-manager"
128+
workingDirectory: "./test/empty"
121129
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
122130
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
123131
command: deploy --dry-run
@@ -151,14 +159,3 @@ jobs:
151159
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
152160
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
153161
command: deploy --dry-run
154-
155-
- name: Change directory to pre-installed-wrangler and install dependencies
156-
run: |
157-
cd ./test/pre-installed-wrangler
158-
npm install
159-
160-
- name: Support pre-installed wrangler
161-
uses: ./
162-
with:
163-
workingDirectory: "./test/pre-installed-wrangler"
164-
command: action-test

‎.github/workflows/workerHealthCheck.cjs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const { execSync } = require("child_process");
22

3-
function workerHealthCheck(workerName) {
4-
const url = `https://${workerName}.devprod-testing7928.workers.dev/secret-health-check`;
3+
function workerHealthCheck() {
4+
const url =
5+
"https://wrangler-action-test.devprod-testing7928.workers.dev/secret-health-check";
56

67
const buffer = execSync(`curl ${url}`);
78

@@ -16,13 +17,4 @@ function workerHealthCheck(workerName) {
1617
return response;
1718
}
1819

19-
const args = Array.from(process.argv);
20-
const workerName = args.pop();
21-
22-
if (!workerName) {
23-
throw new Error(
24-
"Please provide the worker name as an argument when calling this program.",
25-
);
26-
}
27-
28-
workerHealthCheck(workerName);
20+
workerHealthCheck();

‎src/index.ts‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import {
1010
setFailed,
1111
setOutput,
1212
} from "@actions/core";
13-
import { getExecOutput } from "@actions/exec";
14-
import semverEq from "semver/functions/eq";
1513
import { exec, execShell } from "./exec";
1614
import { checkWorkingDirectory, semverCompare } from "./utils";
1715
import { getPackageManager } from "./packageManagers";
@@ -23,7 +21,6 @@ const DEFAULT_WRANGLER_VERSION = "3.13.2";
2321
*/
2422
const config = {
2523
WRANGLER_VERSION: getInput("wranglerVersion") || DEFAULT_WRANGLER_VERSION,
26-
didUserProvideWranglerVersion: Boolean(getInput("wranglerVersion")),
2724
secrets: getMultilineInput("secrets"),
2825
workingDirectory: checkWorkingDirectory(getInput("workingDirectory")),
2926
CLOUDFLARE_API_TOKEN: getInput("apiToken"),
@@ -85,64 +82,6 @@ async function installWrangler() {
8582
);
8683
}
8784

88-
startGroup("🔍 Checking for existing Wrangler installation");
89-
let installedVersion = "";
90-
let installedVersionSatisfiesRequirement = false;
91-
try {
92-
const { stdout } = await getExecOutput(
93-
packageManager.exec,
94-
["wrangler", "--version"],
95-
{
96-
cwd: config["workingDirectory"],
97-
silent: config.QUIET_MODE,
98-
},
99-
);
100-
// There are two possible outputs from `wrangler --version`:
101-
// ` ⛅️ wrangler 3.48.0 (update available 3.53.1)`
102-
// and
103-
// `3.48.0`
104-
const versionMatch =
105-
stdout.match(/wrangler (\d+\.\d+\.\d+)/) ??
106-
stdout.match(/^(\d+\.\d+\.\d+)/);
107-
if (versionMatch) {
108-
installedVersion = versionMatch[1];
109-
}
110-
if (config.didUserProvideWranglerVersion) {
111-
installedVersionSatisfiesRequirement = semverEq(
112-
installedVersion,
113-
config["WRANGLER_VERSION"],
114-
);
115-
}
116-
if (!config.didUserProvideWranglerVersion && installedVersion) {
117-
info(
118-
`✅ No wrangler version specified, using pre-installed wrangler version ${installedVersion}`,
119-
true,
120-
);
121-
endGroup();
122-
return;
123-
}
124-
if (
125-
config.didUserProvideWranglerVersion &&
126-
installedVersionSatisfiesRequirement
127-
) {
128-
info(`✅ Using Wrangler ${installedVersion}`, true);
129-
endGroup();
130-
return;
131-
}
132-
info(
133-
"⚠️ Wrangler not found or version is incompatible. Installing...",
134-
true,
135-
);
136-
} catch (error) {
137-
debug(`Error checking Wrangler version: ${error}`);
138-
info(
139-
"⚠️ Wrangler not found or version is incompatible. Installing...",
140-
true,
141-
);
142-
} finally {
143-
endGroup();
144-
}
145-
14685
startGroup("📥 Installing Wrangler");
14786
try {
14887
await exec(

test/build-quiet/index.ts renamed to test/base/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export default {
1717
return new Response("OK");
1818
}
1919

20+
// @ts-expect-error
2021
return Response.json({
2122
...request,
2223
headers: Object.fromEntries(request.headers),

test/build-quiet/package-lock.json renamed to test/base/package-lock.json

File renamed without changes.

test/build-quiet/package.json renamed to test/base/package.json

File renamed without changes.

test/only-build/wrangler.toml renamed to test/base/wrangler.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name = "wrangler-action-test-only-build"
1+
name = "wrangler-action-test"
22
main = "./index.ts"
33
compatibility_date = "2023-07-07"
44
workers_dev = true

‎test/build-quiet/wrangler.toml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎test/bun/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export default {
1717
return new Response("OK");
1818
}
1919

20+
// @ts-expect-error
2021
return Response.json({
2122
...request,
2223
headers: Object.fromEntries(request.headers),

0 commit comments

Comments
 (0)
⚡