fix validations

aws · Apr 6, 2022 · a40910e · a40910e
1 parent 4e67251
commit a40910e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 23 deletions.
diff --git a/packages/@aws-cdk/aws-codedeploy/lib/ecs/application.ts b/packages/@aws-cdk/aws-codedeploy/lib/ecs/application.ts
@@ -76,9 +76,7 @@ export class EcsApplication extends Resource implements IEcsApplication {
       resourceName: this.physicalName,
       arnFormat: ArnFormat.COLON_RESOURCE_NAME,
     });
-  }
 
-  protected validate(): string[] {
-    return validateName('Application', this.physicalName);
+    this.node.addValidation({ validate: () => validateName('Application', this.physicalName) });
   }
 }
diff --git a/packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts b/packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts
@@ -76,9 +76,7 @@ export class LambdaApplication extends Resource implements ILambdaApplication {
       resourceName: this.physicalName,
       arnFormat: ArnFormat.COLON_RESOURCE_NAME,
     });
-  }
 
-  protected validate(): string[] {
-    return validateName('Application', this.physicalName);
+    this.node.addValidation({ validate: () => validateName('Application', this.physicalName) });
   }
 }
diff --git a/packages/@aws-cdk/aws-codedeploy/lib/lambda/custom-deployment-config.ts b/packages/@aws-cdk/aws-codedeploy/lib/lambda/custom-deployment-config.ts
@@ -141,10 +141,8 @@ export class CustomLambdaDeploymentConfig extends Resource implements ILambdaDep
         resources: AwsCustomResourcePolicy.ANY_RESOURCE,
       }),
     });
-  }
 
-  protected validate(): string[] {
-    return validateName('Deployment config', this.deploymentConfigName);
+    this.node.addValidation({ validate: () => validateName('Deployment config', this.deploymentConfigName) });
   }
 
   // Validate the inputs. The percentage/interval limits come from CodeDeploy

diff --git a/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts
@@ -203,6 +203,8 @@ export class LambdaDeploymentGroup extends cdk.Resource implements ILambdaDeploy
     if (this.deploymentConfig instanceof Construct) {
       this.node.addDependency(this.deploymentConfig);
     }
+
+    this.node.addValidation({ validate: () => validateName('Deployment group', this.physicalName) });
   }
 
   /**
@@ -254,10 +256,6 @@ export class LambdaDeploymentGroup extends cdk.Resource implements ILambdaDeploy
       actions: ['codedeploy:PutLifecycleEventHookExecutionStatus'],
     });
   }
-
-  protected validate(): string[] {
-    return validateName('Deployment group', this.physicalName);
-  }
 }
 
 /**

diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/application.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/application.ts
@@ -77,9 +77,8 @@ export class ServerApplication extends Resource implements IServerApplication {
       resourceName: this.physicalName,
       arnFormat: ArnFormat.COLON_RESOURCE_NAME,
     });
-  }
 
-  protected validate(): string[] {
-    return validateName('Application', this.physicalName);
+    this.node.addValidation({ validate: () => validateName('Application', this.physicalName) });
   }
+
 }
diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts
@@ -118,10 +118,8 @@ export class ServerDeploymentConfig extends cdk.Resource implements IServerDeplo
 
     this.deploymentConfigName = resource.ref;
     this.deploymentConfigArn = arnForDeploymentConfig(this.deploymentConfigName);
-  }
 
-  protected validate(): string[] {
-    return validateName('Deployment config', this.physicalName);
+    this.node.addValidation({ validate: () => validateName('Deployment config', this.physicalName) });
   }
 }
 

diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts
@@ -314,6 +314,8 @@ export class ServerDeploymentGroup extends ServerDeploymentGroupBase {
       resourceName: `${this.application.applicationName}/${this.physicalName}`,
       arnFormat: ArnFormat.COLON_RESOURCE_NAME,
     });
+
+    this.node.addValidation({ validate: () => validateName('Deployment group', this.physicalName) });
   }
 
   /**
@@ -341,10 +343,6 @@ export class ServerDeploymentGroup extends ServerDeploymentGroupBase {
     return this._autoScalingGroups.slice();
   }
 
-  protected validate(): string[] {
-    return validateName('Deployment group', this.physicalName);
-  }
-
   private addCodeDeployAgentInstallUserData(asg: autoscaling.IAutoScalingGroup): void {
     if (!this.installAgent) {
       return;