Skip to content

Fixed AWS to work when no secrets specified #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fixed AWS to work when no secrets specified #686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b048e94
Fixed aws to work when no secrets specified
brian-golfplusvr Jan 30, 2025
c794bde
Compiled
brian-golfplusvr Jan 30, 2025
4b9e1df
Fixed issue with containerRegistryImageVersion not allowing dot versi…
brian-golfplusvr Jan 31, 2025
05bb993
Added cloneDepth for CloudRunner options to specify depth of clone on…
brian-golfplusvr Feb 7, 2025
dc4de42
Added cloudRunnerRepoName to allow changing of CloudRunner launch uni…
brian-golfplusvr Feb 7, 2025
db9abc4
Fix to cloudRunnerBranch option 'undefined'
brian-golfplusvr Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export class AWSCloudFormationTemplates {

public static getSecretDefinitionTemplate(p1: string, p2: string) {
return `
Secrets:
- Name: '${p1}'
ValueFrom: !Ref ${p2}Secret
`;
Expand Down
10 changes: 9 additions & 1 deletion src/model/cloud-runner/providers/aws/aws-job-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class AWSJobStack {
);
taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
taskDefCloudFormation,
'p3 - container def',
'# template secrets p3 - container def',
AWSCloudFormationTemplates.getSecretDefinitionTemplate(secret.EnvironmentVariable, secret.ParameterKey),
);
}
Expand Down Expand Up @@ -113,9 +113,13 @@ export class AWSJobStack {
},
...secretsMappedToCloudFormationParameters,
];

CloudRunnerLogger.log(`TaskDef: ${taskDefCloudFormation}`);

CloudRunnerLogger.log(
`Starting AWS job with memory: ${CloudRunner.buildParameters.containerMemory} cpu: ${CloudRunner.buildParameters.containerCpu}`,
);

let previousStackExists = true;
while (previousStackExists) {
previousStackExists = false;
Expand All @@ -132,13 +136,17 @@ export class AWSJobStack {
}
}
}

const createStackInput: SDK.CloudFormation.CreateStackInput = {
StackName: taskDefStackName,
TemplateBody: taskDefCloudFormation,
Capabilities: ['CAPABILITY_IAM'],
Parameters: parameters,
};

CloudRunnerLogger.log(`StackInput: ${createStackInput}`);
try {
CloudRunnerLogger.log(`TaskDef Cloud formation: ${taskDefCloudFormation}`);
CloudRunnerLogger.log(`Creating job aws formation ${taskDefStackName}`);
await CF.createStack(createStackInput).promise();
await CF.waitFor('stackCreateComplete', { StackName: taskDefStackName }).promise();
Expand Down
5 changes: 2 additions & 3 deletions src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,8 @@ Resources:
MountPoints:
- SourceVolume: efs-data
ContainerPath: !Ref EFSMountDirectory
ReadOnly: false
Secrets:
# template secrets p3 - container def
ReadOnly: false
# template secrets p3 - container def
LogConfiguration:
LogDriver: awslogs
Options:
Expand Down