From e614c5820dc749474c9ec51c051e188d434f0007 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 8 Jan 2023 12:10:17 +0100
Subject: [PATCH] Changes after rebase

---
 __tests__/restore.test.ts  | 2 +-
 action.yml                 | 8 ++++----
 dist/restore-only/index.js | 3 ++-
 dist/restore/index.js      | 3 ++-
 restore/action.yml         | 2 +-
 src/restoreImpl.ts         | 3 ++-
 src/utils/testUtils.ts     | 8 ++++----
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/__tests__/restore.test.ts b/__tests__/restore.test.ts
index 23af602..e267b62 100644
--- a/__tests__/restore.test.ts
+++ b/__tests__/restore.test.ts
@@ -232,7 +232,7 @@ test("restore with dry-run set", async () => {
     testUtils.setInputs({
         path: path,
         key,
-        dryRun: "true"
+        dryRun: true
     });
 
     const infoMock = jest.spyOn(core, "info");
diff --git a/action.yml b/action.yml
index 695fe01..c346333 100644
--- a/action.yml
+++ b/action.yml
@@ -11,10 +11,6 @@ inputs:
   restore-keys:
     description: 'An ordered list of keys to use for restoring stale cache if no cache hit occurred for key. Note `cache-hit` returns false in this case.'
     required: false
-  dry-run:
-    description: 'Skip downloading cache. Only check if cache entry exists'
-    required: false
-    default: "false"
   upload-chunk-size:
     description: 'The chunk size used to split up large files during upload, in bytes'
     required: false
@@ -22,6 +18,10 @@ inputs:
     description: 'An optional boolean when enabled, allows windows runners to save or restore caches that can be restored or saved respectively on other platforms'
     default: 'false'
     required: false
+  dry-run:
+    description: 'Skip downloading cache. Only check if cache entry exists'
+    default: 'false'
+    required: false
 outputs:
   cache-hit:
     description: 'A boolean value to indicate an exact match was found for the primary key'
diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js
index 0608c3e..23971c4 100644
--- a/dist/restore-only/index.js
+++ b/dist/restore-only/index.js
@@ -50505,7 +50505,8 @@ function restoreImpl(stateProvider) {
                 required: true
             });
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
-            const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { dryRun: core.getBooleanInput(constants_1.Inputs.DryRun) }, enableCrossOsArchive);
+            const dryRun = utils.getInputAsBool(constants_1.Inputs.DryRun);
+            const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { dryRun: dryRun }, enableCrossOsArchive);
             if (!cacheKey) {
                 core.info(`Cache not found for input keys: ${[
                     primaryKey,
diff --git a/dist/restore/index.js b/dist/restore/index.js
index 0d32c3d..c85a851 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -50505,7 +50505,8 @@ function restoreImpl(stateProvider) {
                 required: true
             });
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
-            const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { dryRun: core.getBooleanInput(constants_1.Inputs.DryRun) }, enableCrossOsArchive);
+            const dryRun = utils.getInputAsBool(constants_1.Inputs.DryRun);
+            const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys, { dryRun: dryRun }, enableCrossOsArchive);
             if (!cacheKey) {
                 core.info(`Cache not found for input keys: ${[
                     primaryKey,
diff --git a/restore/action.yml b/restore/action.yml
index b0c7660..67e4c73 100644
--- a/restore/action.yml
+++ b/restore/action.yml
@@ -17,8 +17,8 @@ inputs:
     required: false
   dry-run:
     description: 'Skip downloading cache. Only check if cache entry exists'
+    default: 'false'
     required: false
-    default: "false"
 outputs:
   cache-hit:
     description: 'A boolean value to indicate an exact match was found for the primary key'
diff --git a/src/restoreImpl.ts b/src/restoreImpl.ts
index 207db42..f9aa313 100644
--- a/src/restoreImpl.ts
+++ b/src/restoreImpl.ts
@@ -34,12 +34,13 @@ async function restoreImpl(
         const enableCrossOsArchive = utils.getInputAsBool(
             Inputs.EnableCrossOsArchive
         );
+        const dryRun = utils.getInputAsBool(Inputs.DryRun);
 
         const cacheKey = await cache.restoreCache(
             cachePaths,
             primaryKey,
             restoreKeys,
-            { dryRun: core.getBooleanInput(Inputs.DryRun) },
+            { dryRun: dryRun },
             enableCrossOsArchive
         );
 
diff --git a/src/utils/testUtils.ts b/src/utils/testUtils.ts
index 2e54911..ee5ea83 100644
--- a/src/utils/testUtils.ts
+++ b/src/utils/testUtils.ts
@@ -14,13 +14,12 @@ interface CacheInput {
     key: string;
     restoreKeys?: string[];
     enableCrossOsArchive?: boolean;
-    dryRun?: string;
+    dryRun?: boolean;
 }
 
 export function setInputs(input: CacheInput): void {
     setInput(Inputs.Path, input.path);
     setInput(Inputs.Key, input.key);
-    setInput(Inputs.DryRun, "false");
     input.restoreKeys &&
         setInput(Inputs.RestoreKeys, input.restoreKeys.join("\n"));
     input.enableCrossOsArchive !== undefined &&
@@ -28,14 +27,15 @@ export function setInputs(input: CacheInput): void {
             Inputs.EnableCrossOsArchive,
             input.enableCrossOsArchive.toString()
         );
-    input.dryRun && setInput(Inputs.DryRun, input.dryRun);
+    input.dryRun !== undefined &&
+        setInput(Inputs.DryRun, input.dryRun.toString());
 }
 
 export function clearInputs(): void {
     delete process.env[getInputName(Inputs.Path)];
     delete process.env[getInputName(Inputs.Key)];
     delete process.env[getInputName(Inputs.RestoreKeys)];
-    delete process.env[getInputName(Inputs.DryRun)];
     delete process.env[getInputName(Inputs.UploadChunkSize)];
     delete process.env[getInputName(Inputs.EnableCrossOsArchive)];
+    delete process.env[getInputName(Inputs.DryRun)];
 }