From 8d80cd6b60c3f632a518e71e66db4cf8ca2115ef Mon Sep 17 00:00:00 2001
From: "Ivan Zosimov (Akvelon INC)" <v-izosimov@microsoft.com>
Date: Mon, 28 Feb 2022 15:30:28 +0300
Subject: [PATCH] Change code according to review points

---
 dist/cache-save/index.js | 10 ++++++----
 dist/setup/index.js      |  6 ++++--
 src/cache-save.ts        |  9 ++++-----
 src/cache-utils.ts       |  2 +-
 src/main.ts              |  7 +++----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
index aec7b19..3bbf09f 100644
--- a/dist/cache-save/index.js
+++ b/dist/cache-save/index.js
@@ -3944,7 +3944,8 @@ exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, vo
     if (!package_managers_1.supportedPackageManagers[packageManager]) {
         throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`);
     }
-    return package_managers_1.supportedPackageManagers[packageManager];
+    const obtainedPackageManager = package_managers_1.supportedPackageManagers[packageManager];
+    return obtainedPackageManager;
 });
 exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
     const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand);
@@ -46368,10 +46369,11 @@ function run() {
 }
 exports.run = run;
 const cachePackages = () => __awaiter(void 0, void 0, void 0, function* () {
-    const cachingFlag = core.getBooleanInput('cache');
-    if (!cachingFlag)
+    const cacheInput = core.getInput('cache');
+    if (!cacheInput) {
         return;
-    const packageManager = core.getInput('package-manager');
+    }
+    const packageManager = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
     const state = core.getState(constants_1.State.CacheMatchedKey);
     const primaryKey = core.getState(constants_1.State.CachePrimaryKey);
     const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 2397dd7..a363e32 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -3705,7 +3705,8 @@ function run() {
             // stable will be true unless false is the exact input
             // since getting unstable versions should be explicit
             let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
-            const cache = core.getBooleanInput('cache');
+            const cacheInput = core.getInput('cache');
+            const cache = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
             core.info(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
             if (versionSpec) {
                 let token = core.getInput('token');
@@ -4188,7 +4189,8 @@ exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, vo
     if (!package_managers_1.supportedPackageManagers[packageManager]) {
         throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`);
     }
-    return package_managers_1.supportedPackageManagers[packageManager];
+    const obtainedPackageManager = package_managers_1.supportedPackageManagers[packageManager];
+    return obtainedPackageManager;
 });
 exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
     const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand);
diff --git a/src/cache-save.ts b/src/cache-save.ts
index 2ce6ea0..8a35e38 100644
--- a/src/cache-save.ts
+++ b/src/cache-save.ts
@@ -21,14 +21,13 @@ export async function run() {
 }
 
 const cachePackages = async () => {
-  
-  const cacheInput = core.getInput('cache');
-  if (!cacheInput) {
+  const cache = core.getInput('cache');
+  if (!cache) {
     return;
   }
-  
-  const packageManager = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
 
+  const packageManager = cache.toUpperCase() === 'TRUE' ? 'default' : cache;
+  
   const state = core.getState(State.CacheMatchedKey);
   const primaryKey = core.getState(State.CachePrimaryKey);
 
diff --git a/src/cache-utils.ts b/src/cache-utils.ts
index 7279887..13324c3 100644
--- a/src/cache-utils.ts
+++ b/src/cache-utils.ts
@@ -24,7 +24,7 @@ export const getPackageManagerInfo = async (packageManager: string) => {
       `It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`
     );
   }
-  const obtainedPackageManager = supportedPackageManagers[packageManager]
+  const obtainedPackageManager = supportedPackageManagers[packageManager];
 
   return obtainedPackageManager;
 };
diff --git a/src/main.ts b/src/main.ts
index 66688c3..8a6548f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,9 +19,8 @@ export async function run() {
     // since getting unstable versions should be explicit
     let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
 
-    const cacheInput = core.getInput('cache');
-    const cache = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
-
+    const cache = core.getInput('cache');
+        
     core.info(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
 
     if (versionSpec) {
@@ -49,7 +48,7 @@ export async function run() {
       if (isGhes()) {
         throw new Error('Caching is not supported on GHES');
       }
-      const packageManager = core.getInput('package-manager');
+      const packageManager = cache.toUpperCase() === 'TRUE' ? 'default' : cache;
       const cacheDependencyPath = core.getInput('cache-dependency-path');
       await restoreCache(packageManager, cacheDependencyPath);
     }