actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(container-hook-service): improve AWS hook inclusion logic based on provider strategy and credentials; update binary files

pull/729/head
Frostebite 2025-09-04 15:35:34 +01:00
parent 8acf3ccca3
commit 962603b7b3
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js generated vendored
View File

@ -5731,8 +5731,18 @@ class ContainerHookService {
value: ${process.env.AWS_SECRET_ACCESS_KEY || ``} value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
- name: awsDefaultRegion - name: awsDefaultRegion
value: ${process.env.AWS_REGION || ``}`).filter((x) => cloud_runner_options_1.default.containerHookFiles.includes(x.name) && x.hook === hookLifecycle); value: ${process.env.AWS_REGION || ``}`).filter((x) => cloud_runner_options_1.default.containerHookFiles.includes(x.name) && x.hook === hookLifecycle);
if (builtInContainerHooks.length > 0) { // In local provider mode (non-container) or when AWS credentials are not present, skip AWS S3 hooks
results.push(...builtInContainerHooks); const isContainerized = cloud_runner_1.default.buildParameters?.providerStrategy === 'aws' ||
cloud_runner_1.default.buildParameters?.providerStrategy === 'k8s' ||
cloud_runner_1.default.buildParameters?.providerStrategy === 'local-docker';
const hasAwsCreds = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ||
(process.env.awsAccessKeyId && process.env.awsSecretAccessKey);
const shouldIncludeAwsHooks = isContainerized && !cloud_runner_1.default.buildParameters?.skipCache && hasAwsCreds;
const filteredBuiltIns = shouldIncludeAwsHooks
? builtInContainerHooks
: builtInContainerHooks.filter((x) => x.image !== 'amazon/aws-cli');
if (filteredBuiltIns.length > 0) {
results.push(...filteredBuiltIns);
} }
return results; return results;
} }

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

18
src/model/cloud-runner/services/hooks/container-hook-service.ts
View File

@ -175,8 +175,22 @@ export class ContainerHookService {
- name: awsDefaultRegion - name: awsDefaultRegion
value: ${process.env.AWS_REGION || ``}`, value: ${process.env.AWS_REGION || ``}`,
).filter((x) => CloudRunnerOptions.containerHookFiles.includes(x.name) && x.hook === hookLifecycle); ).filter((x) => CloudRunnerOptions.containerHookFiles.includes(x.name) && x.hook === hookLifecycle);
if (builtInContainerHooks.length > 0) {
results.push(...builtInContainerHooks); // In local provider mode (non-container) or when AWS credentials are not present, skip AWS S3 hooks
const isContainerized =
CloudRunner.buildParameters?.providerStrategy === 'aws' ||
CloudRunner.buildParameters?.providerStrategy === 'k8s' ||
CloudRunner.buildParameters?.providerStrategy === 'local-docker';
const hasAwsCreds =
(process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ||
(process.env.awsAccessKeyId && process.env.awsSecretAccessKey);
const shouldIncludeAwsHooks = isContainerized && !CloudRunner.buildParameters?.skipCache && hasAwsCreds;
const filteredBuiltIns = shouldIncludeAwsHooks
? builtInContainerHooks
: builtInContainerHooks.filter((x) => x.image !== 'amazon/aws-cli');
if (filteredBuiltIns.length > 0) {
results.push(...filteredBuiltIns);
} }
return results; return results;