Gitea/cache
1
0
Fork 0
mirror of https://github.com/actions/cache.git synced 2025-10-30 02:18:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from runs-on/fix/unset-existing-credentials

Browse Source 
Unset existing credentials when running on RunsOn
This commit is contained in:
Cyril Rohr 2024-02-28 22:01:41 +01:00 committed by GitHub
commit e6d7c363de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/restore-only/index.js vendored
View File

@ -93773,6 +93773,15 @@ const core = __importStar(__nccwpck_require__(2186));
const utils = __importStar(__nccwpck_require__(1518)); const utils = __importStar(__nccwpck_require__(1518));
const lib_storage_1 = __nccwpck_require__(3087); const lib_storage_1 = __nccwpck_require__(3087);
const downloadUtils_1 = __nccwpck_require__(6968); const downloadUtils_1 = __nccwpck_require__(6968);
// if executing from RunsOn, unset any existing AWS env variables so that we can use the IAM instance profile for credentials
// see unsetCredentials() in https://github.com/aws-actions/configure-aws-credentials/blob/v4.0.2/src/helpers.ts#L44
if (process.env.RUNS_ON_RUNNER_NAME) {
delete process.env.AWS_ACCESS_KEY_ID;
delete process.env.AWS_SECRET_ACCESS_KEY;
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_REGION;
delete process.env.AWS_DEFAULT_REGION;
}
const versionSalt = "1.0"; const versionSalt = "1.0";
const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE; const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE;
const region = process.env.RUNS_ON_AWS_REGION || const region = process.env.RUNS_ON_AWS_REGION ||
@ -93782,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93810,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93848,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93870,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

13
dist/restore/index.js vendored
View File

@ -93773,6 +93773,15 @@ const core = __importStar(__nccwpck_require__(2186));
const utils = __importStar(__nccwpck_require__(1518)); const utils = __importStar(__nccwpck_require__(1518));
const lib_storage_1 = __nccwpck_require__(3087); const lib_storage_1 = __nccwpck_require__(3087);
const downloadUtils_1 = __nccwpck_require__(6968); const downloadUtils_1 = __nccwpck_require__(6968);
// if executing from RunsOn, unset any existing AWS env variables so that we can use the IAM instance profile for credentials
// see unsetCredentials() in https://github.com/aws-actions/configure-aws-credentials/blob/v4.0.2/src/helpers.ts#L44
if (process.env.RUNS_ON_RUNNER_NAME) {
delete process.env.AWS_ACCESS_KEY_ID;
delete process.env.AWS_SECRET_ACCESS_KEY;
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_REGION;
delete process.env.AWS_DEFAULT_REGION;
}
const versionSalt = "1.0"; const versionSalt = "1.0";
const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE; const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE;
const region = process.env.RUNS_ON_AWS_REGION || const region = process.env.RUNS_ON_AWS_REGION ||
@ -93782,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93810,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93848,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93870,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

13
dist/save-only/index.js vendored
View File

@ -93773,6 +93773,15 @@ const core = __importStar(__nccwpck_require__(2186));
const utils = __importStar(__nccwpck_require__(1518)); const utils = __importStar(__nccwpck_require__(1518));
const lib_storage_1 = __nccwpck_require__(3087); const lib_storage_1 = __nccwpck_require__(3087);
const downloadUtils_1 = __nccwpck_require__(6968); const downloadUtils_1 = __nccwpck_require__(6968);
// if executing from RunsOn, unset any existing AWS env variables so that we can use the IAM instance profile for credentials
// see unsetCredentials() in https://github.com/aws-actions/configure-aws-credentials/blob/v4.0.2/src/helpers.ts#L44
if (process.env.RUNS_ON_RUNNER_NAME) {
delete process.env.AWS_ACCESS_KEY_ID;
delete process.env.AWS_SECRET_ACCESS_KEY;
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_REGION;
delete process.env.AWS_DEFAULT_REGION;
}
const versionSalt = "1.0"; const versionSalt = "1.0";
const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE; const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE;
const region = process.env.RUNS_ON_AWS_REGION || const region = process.env.RUNS_ON_AWS_REGION ||
@ -93782,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93810,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93848,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93870,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

13
dist/save/index.js vendored
View File

@ -93773,6 +93773,15 @@ const core = __importStar(__nccwpck_require__(2186));
const utils = __importStar(__nccwpck_require__(1518)); const utils = __importStar(__nccwpck_require__(1518));
const lib_storage_1 = __nccwpck_require__(3087); const lib_storage_1 = __nccwpck_require__(3087);
const downloadUtils_1 = __nccwpck_require__(6968); const downloadUtils_1 = __nccwpck_require__(6968);
// if executing from RunsOn, unset any existing AWS env variables so that we can use the IAM instance profile for credentials
// see unsetCredentials() in https://github.com/aws-actions/configure-aws-credentials/blob/v4.0.2/src/helpers.ts#L44
if (process.env.RUNS_ON_RUNNER_NAME) {
delete process.env.AWS_ACCESS_KEY_ID;
delete process.env.AWS_SECRET_ACCESS_KEY;
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_REGION;
delete process.env.AWS_DEFAULT_REGION;
}
const versionSalt = "1.0"; const versionSalt = "1.0";
const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE; const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE;
const region = process.env.RUNS_ON_AWS_REGION || const region = process.env.RUNS_ON_AWS_REGION ||
@ -93782,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93810,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93848,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93870,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

15
src/custom/backend.ts
View File

@ -24,6 +24,16 @@ export interface ArtifactCacheEntry {
archiveLocation?: string; archiveLocation?: string;
} }
// if executing from RunsOn, unset any existing AWS env variables so that we can use the IAM instance profile for credentials
// see unsetCredentials() in https://github.com/aws-actions/configure-aws-credentials/blob/v4.0.2/src/helpers.ts#L44
if (process.env.RUNS_ON_RUNNER_NAME) {
delete process.env.AWS_ACCESS_KEY_ID;
delete process.env.AWS_SECRET_ACCESS_KEY;
delete process.env.AWS_SESSION_TOKEN;
delete process.env.AWS_REGION;
delete process.env.AWS_DEFAULT_REGION;
}
const versionSalt = "1.0"; const versionSalt = "1.0";
const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE; const bucketName = process.env.RUNS_ON_S3_BUCKET_CACHE;
const region = const region =
@ -38,6 +48,8 @@ const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = const downloadPartSize =
Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new S3Client({ region });
export function getCacheVersion( export function getCacheVersion(
paths: string[], paths: string[],
compressionMethod?: CompressionMethod, compressionMethod?: CompressionMethod,
@ -86,7 +98,6 @@ export async function getCacheEntry(
{ compressionMethod, enableCrossOsArchive } { compressionMethod, enableCrossOsArchive }
) { ) {
const cacheEntry: ArtifactCacheEntry = {}; const cacheEntry: ArtifactCacheEntry = {};
const s3Client = new S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
@ -137,7 +148,6 @@ export async function downloadCache(
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new GetObjectCommand({ const command = new GetObjectCommand({
@ -169,7 +179,6 @@ export async function saveCache(
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive