Merge pull request #265 from Maximo-Guk/maximo/revert-235

Revert "(feat): Use existing wrangler installation when appropriate #235"
cloudflare · May 24, 2024 · baf8bc6 · baf8bc6
2 parents 8edd152 + 2d275a8
commit baf8bc6
Show file tree

Hide file tree

Showing 36 changed files with 37 additions and 328 deletions.
diff --git a/.changeset/friendly-ways-hammer.md b/.changeset/friendly-ways-hammer.md
@@ -0,0 +1,5 @@
+---
+"wrangler-action": patch
+---
+
+Reverts #235 which may have caused the latest version of wrangler to be installed, if no wrangler version was found
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Only build app
         uses: ./
         with:
-          workingDirectory: "./test/only-build"
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy --dry-run
@@ -38,11 +38,12 @@ jobs:
         uses: ./
         with:
           quiet: true
-          workingDirectory: "./test/build-quiet"
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy --dry-run
 
+      # START Setup and teardown of Worker Environment Tests
       - name: Environment support
         uses: ./
         with:
@@ -51,20 +52,28 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           environment: dev
           preCommands: npx wrangler deploy --env dev # https://github.com/cloudflare/wrangler-action/issues/162
-          postCommands: npx wrangler delete --name wrangler-action-dev-environment-test --force
           secrets: |
             SECRET1
             SECRET2
         env:
           SECRET1: ${{ secrets.SECRET1 }}
           SECRET2: ${{ secrets.SECRET2 }}
 
+      - name: Clean up Deployed Environment Worker
+        uses: ./
+        with:
+          workingDirectory: "./test/base"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: delete --name wrangler-action-dev-environment-test --force
+
+      # END Setup and teardown of Worker Environment Tests
       # START Setup and teardown of Workers w/ Secrets Tests
       - name: Deploy app secrets w/ hardcoded Wrangler v2
         uses: ./
         with:
           wranglerVersion: "2.20.0"
-          workingDirectory: "./test/secrets-v2"
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           secrets: |
@@ -75,13 +84,13 @@ jobs:
           SECRET2: ${{ secrets.SECRET2 }}
 
       - name: Health Check Deployed Worker
-        run: node .github/workflows/workerHealthCheck.cjs wrangler-action-test-secrets-v2
+        run: node .github/workflows/workerHealthCheck.cjs
         shell: bash
 
       - name: Deploy app secrets w/ default version
         uses: ./
         with:
-          workingDirectory: "./test/secrets-default"
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           secrets: |
@@ -92,23 +101,22 @@ jobs:
           SECRET2: ${{ secrets.SECRET2 }}
 
       - name: Health Check Deployed Worker
-        run: node .github/workflows/workerHealthCheck.cjs wrangler-action-test-secrets-default
+        run: node .github/workflows/workerHealthCheck.cjs
         shell: bash
 
       - name: Clean Up Deployed Workers
         uses: ./
         with:
-          workingDirectory: "./test/secrets-default"
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: delete --name wrangler-action-test-secrets-v2 --force
-          postCommands: npx wrangler delete --name wrangler-action-test-secrets-default --force
+          command: delete --name wrangler-action-test --force
       # END Setup and teardown of Workers w/ Secrets Tests
 
       - name: Support packageManager variable
         uses: ./
         with:
-          workingDirectory: "./test/specify-package-manager"
+          workingDirectory: "./test/empty"
           packageManager: "npm"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
@@ -117,7 +125,7 @@ jobs:
       - name: Support unspecified packageManager with no lockfile
         uses: ./
         with:
-          workingDirectory: "./test/unspecified-package-manager"
+          workingDirectory: "./test/empty"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy --dry-run
@@ -151,14 +159,3 @@ jobs:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy --dry-run
-
-      - name: Change directory to pre-installed-wrangler and install dependencies
-        run: |
-          cd ./test/pre-installed-wrangler
-          npm install
-
-      - name: Support pre-installed wrangler
-        uses: ./
-        with:
-          workingDirectory: "./test/pre-installed-wrangler"
-          command: action-test
diff --git a/.github/workflows/workerHealthCheck.cjs b/.github/workflows/workerHealthCheck.cjs
@@ -1,7 +1,8 @@
 const { execSync } = require("child_process");
 
-function workerHealthCheck(workerName) {
-	const url = `https://${workerName}.devprod-testing7928.workers.dev/secret-health-check`;
+function workerHealthCheck() {
+	const url =
+		"https://wrangler-action-test.devprod-testing7928.workers.dev/secret-health-check";
 
 	const buffer = execSync(`curl ${url}`);
 
@@ -16,13 +17,4 @@ function workerHealthCheck(workerName) {
 	return response;
 }
 
-const args = Array.from(process.argv);
-const workerName = args.pop();
-
-if (!workerName) {
-	throw new Error(
-		"Please provide the worker name as an argument when calling this program.",
-	);
-}
-
-workerHealthCheck(workerName);
+workerHealthCheck();
diff --git a/src/index.ts b/src/index.ts
@@ -10,8 +10,6 @@ import {
 	setFailed,
 	setOutput,
 } from "@actions/core";
-import { getExecOutput } from "@actions/exec";
-import semverEq from "semver/functions/eq";
 import { exec, execShell } from "./exec";
 import { checkWorkingDirectory, semverCompare } from "./utils";
 import { getPackageManager } from "./packageManagers";
@@ -23,7 +21,6 @@ const DEFAULT_WRANGLER_VERSION = "3.13.2";
  */
 const config = {
 	WRANGLER_VERSION: getInput("wranglerVersion") || DEFAULT_WRANGLER_VERSION,
-	didUserProvideWranglerVersion: Boolean(getInput("wranglerVersion")),
 	secrets: getMultilineInput("secrets"),
 	workingDirectory: checkWorkingDirectory(getInput("workingDirectory")),
 	CLOUDFLARE_API_TOKEN: getInput("apiToken"),
@@ -85,64 +82,6 @@ async function installWrangler() {
 		);
 	}
 
-	startGroup("🔍 Checking for existing Wrangler installation");
-	let installedVersion = "";
-	let installedVersionSatisfiesRequirement = false;
-	try {
-		const { stdout } = await getExecOutput(
-			packageManager.exec,
-			["wrangler", "--version"],
-			{
-				cwd: config["workingDirectory"],
-				silent: config.QUIET_MODE,
-			},
-		);
-		// There are two possible outputs from `wrangler --version`:
-		// ` ⛅️ wrangler 3.48.0 (update available 3.53.1)`
-		// and
-		// `3.48.0`
-		const versionMatch =
-			stdout.match(/wrangler (\d+\.\d+\.\d+)/) ??
-			stdout.match(/^(\d+\.\d+\.\d+)/);
-		if (versionMatch) {
-			installedVersion = versionMatch[1];
-		}
-		if (config.didUserProvideWranglerVersion) {
-			installedVersionSatisfiesRequirement = semverEq(
-				installedVersion,
-				config["WRANGLER_VERSION"],
-			);
-		}
-		if (!config.didUserProvideWranglerVersion && installedVersion) {
-			info(
-				`✅ No wrangler version specified, using pre-installed wrangler version ${installedVersion}`,
-				true,
-			);
-			endGroup();
-			return;
-		}
-		if (
-			config.didUserProvideWranglerVersion &&
-			installedVersionSatisfiesRequirement
-		) {
-			info(`✅ Using Wrangler ${installedVersion}`, true);
-			endGroup();
-			return;
-		}
-		info(
-			"⚠️ Wrangler not found or version is incompatible. Installing...",
-			true,
-		);
-	} catch (error) {
-		debug(`Error checking Wrangler version: ${error}`);
-		info(
-			"⚠️ Wrangler not found or version is incompatible. Installing...",
-			true,
-		);
-	} finally {
-		endGroup();
-	}
-
 	startGroup("📥 Installing Wrangler");
 	try {
 		await exec(

diff --git a/test/build-quiet/index.ts → test/base/index.ts b/test/build-quiet/index.ts → test/base/index.ts
@@ -17,6 +17,7 @@ export default {
 			return new Response("OK");
 		}
 
+		// @ts-expect-error
 		return Response.json({
 			...request,
 			headers: Object.fromEntries(request.headers),

diff --git a/test/build-quiet/package-lock.json → test/base/package-lock.json b/test/build-quiet/package-lock.json → test/base/package-lock.json
diff --git a/test/build-quiet/package.json → test/base/package.json b/test/build-quiet/package.json → test/base/package.json
diff --git a/test/only-build/wrangler.toml → test/base/wrangler.toml b/test/only-build/wrangler.toml → test/base/wrangler.toml
@@ -1,4 +1,4 @@
-name = "wrangler-action-test-only-build"
+name = "wrangler-action-test"
 main = "./index.ts"
 compatibility_date = "2023-07-07"
 workers_dev = true
diff --git a/test/build-quiet/wrangler.toml b/test/build-quiet/wrangler.toml
diff --git a/test/bun/index.ts b/test/bun/index.ts
@@ -17,6 +17,7 @@ export default {
 			return new Response("OK");
 		}
 
+		// @ts-expect-error
 		return Response.json({
 			...request,
 			headers: Object.fromEntries(request.headers),

diff --git a/test/specify-package-manager/index.ts → test/empty/index.ts b/test/specify-package-manager/index.ts → test/empty/index.ts
diff --git a/test/specify-package-manager/package.json → test/empty/package.json b/test/specify-package-manager/package.json → test/empty/package.json
diff --git a/test/secrets-v2/wrangler.toml → test/empty/wrangler.toml b/test/secrets-v2/wrangler.toml → test/empty/wrangler.toml
@@ -1,4 +1,4 @@
-name = "wrangler-action-test-secrets-v2"
+name = "wrangler-action-test"
 main = "./index.ts"
 compatibility_date = "2023-07-07"
 workers_dev = true
diff --git a/test/environment/index.ts b/test/environment/index.ts
@@ -12,6 +12,7 @@ export default {
 			return new Response(`${SECRET1} ${SECRET2}`);
 		}
 
+		// @ts-expect-error
 		return Response.json({
 			...request,
 			headers: Object.fromEntries(request.headers),

diff --git a/test/npm/index.ts b/test/npm/index.ts
@@ -17,6 +17,7 @@ export default {
 			return new Response("OK");
 		}
 
+		// @ts-expect-error
 		return Response.json({
 			...request,
 			headers: Object.fromEntries(request.headers),

diff --git a/test/only-build/index.ts b/test/only-build/index.ts
diff --git a/test/only-build/package-lock.json b/test/only-build/package-lock.json
diff --git a/test/only-build/package.json b/test/only-build/package.json
diff --git a/test/pnpm/index.ts b/test/pnpm/index.ts
@@ -17,6 +17,7 @@ export default {
 			return new Response("OK");
 		}
 
+		// @ts-expect-error
 		return Response.json({
 			...request,
 			headers: Object.fromEntries(request.headers),

diff --git a/test/pre-installed-wrangler/index.ts b/test/pre-installed-wrangler/index.ts
diff --git a/test/pre-installed-wrangler/mock_packages/wrangler/index.js b/test/pre-installed-wrangler/mock_packages/wrangler/index.js
diff --git a/test/pre-installed-wrangler/mock_packages/wrangler/package.json b/test/pre-installed-wrangler/mock_packages/wrangler/package.json