kinesis and subscription filter for logs creation skipped when watchToEnd false

.github/workflows/cloud-runner-pipeline.yml

@@ -130,7 +130,7 @@ jobs:
           cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }}
           githubChecks: true
       - run: |
-          ls
+          tree ./cloud-runner-cache
           mv ./cloud-runner-cache/${{ steps.unity-build.outputs.CACHE_KEY }}/build/${{ steps.unity-build.outputs.BUILD_ARTIFACT }} ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
       - uses: actions/upload-artifact@v2
         with:

dist/index.js

@@ -1420,6 +1420,7 @@ const aws_error_1 = __nccwpck_require__(94669);
 const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
 const cleanup_cron_formation_1 = __nccwpck_require__(26162);
 const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
+const task_definition_formation_1 = __nccwpck_require__(97647);
 class AWSJobStack {
     constructor(baseStackName) {
         this.baseStackName = baseStackName;
@@ -1446,7 +1447,10 @@ 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, 'p2 - secret', aws_cloud_formation_templates_1.AWSCloudFormationTemplates.getSecretTemplate(`${secret.ParameterKey}`));
+                taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.insertAtTemplate(taskDefCloudFormation, '#template resources', 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) => {
@@ -2450,32 +2454,7 @@ Resources:
     Metadata:
       'AWS::CloudFormation::Designer':
         id: aece53ae-b82d-4267-bc16-ed964b05db27
-  SubscriptionFilter:
+  # template resources
-    Type: 'AWS::Logs::SubscriptionFilter'
-    Properties:
-      FilterPattern: ''
-      RoleArn:
-        'Fn::ImportValue': !Sub '${'${EnvironmentName}'}:CloudWatchIAMRole'
-      LogGroupName: !Ref LogGroupName
-      DestinationArn:
-        'Fn::GetAtt':
-          - KinesisStream
-          - Arn
-    Metadata:
-      'AWS::CloudFormation::Designer':
-        id: 7f809e91-9e5d-4678-98c1-c5085956c480
-    DependsOn:
-      - LogGroup
-      - KinesisStream
-  KinesisStream:
-    Type: 'AWS::Kinesis::Stream'
-    Properties:
-      Name: !Ref ServiceName
-      ShardCount: 1
-    Metadata:
-      'AWS::CloudFormation::Designer':
-        id: c6f18447-b879-4696-8873-f981b2cedd2b
-  # template secrets p2 - secret
   TaskDefinition:
     Type: 'AWS::ECS::TaskDefinition'
     Properties:
@@ -2531,6 +2510,31 @@ Resources:
     DependsOn:
       - LogGroup
 `;
+TaskDefinitionFormation.streamLogs = `SubscriptionFilter:
+    Type: 'AWS::Logs::SubscriptionFilter'
+    Properties:
+      FilterPattern: ''
+      RoleArn:
+        'Fn::ImportValue': !Sub '${'${EnvironmentName}'}:CloudWatchIAMRole'
+      LogGroupName: !Ref LogGroupName
+      DestinationArn:
+        'Fn::GetAtt':
+          - KinesisStream
+          - Arn
+    Metadata:
+      'AWS::CloudFormation::Designer':
+        id: 7f809e91-9e5d-4678-98c1-c5085956c480
+    DependsOn:
+      - LogGroup
+      - KinesisStream
+  KinesisStream:
+    Type: 'AWS::Kinesis::Stream'
+    Properties:
+      Name: !Ref ServiceName
+      ShardCount: 1
+    Metadata:
+      'AWS::CloudFormation::Designer':
+        id: c6f18447-b879-4696-8873-f981b2cedd2b`;
 
 
 /***/ }),

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

@@ -7,6 +7,7 @@ import { AWSError } from './aws-error';
 import CloudRunner from '../../cloud-runner';
 import { CleanupCronFormation } from './cloud-formations/cleanup-cron-formation';
 import CloudRunnerOptions from '../../cloud-runner-options';
+import { TaskDefinitionFormation } from './cloud-formations/task-definition-formation';
 
 export class AWSJobStack {
   private baseStackName: string;
@@ -59,9 +60,16 @@ export class AWSJobStack {
       );
       taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
         taskDefCloudFormation,
-        'p2 - secret',
+        '#template resources',
         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,32 +76,7 @@ Resources:
     Metadata:
       'AWS::CloudFormation::Designer':
         id: aece53ae-b82d-4267-bc16-ed964b05db27
-  SubscriptionFilter:
+  # template resources
-    Type: 'AWS::Logs::SubscriptionFilter'
-    Properties:
-      FilterPattern: ''
-      RoleArn:
-        'Fn::ImportValue': !Sub '${'${EnvironmentName}'}:CloudWatchIAMRole'
-      LogGroupName: !Ref LogGroupName
-      DestinationArn:
-        'Fn::GetAtt':
-          - KinesisStream
-          - Arn
-    Metadata:
-      'AWS::CloudFormation::Designer':
-        id: 7f809e91-9e5d-4678-98c1-c5085956c480
-    DependsOn:
-      - LogGroup
-      - KinesisStream
-  KinesisStream:
-    Type: 'AWS::Kinesis::Stream'
-    Properties:
-      Name: !Ref ServiceName
-      ShardCount: 1
-    Metadata:
-      'AWS::CloudFormation::Designer':
-        id: c6f18447-b879-4696-8873-f981b2cedd2b
-  # template secrets p2 - secret
   TaskDefinition:
     Type: 'AWS::ECS::TaskDefinition'
     Properties:
@@ -157,4 +132,29 @@ Resources:
     DependsOn:
       - LogGroup
 `;
+  public static streamLogs = `SubscriptionFilter:
+    Type: 'AWS::Logs::SubscriptionFilter'
+    Properties:
+      FilterPattern: ''
+      RoleArn:
+        'Fn::ImportValue': !Sub '${'${EnvironmentName}'}:CloudWatchIAMRole'
+      LogGroupName: !Ref LogGroupName
+      DestinationArn:
+        'Fn::GetAtt':
+          - KinesisStream
+          - Arn
+    Metadata:
+      'AWS::CloudFormation::Designer':
+        id: 7f809e91-9e5d-4678-98c1-c5085956c480
+    DependsOn:
+      - LogGroup
+      - KinesisStream
+  KinesisStream:
+    Type: 'AWS::Kinesis::Stream'
+    Properties:
+      Name: !Ref ServiceName
+      ShardCount: 1
+    Metadata:
+      'AWS::CloudFormation::Designer':
+        id: c6f18447-b879-4696-8873-f981b2cedd2b`;
 }