Refactor run-task

Author: Michae1CC

packages/@aws-cdk/aws-pipes-alpha/package.json

@@ -114,7 +114,7 @@
   },
   "jsiiRosetta": {
     "exampleDependencies": {
-      "@aws-cdk/aws-pipes-sources-alpha":  "^0.0.0"
+      "@aws-cdk/aws-pipes-sources-alpha": "^0.0.0"
     }
   }
 }

packages/@aws-cdk/aws-pipes-targets-alpha/package.json

@@ -116,7 +116,7 @@
   },
   "jsiiRosetta": {
     "exampleDependencies": {
-      "@aws-cdk/aws-pipes-sources-alpha":  "^0.0.0"
+      "@aws-cdk/aws-pipes-sources-alpha": "^0.0.0"
     }
   }
 }

packages/@aws-cdk/cx-api/.gitignore

@@ -7,3 +7,13 @@
 !LICENSE
 !NOTICE
 !CONTRIBUTING.md
+
+dist
+.LAST_PACKAGE
+.LAST_BUILD
+*.snk
+junit.xml
+.nyc_output
+coverage
+nyc.config.js
+!.eslintrc.js

packages/@aws-cdk/cx-api/package.json

@@ -58,11 +58,11 @@
     }
   },
   "scripts": {
-    "build": "yarn gen && cdk-build --skip-lint",
+    "build": "cdk-build",
     "gen": "cdk-copy cx-api",
     "watch": "cdk-watch",
     "lint": "cdk-lint && madge --circular --extensions js lib",
-    "test": "jest",
+    "test": "cdk-test",
     "pkglint": "pkglint -f",
     "package": "cdk-package",
     "awslint": "cdk-awslint",

packages/@aws-cdk/region-info/.gitignore

@@ -8,3 +8,10 @@
 !NOTICE
 !CONTRIBUTING.md
 
+
+dist
+.LAST_PACKAGE
+.LAST_BUILD
+*.snk
+junit.xml
+!.eslintrc.js

packages/@aws-cdk/region-info/package.json

@@ -58,7 +58,7 @@
     }
   },
   "scripts": {
-    "build": "yarn gen && cdk-build --skip-lint",
+    "build": "cdk-build",
     "gen": "cdk-copy region-info",
     "watch": "cdk-watch",
     "lint": "cdk-lint",

packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/ecs/run-task.ts

@@ -361,8 +361,7 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable {
       throw new ValidationError('Task Token is required in at least one `containerOverrides.environment` for callback. Use JsonPath.taskToken to set the token.', this);
     }
 
-    if ((this.props.taskDefinition !== undefined && this.props.taskDefinitionInput !== undefined) ||
-      (this.props.taskDefinition === undefined && this.props.taskDefinitionInput === undefined)) {
+    if (!this.hasProvidedOneOfTaskDefinitionOrTaskDefinitionInput()) {
       throw new ValidationError('Exactly one of \'taskDefinition\' or \'taskDefinitionInput\' must be provided.', this);
     }
 
@@ -408,7 +407,7 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable {
       }
     }
 
-    this.taskPolicies = this.makePolicyStatements();
+    this.taskPolicies = this.makePolicyStatements(props.taskDefinition, props.taskDefinitionInput);
   }
 
   /**
@@ -439,6 +438,12 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable {
     };
   }
 
+  private hasProvidedOneOfTaskDefinitionOrTaskDefinitionInput(): boolean {
+    const hasOnlyProvidedTaskDefinition = this.props.taskDefinition !== undefined && this.props.taskDefinitionInput === undefined;
+    const hasOnlyProvidedTaskDefinitionInput = this.props.taskDefinition === undefined && this.props.taskDefinitionInput !== undefined;
+    return hasOnlyProvidedTaskDefinition || hasOnlyProvidedTaskDefinitionInput;
+  }
+
   private configureAwsVpcNetworking() {
     const subnetSelection = this.props.subnets ??
       { subnetType: this.props.assignPublicIp ? ec2.SubnetType.PUBLIC : ec2.SubnetType.PRIVATE_WITH_EGRESS };
@@ -469,19 +474,20 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable {
     }
   }
 
-  private makeEcsPolicyStatements(): iam.PolicyStatement[] {
+  private makeEcsPolicyStatements(taskDefinition: ecs.TaskDefinition | undefined,
+    taskDefinitionInput: sfn.TaskInput | undefined): iam.PolicyStatement[] {
     const policyStatements: Array<iam.PolicyStatement> = [];
 
-    if (this.props.taskDefinition !== undefined) {
+    if (taskDefinition !== undefined) {
       policyStatements.push(
         new iam.PolicyStatement({
           actions: ['ecs:RunTask'],
           resources: [cdk.FeatureFlags.of(this).isEnabled(STEPFUNCTIONS_TASKS_FIX_RUN_ECS_TASK_POLICY)
-            ? this.getTaskDefinitionArn(this.props.taskDefinition)
-            : this.getTaskDefinitionFamilyArn(this.props.taskDefinition) + ':*'],
+            ? this.getTaskDefinitionArn(taskDefinition)
+            : this.getTaskDefinitionFamilyArn(taskDefinition) + ':*'],
         }),
       );
-    } else if (this.props.taskDefinitionInput !== undefined) {
+    } else if (taskDefinitionInput !== undefined) {
       policyStatements.push(
         new iam.PolicyStatement({
           actions: ['ecs:RunTask'],
@@ -506,23 +512,24 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable {
     return policyStatements;
   }
 
-  private makeIamPassRolePolicyStatements(): iam.PolicyStatement[] {
+  private makeIamPassRolePolicyStatements(taskDefinition: ecs.TaskDefinition | undefined,
+    taskDefinitionInput: sfn.TaskInput | undefined): iam.PolicyStatement[] {
     const policyStatements: Array<iam.PolicyStatement> = [];
 
-    if (this.props.taskDefinition !== undefined) {
+    if (taskDefinition !== undefined) {
       // Need to be able to pass both Task and Execution role
       const rolesRequiringPassRole = new Array<iam.IRole>();
-      rolesRequiringPassRole.push(this.props.taskDefinition.taskRole);
-      if (this.props.taskDefinition.executionRole) {
-        rolesRequiringPassRole.push(this.props.taskDefinition.executionRole);
+      rolesRequiringPassRole.push(taskDefinition.taskRole);
+      if (taskDefinition.executionRole) {
+        rolesRequiringPassRole.push(taskDefinition.executionRole);
       }
       policyStatements.push(
         new iam.PolicyStatement({
           actions: ['iam:PassRole'],
           resources: rolesRequiringPassRole.map((r) => r.roleArn),
         }),
       );
-    } else if (this.props.taskDefinitionInput !== undefined) {
+    } else if (taskDefinitionInput !== undefined) {
       // Need to be able to pass both task and execution role
       const rolesRequiringPassRole = new Array<iam.IRole>();
       if (this.props.taskRole !== undefined) {
@@ -571,10 +578,11 @@ export class EcsRunTask extends sfn.TaskStateBase implements ec2.IConnectable {
     return policyStatements;
   }
 
-  private makePolicyStatements(): iam.PolicyStatement[] {
+  private makePolicyStatements(taskDefinition: ecs.TaskDefinition | undefined,
+    taskDefinitionInput: sfn.TaskInput | undefined): iam.PolicyStatement[] {
     return [
-      ...this.makeEcsPolicyStatements(),
-      ...this.makeIamPassRolePolicyStatements(),
+      ...this.makeEcsPolicyStatements(taskDefinition, taskDefinitionInput),
+      ...this.makeIamPassRolePolicyStatements(taskDefinition, taskDefinitionInput),
       ...this.makeEventBridgePolicyStatements(),
     ];
   }

tools/@aws-cdk/spec2cdk/package.json

@@ -65,4 +65,4 @@
       "dependencies/cdk-point-dependencies"
     ]
   }
-}
+}