From 24e2a7e20ced5a231c093010d0eb8321f19b0a75 Mon Sep 17 00:00:00 2001 From: "Jeffrey Jonathan Jennings (J3)" Date: Thu, 14 Nov 2024 22:12:32 -0500 Subject: [PATCH 1/2] Resolved #449. --- README.md | 2 +- aws-resources.tf | 2 +- scripts/run-terraform-locally.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 082d7c0..e6186b1 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ To help you start quickly, the repo comes with **_Docker containers_** for Mac M > - [Docker Desktop](https://www.docker.com/products/docker-desktop/) > - [Java JDK (Java Development Kit) 11](https://www.oracle.com/java/technologies/javase/jdk11-archive-downloads.html) > - [Python 3.11](https://www.python.org/downloads/release/python-3119/) - > - [Terraform CLI version 1.93 or higher](https://developer.hashicorp.com/terraform/install) + > - [Terraform CLI version 1.9.3 or higher](https://developer.hashicorp.com/terraform/install) 2. Clone the repo: ```bash diff --git a/aws-resources.tf b/aws-resources.tf index e62e1be..de3b3e6 100644 --- a/aws-resources.tf +++ b/aws-resources.tf @@ -59,7 +59,7 @@ resource "aws_secretsmanager_secret_version" "flink_compute_pool" { "flink.region": "${var.aws_region}", "flink.api.key": "${module.flink_api_key_rotation.active_api_key.id}", "flink.api.secret": "${module.flink_api_key_rotation.active_api_key.secret}", - "organzation.id": "${data.confluent_cloud_organization.env.id}", + "organzation.id": "${data.confluent_organization.env.id}", "environment.id": "${confluent_environment.env.id}", "flink.compute.pool.id": "${confluent_flink_compute_pool.env.id}"}) } diff --git a/scripts/run-terraform-locally.sh b/scripts/run-terraform-locally.sh index c1c2a59..b422223 100755 --- a/scripts/run-terraform-locally.sh +++ b/scripts/run-terraform-locally.sh @@ -210,4 +210,7 @@ else # Delete the AWS Glue Data Catalog Database, and all associated tables within database will also be deleted aws glue delete-database --name airlines || true + + # Delete the AWS S3 bucket and all objects within the bucket + aws s3 rb s3://${service_account_user} --force || true fi From 1f34f75f820b7002846792b3ab31ccf5b0003d3b Mon Sep 17 00:00:00 2001 From: "Jeffrey Jonathan Jennings (J3)" Date: Thu, 14 Nov 2024 22:56:33 -0500 Subject: [PATCH 2/2] See #444. Updated script. --- main.tf | 2 +- scripts/run-terraform-locally.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 83e56e4..3402f12 100644 --- a/main.tf +++ b/main.tf @@ -3,7 +3,7 @@ terraform { organization = "signalroom" workspaces { - name = "apache-flink-kickstarter-0001" + name = "apache-flink-kickstarter-0002" } } diff --git a/scripts/run-terraform-locally.sh b/scripts/run-terraform-locally.sh index b422223..4c0b912 100755 --- a/scripts/run-terraform-locally.sh +++ b/scripts/run-terraform-locally.sh @@ -203,7 +203,10 @@ else # Delete the secrets created by the Terraform configurations service_account_user=$(echo $service_account_user | tr '[:upper:]' '[:lower:]') aws secretsmanager delete-secret --secret-id /confluent_cloud_resource/${service_account_user}/schema_registry_cluster/java_client --force-delete-without-recovery || true + aws secretsmanager delete-secret --secret-id /confluent_cloud_resource/${service_account_user}/schema_registry_cluster/python_client --force-delete-without-recovery || true aws secretsmanager delete-secret --secret-id /confluent_cloud_resource/${service_account_user}/kafka_cluster/java_client --force-delete-without-recovery || true + aws secretsmanager delete-secret --secret-id /confluent_cloud_resource/${service_account_user}/kafka_cluster/python_client --force-delete-without-recovery || true + aws secretsmanager delete-secret --secret-id /confluent_cloud_resource/${service_account_user}/flink_compute_pool --force-delete-without-recovery || true aws secretsmanager delete-secret --secret-id /snowflake_resource/${service_account_user} --force-delete-without-recovery || true aws secretsmanager delete-secret --secret-id /snowflake_resource/${service_account_user}/rsa_private_key_pem_1 --force-delete-without-recovery || true aws secretsmanager delete-secret --secret-id /snowflake_resource/${service_account_user}/rsa_private_key_pem_2 --force-delete-without-recovery || true