actions/cache
1
0
Fork 0
mirror of https://code.forgejo.org/actions/cache.git synced 2024-10-17 06:34:41 +02:00
Code Activity

Allow env vars (#13)

Browse source 
* allow env vars

* manually run prettier

* rebuild dist

* Revert "rebuild dist"

This reverts commit 9d562404127f788fe91e072dde1d09ddaf287d30.

* rebuild dist using node16
This commit is contained in:
Rami Lukata 2023-10-31 17:34:48 +01:00 committed by GitHub
parent d792d9b725
commit 7d69ef2398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
action.yml
View file

@ -31,10 +31,10 @@ inputs:
required: true
aws-access-key-id:
description: 'An AWS access key id to access the bucket'
required: true
required: false
aws-secret-access-key:
description: 'An AWS secret access key to access the bucket'
required: true
required: false
aws-region:
description: 'An AWS region where the bucket is located'
required: false

8
dist/restore-only/index.js vendored
View file

@ -15852,10 +15852,12 @@ function getInputS3ClientConfig() {
}
const s3config = {
credentials: {
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId),
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey)
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId) ||
process.env["AWS_ACCESS_KEY_ID"],
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey) ||
process.env["AWS_SECRET_ACCESS_KEY"]
},
region: core.getInput(constants_1.Inputs.AWSRegion),
region: core.getInput(constants_1.Inputs.AWSRegion) || process.env["AWS_REGION"],
endpoint: core.getInput(constants_1.Inputs.AWSEndpoint),
bucketEndpoint: core.getBooleanInput(constants_1.Inputs.AWSS3BucketEndpoint),
forcePathStyle: core.getBooleanInput(constants_1.Inputs.AWSS3ForcePathStyle)

8
dist/restore/index.js vendored
View file

@ -15852,10 +15852,12 @@ function getInputS3ClientConfig() {
}
const s3config = {
credentials: {
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId),
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey)
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId) ||
process.env["AWS_ACCESS_KEY_ID"],
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey) ||
process.env["AWS_SECRET_ACCESS_KEY"]
},
region: core.getInput(constants_1.Inputs.AWSRegion),
region: core.getInput(constants_1.Inputs.AWSRegion) || process.env["AWS_REGION"],
endpoint: core.getInput(constants_1.Inputs.AWSEndpoint),
bucketEndpoint: core.getBooleanInput(constants_1.Inputs.AWSS3BucketEndpoint),
forcePathStyle: core.getBooleanInput(constants_1.Inputs.AWSS3ForcePathStyle)

8
dist/save-only/index.js vendored
View file

@ -15852,10 +15852,12 @@ function getInputS3ClientConfig() {
}
const s3config = {
credentials: {
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId),
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey)
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId) ||
process.env["AWS_ACCESS_KEY_ID"],
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey) ||
process.env["AWS_SECRET_ACCESS_KEY"]
},
region: core.getInput(constants_1.Inputs.AWSRegion),
region: core.getInput(constants_1.Inputs.AWSRegion) || process.env["AWS_REGION"],
endpoint: core.getInput(constants_1.Inputs.AWSEndpoint),
bucketEndpoint: core.getBooleanInput(constants_1.Inputs.AWSS3BucketEndpoint),
forcePathStyle: core.getBooleanInput(constants_1.Inputs.AWSS3ForcePathStyle)

8
dist/save/index.js vendored
View file

@ -15852,10 +15852,12 @@ function getInputS3ClientConfig() {
}
const s3config = {
credentials: {
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId),
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey)
accessKeyId: core.getInput(constants_1.Inputs.AWSAccessKeyId) ||
process.env["AWS_ACCESS_KEY_ID"],
secretAccessKey: core.getInput(constants_1.Inputs.AWSSecretAccessKey) ||
process.env["AWS_SECRET_ACCESS_KEY"]
},
region: core.getInput(constants_1.Inputs.AWSRegion),
region: core.getInput(constants_1.Inputs.AWSRegion) || process.env["AWS_REGION"],
endpoint: core.getInput(constants_1.Inputs.AWSEndpoint),
bucketEndpoint: core.getBooleanInput(constants_1.Inputs.AWSS3BucketEndpoint),
forcePathStyle: core.getBooleanInput(constants_1.Inputs.AWSS3ForcePathStyle)

10
src/utils/actionUtils.ts
View file

@ -88,10 +88,14 @@ export function getInputS3ClientConfig(): S3ClientConfig | undefined {
const s3config = {
credentials: {
accessKeyId: core.getInput(Inputs.AWSAccessKeyId),
secretAccessKey: core.getInput(Inputs.AWSSecretAccessKey)
accessKeyId:
core.getInput(Inputs.AWSAccessKeyId) ||
process.env["AWS_ACCESS_KEY_ID"],
secretAccessKey:
core.getInput(Inputs.AWSSecretAccessKey) ||
process.env["AWS_SECRET_ACCESS_KEY"]
},
region: core.getInput(Inputs.AWSRegion),
region: core.getInput(Inputs.AWSRegion) || process.env["AWS_REGION"],
endpoint: core.getInput(Inputs.AWSEndpoint),
bucketEndpoint: core.getBooleanInput(Inputs.AWSS3BucketEndpoint),
forcePathStyle: core.getBooleanInput(Inputs.AWSS3ForcePathStyle)