Confluent Cloud Environment name fix (#67)

Extensions fixes
confluentinc · Jun 6, 2023 · 1950494 · 1950494
1 parent 7bc6d58
commit 1950494
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 24 deletions.
diff --git a/core/docker/db_transaction_simulator/Dockerfile b/core/docker/db_transaction_simulator/Dockerfile
@@ -1,5 +1,6 @@
 FROM python:3-alpine
-RUN apk add --no-cache mariadb-connector-c-dev ;\
+RUN PATH=$PATH:/root/.local/bin;\
+    apk add --no-cache mariadb-connector-c-dev ;\
     apk add --no-cache --virtual .build-deps \
     build-base \
     mariadb-dev ;\

diff --git a/core/terraform/aws/main.tf b/core/terraform/aws/main.tf
@@ -36,6 +36,7 @@ module "workshop-confluent-core" {
   ccloud_api_key           = var.ccloud_api_key
   ccloud_api_secret        = var.ccloud_api_secret
   ccloud_cluster_name      = var.ccloud_cluster_name
+  ccloud_env_name          = var.ccloud_env_name
   region                   = var.region
   participant_count        = var.participant_count
   ccloud_topics            = var.ccloud_topics

diff --git a/core/terraform/azure/main.tf b/core/terraform/azure/main.tf
@@ -35,6 +35,7 @@ module "workshop-confluent-core" {
   ccloud_api_key           = var.ccloud_api_key
   ccloud_api_secret        = var.ccloud_api_secret
   ccloud_cluster_name      = var.ccloud_cluster_name
+  ccloud_env_name          = var.ccloud_env_name
   region                   = var.location
   participant_count        = var.participant_count
   ccloud_topics            = var.ccloud_topics

diff --git a/core/terraform/common/confluent-cloud/main.tf b/core/terraform/common/confluent-cloud/main.tf
@@ -21,7 +21,7 @@ provider "confluent" {
 }
 
 resource "confluent_environment" "hybrid-workshop" {
-  display_name = "${var.name}-${var.ccloud_cluster_name}"
+  display_name = "${var.name}-${var.ccloud_env_name}"
 
 }
 

diff --git a/core/terraform/common/confluent-cloud/variables.tf b/core/terraform/common/confluent-cloud/variables.tf
@@ -7,6 +7,10 @@ variable "ccloud_api_secret" {
   description = "Confluent Cloud Provider"
 }
 
+variable "ccloud_env_name" {
+  description = "Confluent cloud cluster name"
+}
+
 variable "ccloud_cluster_name" {
   description = "Confluent cloud cluster name"
 }

diff --git a/core/terraform/gcp/main.tf b/core/terraform/gcp/main.tf
@@ -34,6 +34,7 @@ module "workshop-confluent-core" {
   ccloud_api_key           = var.ccloud_api_key
   ccloud_api_secret        = var.ccloud_api_secret
   ccloud_cluster_name      = var.ccloud_cluster_name
+  ccloud_env_name          = var.ccloud_env_name
   region                   = var.region
   participant_count        = var.participant_count
   ccloud_topics            = var.ccloud_topics

diff --git a/extensions/aws-dynamodb/terraform/aws_dynamodb_main.tf b/extensions/aws-dynamodb/terraform/aws_dynamodb_main.tf
@@ -91,7 +91,7 @@ resource "null_resource" "dynamodb_provisioners" {
 
   provisioner "remote-exec" {
     inline = [
-      "cat /tmp/dynamodb_conn_info.txt >> .workshop/docker/.env",
+      "cat /tmp/dynamodb_conn_info.txt >> ~/.workshop/docker/.env",
       "rm /tmp/dynamodb_conn_info.txt"
     ]
 

diff --git a/extensions/aws-redshift/terraform/aws_redshift_main.tf b/extensions/aws-redshift/terraform/aws_redshift_main.tf
@@ -47,7 +47,7 @@ resource "null_resource" "redshift_provisioners" {
 
   provisioner "remote-exec" {
     inline = [
-      "cat /tmp/rs_jdbc_url.txt >> .workshop/docker/.env",
+      "cat /tmp/rs_jdbc_url.txt >> ~/.workshop/docker/.env",
       "rm /tmp/rs_jdbc_url.txt"
     ]
 

diff --git a/extensions/aws-s3/terraform/aws_s3_main.tf b/extensions/aws-s3/terraform/aws_s3_main.tf
@@ -16,6 +16,14 @@ resource "aws_s3_bucket" "bucket" {
   force_destroy = true
 }
 
+resource "aws_s3_bucket_ownership_controls" "example" {
+  bucket = aws_s3_bucket.bucket.id
+
+  rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
+
 resource "aws_s3_bucket_acl" "bucket_acl" {
   bucket = aws_s3_bucket.bucket.id
   acl    = "private"
@@ -104,7 +112,7 @@ resource "null_resource" "s3_provisioners" {
 
   provisioner "remote-exec" {
     inline = [
-      "cat /tmp/s3_bucket_info.txt >> .workshop/docker/.env",
+      "cat /tmp/s3_bucket_info.txt >> ~/.workshop/docker/.env",
       "rm /tmp/s3_bucket_info.txt"
     ]
 

diff --git a/extensions/azure-blob-storage/terraform/azure_storage_main.tf b/extensions/azure-blob-storage/terraform/azure_storage_main.tf
@@ -38,9 +38,9 @@ resource "null_resource" "add_vars_azure_storage" {
 
   provisioner "remote-exec" {
     inline = [
-      "echo 'AZURE_STORAGE_ACCOUNT_NAME=${data.azurerm_storage_account.instance.name}' >> .workshop/docker/.env",
-      "echo 'AZURE_STORAGE_ACCOUNT_KEY=${data.azurerm_storage_account.instance.primary_access_key}' >> .workshop/docker/.env",
-      "echo 'AZURE_STORAGE_CONTAINER=${azurerm_storage_container.instance.name}' >> .workshop/docker/.env"
+      "echo 'AZURE_STORAGE_ACCOUNT_NAME=${data.azurerm_storage_account.instance.name}' >> ~/.workshop/docker/.env",
+      "echo 'AZURE_STORAGE_ACCOUNT_KEY=${data.azurerm_storage_account.instance.primary_access_key}' >> ~/.workshop/docker/.env",
+      "echo 'AZURE_STORAGE_CONTAINER=${azurerm_storage_container.instance.name}' >> ~/.workshop/docker/.env"
     ]
 
     connection {

diff --git a/extensions/google-big-query/terraform/gbq_main.tf b/extensions/google-big-query/terraform/gbq_main.tf
@@ -52,9 +52,9 @@ resource "null_resource" "gbq_provisioners" {
   provisioner "remote-exec" {
     inline = [
       "sleep 180",
-      "echo 'GBQ_CREDENTIALS_PATH=/tmp/gbq_creds.json' >> .workshop/docker/.env",
-      "echo 'GBQ_DATASET=${var.name}_dataset' >> .workshop/docker/.env",
-      "echo 'GBQ_PROJECT=${var.gbq_project}' >> .workshop/docker/.env",
+      "echo 'GBQ_CREDENTIALS_PATH=/tmp/gbq_creds.json' >> ~/.workshop/docker/.env",
+      "echo 'GBQ_DATASET=${var.name}_dataset' >> ~/.workshop/docker/.env",
+      "echo 'GBQ_PROJECT=${var.gbq_project}' >> ~/.workshop/docker/.env",
       "docker cp /tmp/gbq_creds.json kafka-connect-ccloud:/tmp",
       "rm /tmp/gbq_creds.json"
     ]

diff --git a/extensions/google-cloud-storage/terraform/gcs_main.tf b/extensions/google-cloud-storage/terraform/gcs_main.tf
@@ -61,8 +61,8 @@ resource "null_resource" "vm_provisioners" {
   provisioner "remote-exec" {
     inline = [
       "sleep 180",
-      "echo 'GCS_BUCKET_NAME=${var.name}-gcssink-bucket' >> .workshop/docker/.env",
-      "echo 'GCS_CREDENTIALS_PATH=/tmp/gcs_creds.json' >> .workshop/docker/.env",
+      "echo 'GCS_BUCKET_NAME=${var.name}-gcssink-bucket' >> ~/.workshop/docker/.env",
+      "echo 'GCS_CREDENTIALS_PATH=/tmp/gcs_creds.json' >> ~/.workshop/docker/.env",
       "docker cp /tmp/gcs_creds.json kafka-connect-ccloud:/tmp",
       "rm /tmp/gcs_creds.json"
     ]

diff --git a/extensions/mongodbatlas/terraform/mongodb_realm_utils.sh b/extensions/mongodbatlas/terraform/mongodb_realm_utils.sh
@@ -4,7 +4,10 @@ function import_realm_app(){
     #install_realm_cli
     #Installation should be done on the host laptop that execute the workshop creation. This code is executed locally
     realm-cli login --api-key=${MONGODBATLAS_PUBLIC_KEY} --private-api-key=${MONGODBATLAS_PRIVATE_KEY} --yes
-    realm-cli import --path $REALM_APP_DIR --strategy=replace-by-name --project-id ${MONGODBATLAS_PROJECT_ID} --include-hosting --yes
+    #realm-cli import --path $REALM_APP_DIR --strategy=replace-by-name --project-id ${MONGODBATLAS_PROJECT_ID} --include-hosting --yes
+    realm-cli push --local $REALM_APP_DIR --include-hosting --yes
+    # Retrieve and store the Realm App ID from the output of 'realm-cli app describe'
+    realm-cli app describe | sed  '1d' | jq '.' >> $REALM_APP_DIR/app.json
 }
 
 #app_name = checkout

diff --git a/extensions/mongodbatlas/terraform/mongodbatlas_main.tf b/extensions/mongodbatlas/terraform/mongodbatlas_main.tf
@@ -18,11 +18,12 @@ resource "mongodbatlas_cluster" "confluent" {
   replication_factor           = 3
   backup_enabled               = false
   auto_scaling_disk_gb_enabled = false
-  mongo_db_major_version       = var.mongodbatlas_mongo_db_major_version
+  #mongo_db_major_version       = var.mongodbatlas_mongo_db_major_version
 
   //Provider Settings "block"
-  provider_name               = var.mongodbatlas_provider_name
-  disk_size_gb                = var.mongodbatlas_disk_size_gb
+  provider_name = "TENANT"
+  backing_provider_name =  var.mongodbatlas_provider_name
+  #disk_size_gb                = var.mongodbatlas_disk_size_gb
   provider_instance_size_name = var.mongodbatlas_provider_instance_size_name
   provider_region_name        = var.mongodbatlas_provider_region_name
 }
@@ -46,7 +47,7 @@ resource "mongodbatlas_database_user" "confluent" {
   }
 }
 
-resource "mongodbatlas_project_ip_whitelist" "confluent" {
+resource "mongodbatlas_project_ip_access_list" "confluent" {
   depends_on = [module.workshop-core]
   count      = var.participant_count
   project_id = mongodbatlas_cluster.confluent.project_id
@@ -61,8 +62,8 @@ resource "null_resource" "vm_provisioners_atlas" {
   provisioner "remote-exec" {
     inline = [
       "sleep 30",
-      "echo 'MONGODBATLAS_SRV_ADDRESS=${local.mongodbatlas_srv_address}' >> .workshop/docker/.env",
-      "echo 'MONGODBATLAS_MONGO_URI=${data.mongodbatlas_cluster.confluent.mongo_uri}' >> .workshop/docker/.env"
+      "echo 'MONGODBATLAS_SRV_ADDRESS=${local.mongodbatlas_srv_address}' >> ~/.workshop/docker/.env",
+      "echo 'MONGODBATLAS_MONGO_URI=${data.mongodbatlas_cluster.confluent.mongo_uri}' >> ~/.workshop/docker/.env"
     ]
 
     connection {
@@ -116,15 +117,15 @@ resource "null_resource" "provisioner_install_realm_app" {
 
 data "external" "realm_app_id" {
   depends_on = [null_resource.provisioner_install_realm_app]
-  program = ["sh", "-c", "jq '. | {name: .name, app_id: .app_id}' ${path.module}/tmp/${var.name}/realm_checkout/config.json"]
+  program = ["sh", "-c", "jq '. | {name: .name, app_id: .client_app_id}' ${path.module}/tmp/${var.name}/realm_checkout/app.json"]
 }
 
-
 output "realm_app_id" {
   value = local.mongodbatlas_realm_app_id
 }
 
 resource "null_resource" "vm_provisioners_atlas_realm_app" {
+  depends_on = [module.workshop-core]
   count      = var.participant_count
 
   triggers = {
@@ -134,7 +135,7 @@ resource "null_resource" "vm_provisioners_atlas_realm_app" {
   provisioner "file" {
     content      = templatefile("${path.module}/add_realm_url_to_docs.tpl", { 
       mongodbatlas_realm_app_id   = self.triggers.realm_app_id
-      asciidoc_index_path  = ".workshop/docker/asciidoc/hybrid-cloud-workshop.html"
+      asciidoc_index_path  = "~/.workshop/docker/asciidoc/hybrid-cloud-workshop.html"
     })
     destination = "/tmp/add_realm_url_to_docs.sh"
 
@@ -149,7 +150,7 @@ resource "null_resource" "vm_provisioners_atlas_realm_app" {
   provisioner "remote-exec" {
     inline = [
       "chmod +x /tmp/add_realm_url_to_docs.sh",
-      "/tmp/add_realm_url_to_docs.sh"
+      "/tmp/add_realm_url_to_docs.sh",
     ]
 
     connection {
@@ -165,6 +166,7 @@ terraform {
   required_providers {
     mongodbatlas = {
       source  = "mongodb/mongodbatlas"
+      version = "1.9.0"
     }
   }
 }
diff --git a/extensions/mongodbatlas/terraform/realm_apps/realm_checkout/app.json b/extensions/mongodbatlas/terraform/realm_apps/realm_checkout/app.json