Merge pull request #450 from j3-signalroom/github_issue-449

GitHub issue 449

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

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}"})
 }

main.tf

@@ -3,7 +3,7 @@ terraform {
       organization = "signalroom"
 
         workspaces {
-            name = "apache-flink-kickstarter-0001"
+            name = "apache-flink-kickstarter-0002"
         }
   }
 

scripts/run-terraform-locally.sh

@@ -203,11 +203,17 @@ 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
 
     # 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