log group name

dist/index.js

@@ -716,6 +716,12 @@ class CloudRunnerOptions {
         const input = CloudRunnerOptions.getInput(`watchToEnd`);
         return !input || input === 'true';
     }
+    static get retainWorkspaces() {
+        return CloudRunnerOptions.getInput(`retainWorkspaces`) || false;
+    }
+    static get retainWorkspacesMax() {
+        return Number(CloudRunnerOptions.getInput(`retainWorkspacesMax`)) || 5;
+    }
     static ToEnvVarFormat(input) {
         if (input.toUpperCase() === input) {
             return input;
@@ -1242,6 +1248,7 @@ class AWSJobStack {
             const secretsMappedToCloudFormationParameters = secrets.map((x) => {
                 return { ParameterKey: x.ParameterKey.replace(/[^\dA-Za-z]/g, ''), ParameterValue: x.ParameterValue };
             });
+            const logGroupName = `${this.baseStackName}/${taskDefStackName}`;
             const parameters = [
                 {
                     ParameterKey: 'EnvironmentName',
@@ -1255,6 +1262,10 @@ class AWSJobStack {
                     ParameterKey: 'ServiceName',
                     ParameterValue: taskDefStackName,
                 },
+                {
+                    ParameterKey: 'LogGroupName',
+                    ParameterValue: logGroupName,
+                },
                 {
                     ParameterKey: 'Command',
                     ParameterValue: 'echo "this template should be overwritten when running a task"',
@@ -1966,6 +1977,10 @@ Parameters:
     Type: String
     Default: example
     Description: A name for the service
+  LogGroupName:
+    Type: String
+    Default: example
+    Description: A name for the log groups in cloud watch
   ImageUrl:
     Type: String
     Default: nginx
@@ -2023,7 +2038,7 @@ Resources:
   LogGroup:
     Type: 'AWS::Logs::LogGroup'
     Properties:
-      LogGroupName: !Ref ServiceName
+      LogGroupName: !Ref LogGroupName
     Metadata:
       'AWS::CloudFormation::Designer':
         id: aece53ae-b82d-4267-bc16-ed964b05db27
@@ -2033,7 +2048,7 @@ Resources:
       FilterPattern: ''
       RoleArn:
         'Fn::ImportValue': !Sub '${'${EnvironmentName}'}:CloudWatchIAMRole'
-      LogGroupName: !Ref ServiceName
+      LogGroupName: !Ref LogGroupName
       DestinationArn:
         'Fn::GetAtt':
           - KinesisStream
@@ -2102,7 +2117,7 @@ Resources:
           LogConfiguration:
             LogDriver: awslogs
             Options:
-              awslogs-group: !Ref ServiceName
+              awslogs-group: !Ref LogGroupName
               awslogs-region: !Ref 'AWS::Region'
               awslogs-stream-prefix: !Ref ServiceName
     DependsOn:

src/model/cloud-runner/cloud-runner-options.ts

@@ -163,6 +163,14 @@ class CloudRunnerOptions {
     return !input || input === 'true';
   }
 
+  static get retainWorkspaces(): boolean {
+    return CloudRunnerOptions.getInput(`retainWorkspaces`) || false;
+  }
+
+  static get retainWorkspacesMax(): number {
+    return Number(CloudRunnerOptions.getInput(`retainWorkspacesMax`)) || 5;
+  }
+
   public static ToEnvVarFormat(input: string) {
     if (input.toUpperCase() === input) {
       return input;

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

@@ -69,6 +69,7 @@ export class AWSJobStack {
     const secretsMappedToCloudFormationParameters = secrets.map((x) => {
       return { ParameterKey: x.ParameterKey.replace(/[^\dA-Za-z]/g, ''), ParameterValue: x.ParameterValue };
     });
+    const logGroupName = `${this.baseStackName}/${taskDefStackName}`;
     const parameters = [
       {
         ParameterKey: 'EnvironmentName',
@@ -82,6 +83,10 @@ export class AWSJobStack {
         ParameterKey: 'ServiceName',
         ParameterValue: taskDefStackName,
       },
+      {
+        ParameterKey: 'LogGroupName',
+        ParameterValue: logGroupName,
+      },
       {
         ParameterKey: 'Command',
         ParameterValue: 'echo "this template should be overwritten when running a task"',

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

@@ -11,6 +11,10 @@ Parameters:
     Type: String
     Default: example
     Description: A name for the service
+  LogGroupName:
+    Type: String
+    Default: example
+    Description: A name for the log groups in cloud watch
   ImageUrl:
     Type: String
     Default: nginx
@@ -68,7 +72,7 @@ Resources:
   LogGroup:
     Type: 'AWS::Logs::LogGroup'
     Properties:
-      LogGroupName: !Ref ServiceName
+      LogGroupName: !Ref LogGroupName
     Metadata:
       'AWS::CloudFormation::Designer':
         id: aece53ae-b82d-4267-bc16-ed964b05db27
@@ -78,7 +82,7 @@ Resources:
       FilterPattern: ''
       RoleArn:
         'Fn::ImportValue': !Sub '${'${EnvironmentName}'}:CloudWatchIAMRole'
-      LogGroupName: !Ref ServiceName
+      LogGroupName: !Ref LogGroupName
       DestinationArn:
         'Fn::GetAtt':
           - KinesisStream
@@ -147,7 +151,7 @@ Resources:
           LogConfiguration:
             LogDriver: awslogs
             Options:
-              awslogs-group: !Ref ServiceName
+              awslogs-group: !Ref LogGroupName
               awslogs-region: !Ref 'AWS::Region'
               awslogs-stream-prefix: !Ref ServiceName
     DependsOn: