kinesis and subscription filter for logs creation skipped when watchToEnd false

dist/index.js

@@ -1437,6 +1437,9 @@ class AWSJobStack {
             taskDefCloudFormation = taskDefCloudFormation.replace(`ContainerMemory:
     Default: 2048`, `ContainerMemory:
     Default: ${Number.parseInt(memory)}`);
+            if (cloud_runner_options_1.default.watchCloudRunnerToEnd) {
+                taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, '#template resources logstream', task_definition_formation_1.TaskDefinitionFormation.streamLogs);
+            }
             for (const secret of secrets) {
                 secret.ParameterKey = `${buildGuid.replace(/[^\dA-Za-z]/g, '')}${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}`;
                 if (typeof secret.ParameterValue == 'number') {
@@ -1447,10 +1450,7 @@ class AWSJobStack {
                     continue;
                 }
                 taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, 'p1 - input', aws_cloud_formation_templates_1.AWSCloudFormationTemplates.getParameterTemplate(secret.ParameterKey));
-                taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, '#template resources', aws_cloud_formation_templates_1.AWSCloudFormationTemplates.getSecretTemplate(`${secret.ParameterKey}`));
+                taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, '#template resources secrets', aws_cloud_formation_templates_1.AWSCloudFormationTemplates.getSecretTemplate(`${secret.ParameterKey}`));
-                if (cloud_runner_options_1.default.watchCloudRunnerToEnd) {
-                    taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, '#template resources', task_definition_formation_1.TaskDefinitionFormation.streamLogs);
-                }
                 taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, 'p3 - container def', aws_cloud_formation_templates_1.AWSCloudFormationTemplates.getSecretDefinitionTemplate(secret.EnvironmentVariable, secret.ParameterKey));
             }
             const secretsMappedToCloudFormationParameters = secrets.map((x) => {
@@ -2456,7 +2456,10 @@ Resources:
     Metadata:
       'AWS::CloudFormation::Designer':
         id: aece53ae-b82d-4267-bc16-ed964b05db27
-  # template resources
+  # template resources secrets
+
+  # template resources logstream
+
   TaskDefinition:
     Type: 'AWS::ECS::TaskDefinition'
     Properties:
@@ -2512,7 +2515,8 @@ Resources:
     DependsOn:
       - LogGroup
 `;
-TaskDefinitionFormation.streamLogs = `  SubscriptionFilter:
+TaskDefinitionFormation.streamLogs = `
+  SubscriptionFilter:
     Type: 'AWS::Logs::SubscriptionFilter'
     Properties:
       FilterPattern: ''

src/model/cloud-runner/providers/aws/aws-job-stack.ts

@@ -41,6 +41,13 @@ export class AWSJobStack {
       `ContainerMemory:
     Default: ${Number.parseInt(memory)}`,
     );
+    if (CloudRunnerOptions.watchCloudRunnerToEnd) {
+      taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
+        taskDefCloudFormation,
+        '#template resources logstream',
+        TaskDefinitionFormation.streamLogs,
+      );
+    }
     for (const secret of secrets) {
       secret.ParameterKey = `${buildGuid.replace(/[^\dA-Za-z]/g, '')}${secret.ParameterKey.replace(
         /[^\dA-Za-z]/g,
@@ -60,16 +67,9 @@ export class AWSJobStack {
       );
       taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
         taskDefCloudFormation,
-        '#template resources',
+        '#template resources secrets',
         AWSCloudFormationTemplates.getSecretTemplate(`${secret.ParameterKey}`),
       );
-      if (CloudRunnerOptions.watchCloudRunnerToEnd) {
-        taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
-          taskDefCloudFormation,
-          '#template resources',
-          TaskDefinitionFormation.streamLogs,
-        );
-      }
       taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
         taskDefCloudFormation,
         'p3 - container def',

src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts

@@ -76,7 +76,10 @@ Resources:
     Metadata:
       'AWS::CloudFormation::Designer':
         id: aece53ae-b82d-4267-bc16-ed964b05db27
-  # template resources
+  # template resources secrets
+
+  # template resources logstream
+
   TaskDefinition:
     Type: 'AWS::ECS::TaskDefinition'
     Properties:
@@ -132,7 +135,8 @@ Resources:
     DependsOn:
       - LogGroup
 `;
-  public static streamLogs = `  SubscriptionFilter:
+  public static streamLogs = `
+  SubscriptionFilter:
     Type: 'AWS::Logs::SubscriptionFilter'
     Properties:
       FilterPattern: ''