From efa512101d9711681d03c72bb28d2e7aa8b7804c Mon Sep 17 00:00:00 2001 From: Caleb Gosiak Date: Mon, 4 Oct 2021 11:02:09 -0500 Subject: [PATCH] removed region --- action.yml | 3 --- dist/restore/index.js | 10 +++------- dist/save/index.js | 10 +++------- package.json | 2 +- src/cache.service.ts | 12 ++---------- src/constants.ts | 1 - src/restore.ts | 1 - src/save.ts | 1 - 8 files changed, 9 insertions(+), 31 deletions(-) diff --git a/action.yml b/action.yml index fc1a952..224abe2 100644 --- a/action.yml +++ b/action.yml @@ -11,9 +11,6 @@ inputs: restore-keys: description: 'An ordered list of keys to use for restoring the cache if no cache hit occurred for key' required: false - region: - description: 'aws region' - required: true access-key-id: description: 'aws access key id' required: false diff --git a/dist/restore/index.js b/dist/restore/index.js index cf4497c..2937fe2 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -5430,7 +5430,6 @@ var Inputs; Inputs["Key"] = "key"; Inputs["Path"] = "path"; Inputs["RestoreKeys"] = "restore-keys"; - Inputs["Region"] = "region"; Inputs["AccessKeyId"] = "access-key-id"; Inputs["SecretAccessKey"] = "secret-access-key"; Inputs["Bucket"] = "bucket"; @@ -37463,7 +37462,7 @@ function run() { required: true }); try { - const cache = new cache_service_1.CacheService(core.getInput(constants_1.Inputs.AccessKeyId), core.getInput(constants_1.Inputs.SecretAccessKey), core.getInput(constants_1.Inputs.Region), core.getInput(constants_1.Inputs.Bucket)); + const cache = new cache_service_1.CacheService(core.getInput(constants_1.Inputs.AccessKeyId), core.getInput(constants_1.Inputs.SecretAccessKey), core.getInput(constants_1.Inputs.Bucket)); const cacheKey = yield cache.restoreCache(cachePaths, primaryKey, restoreKeys); if (!cacheKey) { core.info(`Cache not found for input keys: ${[ @@ -43287,10 +43286,9 @@ const fs_1 = __importDefault(__webpack_require__(5747)); const path = __importStar(__webpack_require__(5622)); const actionUtils_1 = __webpack_require__(443); class CacheService { - constructor(accessKeyId, secretAccessKey, region, bucket) { + constructor(accessKeyId, secretAccessKey, bucket) { if (accessKeyId && secretAccessKey) { this._client = new aws_sdk_1.S3({ - region: region, credentials: { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey @@ -43298,9 +43296,7 @@ class CacheService { }); } else { - this._client = new aws_sdk_1.S3({ - region: region - }); + this._client = new aws_sdk_1.S3(); } this._bucket = bucket; } diff --git a/dist/save/index.js b/dist/save/index.js index ca36b55..02e78fb 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -5430,7 +5430,6 @@ var Inputs; Inputs["Key"] = "key"; Inputs["Path"] = "path"; Inputs["RestoreKeys"] = "restore-keys"; - Inputs["Region"] = "region"; Inputs["AccessKeyId"] = "access-key-id"; Inputs["SecretAccessKey"] = "secret-access-key"; Inputs["Bucket"] = "bucket"; @@ -25883,7 +25882,7 @@ function run() { required: true }); try { - const cache = new cache_service_1.CacheService(core.getInput(constants_1.Inputs.AccessKeyId), core.getInput(constants_1.Inputs.SecretAccessKey), core.getInput(constants_1.Inputs.Region), core.getInput(constants_1.Inputs.Bucket)); + const cache = new cache_service_1.CacheService(core.getInput(constants_1.Inputs.AccessKeyId), core.getInput(constants_1.Inputs.SecretAccessKey), core.getInput(constants_1.Inputs.Bucket)); yield cache.saveCache(cachePaths, primaryKey); core.info(`Cache saved with key: ${primaryKey}`); } @@ -43287,10 +43286,9 @@ const fs_1 = __importDefault(__webpack_require__(5747)); const path = __importStar(__webpack_require__(5622)); const actionUtils_1 = __webpack_require__(443); class CacheService { - constructor(accessKeyId, secretAccessKey, region, bucket) { + constructor(accessKeyId, secretAccessKey, bucket) { if (accessKeyId && secretAccessKey) { this._client = new aws_sdk_1.S3({ - region: region, credentials: { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey @@ -43298,9 +43296,7 @@ class CacheService { }); } else { - this._client = new aws_sdk_1.S3({ - region: region - }); + this._client = new aws_sdk_1.S3(); } this._bucket = bucket; } diff --git a/package.json b/package.json index f5dd60c..5446a46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cache", - "version": "0.12.0", + "version": "0.13.0", "private": true, "description": "Cache dependencies and build outputs", "main": "dist/restore/index.js", diff --git a/src/cache.service.ts b/src/cache.service.ts index 41b0580..ecacedc 100644 --- a/src/cache.service.ts +++ b/src/cache.service.ts @@ -18,24 +18,16 @@ export class CacheService { private _client: S3; private _bucket: string; - constructor( - accessKeyId: string, - secretAccessKey: string, - region: string, - bucket: string - ) { + constructor(accessKeyId: string, secretAccessKey: string, bucket: string) { if (accessKeyId && secretAccessKey) { this._client = new S3({ - region: region, credentials: { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey } }); } else { - this._client = new S3({ - region: region - }); + this._client = new S3(); } this._bucket = bucket; } diff --git a/src/constants.ts b/src/constants.ts index 18e2a29..81f7781 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -2,7 +2,6 @@ export enum Inputs { Key = "key", Path = "path", RestoreKeys = "restore-keys", - Region = "region", AccessKeyId = "access-key-id", SecretAccessKey = "secret-access-key", Bucket = "bucket" diff --git a/src/restore.ts b/src/restore.ts index e871fff..6ca366f 100644 --- a/src/restore.ts +++ b/src/restore.ts @@ -18,7 +18,6 @@ async function run(): Promise { const cache: CacheService = new CacheService( core.getInput(Inputs.AccessKeyId), core.getInput(Inputs.SecretAccessKey), - core.getInput(Inputs.Region), core.getInput(Inputs.Bucket) ); diff --git a/src/save.ts b/src/save.ts index 1b3d279..553ba76 100644 --- a/src/save.ts +++ b/src/save.ts @@ -36,7 +36,6 @@ async function run(): Promise { const cache: CacheService = new CacheService( core.getInput(Inputs.AccessKeyId), core.getInput(Inputs.SecretAccessKey), - core.getInput(Inputs.Region), core.getInput(Inputs.Bucket) ); await cache.saveCache(cachePaths, primaryKey);