diff --git a/labs/unicorn-store/infrastructure/cdk/pom.xml b/labs/unicorn-store/infrastructure/cdk/pom.xml index efa27f7fa..ff59c506f 100644 --- a/labs/unicorn-store/infrastructure/cdk/pom.xml +++ b/labs/unicorn-store/infrastructure/cdk/pom.xml @@ -48,7 +48,7 @@ io.github.cdklabs cdknag - 2.38.2 + 3.0.1 diff --git a/labs/unicorn-store/infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreApp.java b/labs/unicorn-store/infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreApp.java index fe38c4cd4..86c7a3160 100644 --- a/labs/unicorn-store/infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreApp.java +++ b/labs/unicorn-store/infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreApp.java @@ -1,5 +1,6 @@ package com.unicorn; +import java.util.Collections; import java.util.List; import com.unicorn.alternatives.UnicornAuditService; @@ -9,11 +10,7 @@ import com.unicorn.core.InfrastructureStack; import io.github.cdklabs.cdknag.AwsSolutionsChecks; -import io.github.cdklabs.cdknag.NagPackSuppression; -import io.github.cdklabs.cdknag.NagSuppressions; -import software.amazon.awscdk.App; -import software.amazon.awscdk.Aspects; -import software.amazon.awscdk.StackProps; +import software.amazon.awscdk.*; public class UnicornStoreApp { @@ -41,33 +38,33 @@ public static void main(final String[] args) { //Add CDK-NAG checks: https://github.com/cdklabs/cdk-nag //Add suppression to exclude certain findings that are not needed for Workshop environment - Aspects.of(app).add(new AwsSolutionsChecks()); + Validations.of(app).addPlugins(new AwsSolutionsChecks()); var suppression = List.of( - new NagPackSuppression.Builder().id("AwsSolutions-APIG4").reason("The workshop environment does not require API-Gateway authorization").build(), - new NagPackSuppression.Builder().id("AwsSolutions-COG4").reason("The workshop environment does not require Cognito User Pool authorization").build(), - new NagPackSuppression.Builder().id("AwsSolutions-RDS3").reason("Workshop environment does not need a Multi-AZ setup to reduce cost").build(), - new NagPackSuppression.Builder().id("AwsSolutions-IAM4").reason("AWS Managed policies are acceptable for the workshop").build(), - new NagPackSuppression.Builder().id("AwsSolutions-IAM5").reason("A wildcard is acceptable for this workshop to allow parallel creation of resources").build(), - new NagPackSuppression.Builder().id("AwsSolutions-RDS10").reason("Workshop environment is ephemeral and the database should be deleted by the end of the workshop").build(), - new NagPackSuppression.Builder().id("AwsSolutions-RDS11").reason("Database is in a private subnet and can use the default port").build(), - new NagPackSuppression.Builder().id("AwsSolutions-APIG2").reason("API Gateway request validation is not needed for workshop").build(), - new NagPackSuppression.Builder().id("AwsSolutions-APIG1").reason("API Gateway access logging not needed for workshop setup").build(), - new NagPackSuppression.Builder().id("AwsSolutions-APIG6").reason("API Gateway access logging not needed for workshop setup").build(), - new NagPackSuppression.Builder().id("AwsSolutions-VPC7").reason("Workshop environment does not need VPC flow logs").build(), - new NagPackSuppression.Builder().id("AwsSolutions-SMG4").reason("Ephemeral workshop environment does not need to rotate secrets").build(), - new NagPackSuppression.Builder().id("AwsSolutions-RDS2").reason("Workshop non-sensitive test database does not need encryption at rest").build(), - new NagPackSuppression.Builder().id("AwsSolutions-APIG3").reason("Workshop API Gateways do not need AWS WAF assigned").build(), - new NagPackSuppression.Builder().id("AwsSolutions-EC23").reason("Not needed").build(), - new NagPackSuppression.Builder().id("AwsSolutions-RDS13").reason("Workshop Database does not need backups").build(), - new NagPackSuppression.Builder().id("CdkNagValidationFailure").reason("Suppress warnings see: https://github.com/cdklabs/cdk-nag/issues/817").build() + new Acknowledgment.Builder().id("AwsSolutions-APIG4").reason("The workshop environment does not require API-Gateway authorization").build(), + new Acknowledgment.Builder().id("AwsSolutions-COG4").reason("The workshop environment does not require Cognito User Pool authorization").build(), + new Acknowledgment.Builder().id("AwsSolutions-RDS3").reason("Workshop environment does not need a Multi-AZ setup to reduce cost").build(), + new Acknowledgment.Builder().id("AwsSolutions-IAM4").reason("AWS Managed policies are acceptable for the workshop").build(), + new Acknowledgment.Builder().id("AwsSolutions-IAM5").reason("A wildcard is acceptable for this workshop to allow parallel creation of resources").build(), + new Acknowledgment.Builder().id("AwsSolutions-RDS10").reason("Workshop environment is ephemeral and the database should be deleted by the end of the workshop").build(), + new Acknowledgment.Builder().id("AwsSolutions-RDS11").reason("Database is in a private subnet and can use the default port").build(), + new Acknowledgment.Builder().id("AwsSolutions-APIG2").reason("API Gateway request validation is not needed for workshop").build(), + new Acknowledgment.Builder().id("AwsSolutions-APIG1").reason("API Gateway access logging not needed for workshop setup").build(), + new Acknowledgment.Builder().id("AwsSolutions-APIG6").reason("API Gateway access logging not needed for workshop setup").build(), + new Acknowledgment.Builder().id("AwsSolutions-VPC7").reason("Workshop environment does not need VPC flow logs").build(), + new Acknowledgment.Builder().id("AwsSolutions-SMG4").reason("Ephemeral workshop environment does not need to rotate secrets").build(), + new Acknowledgment.Builder().id("AwsSolutions-RDS2").reason("Workshop non-sensitive test database does not need encryption at rest").build(), + new Acknowledgment.Builder().id("AwsSolutions-APIG3").reason("Workshop API Gateways do not need AWS WAF assigned").build(), + new Acknowledgment.Builder().id("AwsSolutions-EC23").reason("Not needed").build(), + new Acknowledgment.Builder().id("AwsSolutions-RDS13").reason("Workshop Database does not need backups").build(), + new Acknowledgment.Builder().id("CdkNagValidationFailure").reason("Suppress warnings see: https://github.com/cdklabs/cdk-nag/issues/817").build() ); - NagSuppressions.addStackSuppressions(infrastructureStack, suppression); - NagSuppressions.addStackSuppressions(unicornStoreSpring, suppression); - NagSuppressions.addStackSuppressions(unicornStoreMicronaut, suppression); - NagSuppressions.addStackSuppressions(unicornStoreSpringGraalVM, suppression); - NagSuppressions.addStackSuppressions(unicornStoreQuarkus, suppression); - NagSuppressions.addStackSuppressions(unicornAuditService, suppression); + Validations.of(infrastructureStack).acknowledge(suppression.toArray(new Acknowledgment[0])); + Validations.of(unicornStoreSpring).acknowledge(suppression.toArray(new Acknowledgment[0])); + Validations.of(unicornStoreMicronaut).acknowledge(suppression.toArray(new Acknowledgment[0])); + Validations.of(unicornStoreSpringGraalVM).acknowledge(suppression.toArray(new Acknowledgment[0])); + Validations.of(unicornStoreQuarkus).acknowledge(suppression.toArray(new Acknowledgment[0])); + Validations.of(unicornAuditService).acknowledge(suppression.toArray(new Acknowledgment[0])); app.synth(); }