Merge pull request #8 from sparebank1utvikling/remove-suffix

Remove suffix

Author: chlunde

dist/restore-only/index.js

@@ -146664,7 +146664,10 @@ function restoreImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             const failOnCacheMiss = utils.getInputAsBool(constants_1.Inputs.FailOnCacheMiss);

dist/restore/index.js

@@ -146664,7 +146664,10 @@ function restoreImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             const failOnCacheMiss = utils.getInputAsBool(constants_1.Inputs.FailOnCacheMiss);

dist/save-only/index.js

@@ -146677,7 +146677,10 @@ function saveImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             cacheId = yield cache.saveCache(cachePaths.slice(), primaryKey, { uploadChunkSize: utils.getInputAsInt(constants_1.Inputs.UploadChunkSize) }, enableCrossOsArchive, s3config, s3BucketName);

dist/save/index.js

@@ -146708,7 +146708,10 @@ function saveImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             cacheId = yield cache.saveCache(cachePaths.slice(), primaryKey, { uploadChunkSize: utils.getInputAsInt(constants_1.Inputs.UploadChunkSize) }, enableCrossOsArchive, s3config, s3BucketName);

src/restoreImpl.ts

@@ -35,7 +35,10 @@ export async function restoreImpl(
         const cachePaths = utils.getInputAsArray(Inputs.Path, {
             required: true
         });
-        const s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        let s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        if (s3BucketName.endsWith(".amazonaws.com")) {
+            s3BucketName = s3BucketName.split(".")[0];
+        }
         const s3config = utils.getInputS3ClientConfig();
 
         const enableCrossOsArchive = utils.getInputAsBool(

src/saveImpl.ts

@@ -51,7 +51,11 @@ async function saveImpl(stateProvider: IStateProvider): Promise<number | void> {
         const cachePaths = utils.getInputAsArray(Inputs.Path, {
             required: true
         });
-        const s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        let s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        if (s3BucketName.endsWith(".amazonaws.com")) {
+            s3BucketName = s3BucketName.split(".")[0];
+        }
+
         const s3config = utils.getInputS3ClientConfig();
 
         const enableCrossOsArchive = utils.getInputAsBool(