From ec71bf40ed312e8447686989cdd898328a407f7d Mon Sep 17 00:00:00 2001 From: Vidya Reddy <59590642+Vidya2606@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:26:25 -0700 Subject: [PATCH] downgrade prettier version since actionsx/prettier@v3 doesn't support the latest version --- package-lock.json | 18 +++++++++--------- package.json | 2 +- src/run.ts | 5 +++-- .../blueGreen/smiBlueGreenHelper.ts | 5 +++-- src/strategyHelpers/canary/smiCanaryHelper.ts | 5 +++-- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fa8de2c0..40036ffb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "@types/node": "^22.7.4", "@vercel/ncc": "^0.38.2", "jest": "^29.7.0", - "prettier": "^3.3.3", + "prettier": "^2.8.8", "ts-jest": "^29.2.5", "typescript": "5.6.2" } @@ -3418,15 +3418,15 @@ } }, "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true, "bin": { - "prettier": "bin/prettier.cjs" + "prettier": "bin-prettier.js" }, "engines": { - "node": ">=14" + "node": ">=10.13.0" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -6672,9 +6672,9 @@ } }, "prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true }, "pretty-format": { diff --git a/package.json b/package.json index dbafea403..cc8181a04 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@types/node": "^22.7.4", "@vercel/ncc": "^0.38.2", "jest": "^29.7.0", - "prettier": "^3.3.3", + "prettier": "^2.8.8", "ts-jest": "^29.2.5", "typescript": "5.6.2" } diff --git a/src/run.ts b/src/run.ts index 4399345bc..766dabaef 100644 --- a/src/run.ts +++ b/src/run.ts @@ -26,8 +26,9 @@ export async function run() { .map((manifest) => manifest.trim()) // remove surrounding whitespace .filter((manifest) => manifest.length > 0) // remove any blanks - const fullManifestFilePaths = - await getFilesFromDirectoriesAndURLs(manifestFilePaths) + const fullManifestFilePaths = await getFilesFromDirectoriesAndURLs( + manifestFilePaths + ) const kubectlPath = await getKubectlPath() const namespace = core.getInput('namespace') || 'default' const isPrivateCluster = diff --git a/src/strategyHelpers/blueGreen/smiBlueGreenHelper.ts b/src/strategyHelpers/blueGreen/smiBlueGreenHelper.ts index efdfe4ea0..144f6eeab 100644 --- a/src/strategyHelpers/blueGreen/smiBlueGreenHelper.ts +++ b/src/strategyHelpers/blueGreen/smiBlueGreenHelper.ts @@ -77,8 +77,9 @@ export async function createTrafficSplitObject( ): Promise { // cache traffic split api version if (!trafficSplitAPIVersion) - trafficSplitAPIVersion = - await kubectlUtils.getTrafficSplitAPIVersion(kubectl) + trafficSplitAPIVersion = await kubectlUtils.getTrafficSplitAPIVersion( + kubectl + ) // retrieve annotations for TS object const annotations = inputAnnotations diff --git a/src/strategyHelpers/canary/smiCanaryHelper.ts b/src/strategyHelpers/canary/smiCanaryHelper.ts index c76a22c23..73a5b5911 100644 --- a/src/strategyHelpers/canary/smiCanaryHelper.ts +++ b/src/strategyHelpers/canary/smiCanaryHelper.ts @@ -326,8 +326,9 @@ async function getTrafficSplitObject( ): Promise { // cached version if (!trafficSplitAPIVersion) { - trafficSplitAPIVersion = - await kubectlUtils.getTrafficSplitAPIVersion(kubectl) + trafficSplitAPIVersion = await kubectlUtils.getTrafficSplitAPIVersion( + kubectl + ) } return JSON.stringify({