From b048e94e5273202cff98928261bd69eaa49ea0ec Mon Sep 17 00:00:00 2001
From: brian-golfplusvr <brian@golfplusvr.com>
Date: Thu, 30 Jan 2025 16:16:35 -0600
Subject: [PATCH] Fixed aws to work when no secrets specified

---
 .../providers/aws/aws-cloud-formation-templates.ts     |  1 +
 src/model/cloud-runner/providers/aws/aws-job-stack.ts  | 10 +++++++++-
 .../aws/cloud-formations/task-definition-formation.ts  |  5 ++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts b/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts
index 79334d30..55ffd0f5 100644
--- a/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts
+++ b/src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts
@@ -21,6 +21,7 @@ export class AWSCloudFormationTemplates {
 
   public static getSecretDefinitionTemplate(p1: string, p2: string) {
     return `
+          Secrets:
             - Name: '${p1}'
               ValueFrom: !Ref ${p2}Secret
 `;
diff --git a/src/model/cloud-runner/providers/aws/aws-job-stack.ts b/src/model/cloud-runner/providers/aws/aws-job-stack.ts
index 189155bc..6a1b236a 100644
--- a/src/model/cloud-runner/providers/aws/aws-job-stack.ts
+++ b/src/model/cloud-runner/providers/aws/aws-job-stack.ts
@@ -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),
       );
     }
@@ -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;
@@ -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();
diff --git a/src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts b/src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts
index f5d472d8..a99a7576 100644
--- a/src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts
+++ b/src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts
@@ -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: