root/actions-s3-caching
1
0
Fork 0
mirror of https://gitee.com/jack_whh/actions-s3-caching.git synced 2026-03-09 22:42:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix irsa support

Browse Source
This commit is contained in:
Dan Molik
2022-10-13 11:10:39 -04:00
parent 55608bd7c6
commit e5aa7db291
3 changed files with 5256 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5309
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -29,7 +29,7 @@
"@actions/io": "^1.1.0", "@actions/io": "^1.1.0",
"@aws-sdk/client-s3": "^3.51.0", "@aws-sdk/client-s3": "^3.51.0",
"@aws-sdk/types": "^3.50.0", "@aws-sdk/types": "^3.50.0",
"@aws-sdk/credential-provider-web-identity": "^3.50.0" "@aws-sdk/credential-providers": "^3.50.0"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^27.4.0", "@types/jest": "^27.4.0",

14
src/utils/actionUtils.ts
View File

@@ -1,9 +1,7 @@
import * as core from "@actions/core"; import * as core from "@actions/core";
import { Inputs, Outputs, RefKey, State } from "../constants"; import { Inputs, Outputs, RefKey, State } from "../constants";
import { CommonPrefix, InputSerialization, S3ClientConfig } from "@aws-sdk/client-s3";
import {CommonPrefix, InputSerialization, S3ClientConfig} from "@aws-sdk/client-s3"; import { fromTokenFile } from "@aws-sdk/credential-providers";
import { fromTokenFile } from "@aws-sdk/credential-provider-web-identity";
export function isGhes(): boolean { export function isGhes(): boolean {
const ghUrl = new URL( const ghUrl = new URL(
@@ -88,9 +86,11 @@ export function getInputS3ClientConfig(): S3ClientConfig | undefined {
accessKeyId: core.getInput(Inputs.AWSAccessKeyId), accessKeyId: core.getInput(Inputs.AWSAccessKeyId),
secretAccessKey: core.getInput(Inputs.AWSSecretAccessKey) secretAccessKey: core.getInput(Inputs.AWSSecretAccessKey)
} }
} : fromTokenFile({ } : {
roleAssumerWithWebIdentity: getDefaultRoleAssumerWithWebIdentity() credentials: {
}) fromTokenFile({})
}
}
const s3config = { const s3config = {
...credentials, ...credentials,
region: core.getInput(Inputs.AWSRegion), region: core.getInput(Inputs.AWSRegion),