feat(keyFileName): allow to pass key file name

kopax-polyconseil · Nov 22, 2023 · 1a84963 · 1a84963
1 parent b1deb1d
commit 1a84963
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 4 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/src/inputs.ts b/src/inputs.ts
@@ -5,13 +5,17 @@ export interface Inputs {
   path: string;
   key: string;
   restoreKeys: string[];
+  keyFileName?: string;
+  compressionMethod?: string;
 }
 
 export function getInputs(): Inputs {
   const inputs = {
     bucket: core.getInput('bucket', { required: true }),
     path: core.getInput('path', { required: true }),
     key: core.getInput('key', { required: true }),
+    keyFileName: core.getInput('key-file-name'),
+    compressionMethod: core.getInput('compression-method'),
     restoreKeys: core
       .getInput('restore-keys')
       .split(',')

diff --git a/src/main.ts b/src/main.ts
@@ -99,6 +99,7 @@ async function main() {
       path: inputs.path,
       cacheHitKind: 'none',
       targetFileName: exactFileName,
+      keyFileName: inputs.keyFileName,
     });
     core.setOutput('cache-hit', 'false');
     console.log('😢 No cache candidate found.');

diff --git a/src/post.ts b/src/post.ts
@@ -18,7 +18,9 @@ async function main() {
     return;
   }
 
-  const bucket = new Storage().bucket(state.bucket);
+  const bucket = new Storage({ keyFilename: state.keyFileName }).bucket(
+    state.bucket,
+  );
   const targetFileName = state.targetFileName;
   const [targetFileExists] = await bucket
     .file(targetFileName)

diff --git a/src/state.ts b/src/state.ts
@@ -7,6 +7,8 @@ export interface State {
   bucket: string;
   cacheHitKind: CacheHitKindState;
   targetFileName: string;
+  keyFileName?: string;
+  compressionMethod?: string;
 }
 
 export function saveState(state: State): void {
@@ -16,6 +18,8 @@ export function saveState(state: State): void {
   core.saveState('path', state.path);
   core.saveState('cache-hit-kind', state.cacheHitKind);
   core.saveState('target-file-name', state.targetFileName);
+  core.saveState('key-file-name', state.keyFileName);
+  core.saveState('compression-method', state.compressionMethod);
 }
 
 export function getState(): State {
@@ -24,6 +28,8 @@ export function getState(): State {
     bucket: core.getState('bucket'),
     cacheHitKind: core.getState('cache-hit-kind') as CacheHitKindState,
     targetFileName: core.getState('target-file-name'),
+    keyFileName: core.getState('key-file-name'),
+    compressionMethod: core.getState('compression-method'),
   };
 
   core.debug(`Loaded state: ${JSON.stringify(state)}.`);

diff --git a/src/tar-utils.ts b/src/tar-utils.ts
@@ -3,6 +3,8 @@
 import * as exec from '@actions/exec';
 import * as semver from 'semver';
 
+import { getState } from './state';
+
 const ZSTD_WITHOUT_LONG_VERSION = '1.3.2';
 
 export enum CompressionMethod {
@@ -15,6 +17,11 @@ async function getTarCompressionMethod(): Promise<CompressionMethod> {
   if (process.platform === 'win32') {
     return CompressionMethod.GZIP;
   }
+  const state = getState();
+
+  if (state.compressionMethod) {
+    return CompressionMethod.GZIP;
+  }
 
   const [zstdOutput, zstdVersion] = await exec
     .getExecOutput('zstd', ['--version'], {