From b7e8c4d3c45651da97b1f1cd1020dc88a117f2a6 Mon Sep 17 00:00:00 2001
From: Aimery Methena <aimethed@amazon.com>
Date: Tue, 22 Oct 2024 13:29:54 -0400
Subject: [PATCH] add removal policy

---
 .../app/lib/stacks/dynamo-stack.ts                            | 3 ++-
 .../app/lib/stacks/opensearch-stack.ts                        | 3 ++-
 .../app/lib/stacks/rds-generic-stack.ts                       | 3 ++-
 .../app/lib/stacks/redshift-stack.ts                          | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts
index 7e1dfbee8..d00348ad1 100644
--- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts
+++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts
@@ -59,7 +59,8 @@ export class DynamoDBStack extends cdk.Stack {
     });
     const ecrRepo = new Repository(this, 'DynamoDBRepository', {
       repositoryName: 'athena-federation-repository-dynamodb',
-      emptyOnDelete: true
+      emptyOnDelete: true,
+      removalPolicy: cdk.RemovalPolicy.DESTROY
     });
     ecrRepo.addToResourcePolicy(
       new iam.PolicyStatement({
diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts
index 78c00b85c..14dd27122 100644
--- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts
+++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts
@@ -180,7 +180,8 @@ export class OpenSearchStack extends cdk.Stack {
 
     const ecrRepo = new Repository(this, 'ElasticsearchRepository', {
       repositoryName: 'athena-federation-repository-elasticsearch',
-      emptyOnDelete: true
+      emptyOnDelete: true,
+      removalPolicy: cdk.RemovalPolicy.DESTROY
     });
     ecrRepo.addToResourcePolicy(
       new iam.PolicyStatement({
diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts
index 65b7c1e32..63613852e 100644
--- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts
+++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts
@@ -156,7 +156,8 @@ export class RdsGenericStack extends cdk.Stack {
 
     const ecrRepo = new Repository(this, `${db_type}Repository`, {
       repositoryName: `athena-federation-repository-${db_type}`,
-      emptyOnDelete: true
+      emptyOnDelete: true,
+      removalPolicy: cdk.RemovalPolicy.DESTROY
     });
     ecrRepo.addToResourcePolicy(
       new iam.PolicyStatement({
diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts
index fcc6191cb..fe96d7acf 100644
--- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts
+++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts
@@ -7,6 +7,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
 import * as ssm from 'aws-cdk-lib/aws-ssm';
+import { Repository } from 'aws-cdk-lib/aws-ecr';
 import { CfnInclude } from 'aws-cdk-lib/cloudformation-include';
 import { Construct } from 'constructs';
 const path = require('path');
@@ -151,7 +152,8 @@ export class RedshiftStack extends cdk.Stack {
 
     const ecrRepo = new Repository(this, 'RedshiftRepository', {
       repositoryName: 'athena-federation-repository-redshift',
-      emptyOnDelete: true
+      emptyOnDelete: true,
+      removalPolicy: cdk.RemovalPolicy.DESTROY
     });
     ecrRepo.addToResourcePolicy(
       new iam.PolicyStatement({