From a1de79ddd4ca806ffcd08647707548711faf73c0 Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Thu, 20 Jan 2022 13:05:53 +0800 Subject: [PATCH] Update readme and terraform scripts (#159) --- .../spring-cloud-azure-cosmos-sample/README.md | 5 ++--- .../spring-cloud-azure-cosmos-sample/terraform/outputs.tf | 5 +++++ .../spring-cloud-azure-data-cosmos-sample/README.md | 5 ++--- .../terraform/outputs.tf | 4 ++++ .../eventhubs-integration/README.md | 5 ++--- .../eventhubs-integration/terraform/outputs.tf | 7 ++++++- .../spring-cloud-azure-sample-eventhubs-kafka/README.md | 5 ++--- .../terraform/outputs.tf | 6 +++++- .../eventhubs-binder/README.md | 5 ++--- .../eventhubs-binder/terraform/outputs.tf | 7 ++++++- .../eventhubs-multibinders/README.md | 5 ++--- .../eventhubs-multibinders/terraform/outputs.tf | 7 ++++++- .../multiple-property-source/README.md | 5 ++--- .../multiple-property-source/terraform/outputs.tf | 5 +++++ .../single-property-source/README.md | 5 ++--- .../single-property-source/terraform/outputs.tf | 5 +++++ .../multiple-namespaces/README.md | 5 ++--- .../multiple-namespaces/terraform/outputs.tf | 5 +++++ .../single-namespace/README.md | 5 ++--- .../single-namespace/terraform/outputs.tf | 5 +++++ .../servicebus-jms-queue/README.md | 5 ++--- .../servicebus-jms-queue/terraform/outputs.tf | 5 +++++ .../servicebus-jms-topic/README.md | 5 ++--- .../servicebus-jms-topic/terraform/outputs.tf | 5 +++++ .../servicebus-multibinders/README.md | 5 ++--- .../servicebus-multibinders/terraform/outputs.tf | 5 +++++ .../servicebus-queue-binder/README.md | 5 ++--- .../servicebus-queue-binder/terraform/outputs.tf | 5 +++++ .../servicebus-topic-binder/README.md | 5 ++--- .../servicebus-topic-binder/terraform/outputs.tf | 5 +++++ .../storage-queue-integration/README.md | 5 ++--- .../storage-queue-integration/terraform/outputs.tf | 7 ++++++- .../storage-queue-operation/README.md | 5 ++--- .../storage-queue-operation/terraform/outputs.tf | 7 ++++++- .../storage-blob-sample/README.md | 5 ++--- .../storage-blob-sample/terraform/outputs.tf | 5 +++++ 36 files changed, 130 insertions(+), 60 deletions(-) diff --git a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/README.md b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/README.md index 3ee178f5d..e819c9126 100644 --- a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/README.md +++ b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -135,5 +134,5 @@ The terraform destroy command terminates resources managed by your terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/outputs.tf b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/outputs.tf index 3b7d8e048..277749d3e 100644 --- a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/outputs.tf +++ b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/outputs.tf @@ -23,3 +23,8 @@ output "object_id" { description = "Current user's object_id." } +output "resource_group_name" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} + diff --git a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/README.md b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/README.md index 4158966ce..248d16eda 100644 --- a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/README.md +++ b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/README.md @@ -67,8 +67,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -133,5 +132,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/outputs.tf b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/outputs.tf index 9575ca910..031e6cdf2 100644 --- a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/outputs.tf +++ b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/outputs.tf @@ -27,5 +27,9 @@ output "cosmos_database_name" { value = var.cosmos_database_name } +output "resource_group_name" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/README.md b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/README.md index ae5d9d0a8..ebe5530cc 100644 --- a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/README.md +++ b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -151,7 +150,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/outputs.tf b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/outputs.tf index 67241cf92..db1187ed5 100644 --- a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/outputs.tf +++ b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/outputs.tf @@ -11,4 +11,9 @@ output "AZURE_STORAGE_ACCOUNT_NAME" { output "AZURE_STORAGE_CONTAINER_NAME" { value = azurerm_storage_container.storage_container.name description = "The container name created in storage account." -} \ No newline at end of file +} + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/README.md b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/README.md index baf999bda..f77aa7575 100644 --- a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/README.md +++ b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/README.md @@ -70,8 +70,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -143,7 +142,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` ## Troubleshooting diff --git a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/outputs.tf b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/outputs.tf index bcbe5b010..882a7a283 100644 --- a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/outputs.tf +++ b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/outputs.tf @@ -12,5 +12,9 @@ output "AZURE_EVENTHUBS_CONNECTION_STRING" { output "EVENTHUBS_KAFKA" { value = azurerm_eventhub.eventhubs.name description = "The name of created event hubs." +} -} \ No newline at end of file +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/README.md b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/README.md index 8867f24b1..93ab49cda 100644 --- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/README.md +++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/README.md @@ -72,8 +72,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -154,5 +153,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/outputs.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/outputs.tf index 220c9979b..b104951db 100644 --- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/outputs.tf +++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/outputs.tf @@ -22,4 +22,9 @@ output "AZURE_EVENTHUB_NAME" { output "AZURE_EVENTHUB_CONSUMER_GROUP" { value = "$Default" description = "The value of default consumer group." -} \ No newline at end of file +} + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/README.md b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/README.md index d069e62c3..ad1ccc22e 100644 --- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/README.md +++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/README.md @@ -73,8 +73,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -156,7 +155,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/outputs.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/outputs.tf index 05ed07463..f498e5577 100644 --- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/outputs.tf +++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/outputs.tf @@ -40,4 +40,9 @@ output "AZURE_EVENTHUB_NAME_02" { output "AZURE_EVENTHUB_CONSUMER_GROUP_02" { value = "$Default" description = "The value of default consumer group 02." -} \ No newline at end of file +} + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/README.md b/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/README.md index 9daa518e6..12b32c1e1 100644 --- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/README.md +++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/README.md @@ -64,8 +64,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -135,5 +134,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/terraform/outputs.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/terraform/outputs.tf index 57553a8a3..24a261eb4 100644 --- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/terraform/outputs.tf +++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/terraform/outputs.tf @@ -7,3 +7,8 @@ output "KEYVAULT_URI_02" { value = azurerm_key_vault.kv_account_02.vault_uri description = "The key vault uri 02." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/README.md b/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/README.md index 0f8825899..01766af3f 100644 --- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/README.md +++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/README.md @@ -66,8 +66,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -127,5 +126,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/terraform/outputs.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/terraform/outputs.tf index 3010f283e..d1454b94d 100644 --- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/terraform/outputs.tf +++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/terraform/outputs.tf @@ -2,3 +2,8 @@ output "KEYVAULT_URI" { value = azurerm_key_vault.kv_account.vault_uri description = "The key vault uri." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/README.md b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/README.md index e595e925e..b52a26765 100644 --- a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/README.md +++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/README.md @@ -71,8 +71,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -138,7 +137,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/outputs.tf b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/outputs.tf index abcaa22b5..f56a56b86 100644 --- a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/outputs.tf @@ -7,3 +7,8 @@ output "AZURE_SERVICEBUS_NAMESPACE_02" { value = azurerm_servicebus_namespace.servicebus_namespace_02.name description = "The name of servicebus_02 namespace." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/README.md b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/README.md index 5f9e3ef29..9c30bc3a5 100644 --- a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/README.md +++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -148,7 +147,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/outputs.tf b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/outputs.tf index 4aa5129c6..ef4ae32f8 100644 --- a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/outputs.tf @@ -2,3 +2,8 @@ output "SERVICEBUS_NAMESPACE" { value = azurerm_servicebus_namespace.servicebus_namespace.name description = "The name of servicebus namespace." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md index 8c3223ea2..590f24220 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md @@ -69,8 +69,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -138,7 +137,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf index cdd44546f..1c40d05b0 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/outputs.tf @@ -8,3 +8,8 @@ output "PRICING_TIER" { value = var.pricing_tier description = "The pricing tier of Service Bus." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md index 8755b7db6..2fb73083d 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -136,7 +135,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf index f93e98f79..ba28960d8 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/outputs.tf @@ -8,3 +8,8 @@ output "PRICING_TIER" { value = var.pricing_tier description = "The pricing tier of Service Bus." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/README.md b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/README.md index 73ee52345..88bc19e1f 100644 --- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/README.md +++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/README.md @@ -72,8 +72,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -156,5 +155,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/outputs.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/outputs.tf index a17aad149..32c2d5f72 100644 --- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/outputs.tf @@ -24,3 +24,8 @@ output "AZURE_SERVICEBUS_QUEUE_NAME" { value = azurerm_servicebus_queue.servicebus_namespace_02_queue.name description = "The queue name in service bus namespace 02." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/README.md b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/README.md index 3f88e0e8b..eed2061e1 100644 --- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/README.md +++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/README.md @@ -73,8 +73,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -149,5 +148,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/outputs.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/outputs.tf index 5209d2437..db4b2a480 100644 --- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/outputs.tf @@ -7,3 +7,8 @@ output "AZURE_SERVICEBUS_QUEUE_NAME" { value = azurerm_servicebus_queue.queue.name description = "The name of created queue in the service bus namespace." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/README.md b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/README.md index dfef10061..5487ed512 100644 --- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/README.md +++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/README.md @@ -72,8 +72,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -147,5 +146,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/outputs.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/outputs.tf index 2df7cbc84..f5e403572 100644 --- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/outputs.tf +++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/outputs.tf @@ -12,3 +12,8 @@ output "AZURE_SERVICEBUS_TOPIC_SUBSCRIPTION_NAME" { value = azurerm_servicebus_subscription.servicebus_subscription.name description = "The name of created subscription in the service bus namespace." } + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/README.md b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/README.md index 23faad07b..6a85fb338 100644 --- a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/README.md +++ b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -130,5 +129,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/outputs.tf b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/outputs.tf index ecb5f94da..e1bc6a594 100644 --- a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/outputs.tf +++ b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/outputs.tf @@ -1,4 +1,9 @@ output "ACCOUNT_NAME" { value = azurerm_storage_account.storage_account.name description = "The name of storage account." -} \ No newline at end of file +} + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/README.md b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/README.md index c066db2d4..9716d39ab 100644 --- a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/README.md +++ b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -138,7 +137,7 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/outputs.tf b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/outputs.tf index ecb5f94da..e1bc6a594 100644 --- a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/outputs.tf +++ b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/outputs.tf @@ -1,4 +1,9 @@ output "ACCOUNT_NAME" { value = azurerm_storage_account.storage_account.name description = "The name of storage account." -} \ No newline at end of file +} + +output "RESOURCE_GROUP_NAME" { + value = azurerm_resource_group.main.name + description = "The resource group name." +} diff --git a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/README.md b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/README.md index 97fbf2881..675f228e0 100644 --- a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/README.md +++ b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/README.md @@ -68,8 +68,7 @@ After login Azure CLI with your account, now you can use the terraform script to terraform -chdir=./terraform init # Apply your Terraform Configuration -# Type `yes` at the confirmation prompt to proceed. -terraform -chdir=./terraform apply +terraform -chdir=./terraform apply -auto-approve ``` @@ -129,5 +128,5 @@ The terraform destroy command terminates resources managed by your Terraform pro To destroy the resources you created. ```shell -terraform -chdir=./terraform destroy +terraform -chdir=./terraform destroy -auto-approve ``` diff --git a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/outputs.tf b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/outputs.tf index b0229d8b9..cea545ab0 100644 --- a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/outputs.tf +++ b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/outputs.tf @@ -7,3 +7,8 @@ output "storage_container_name" { value = var.container_name description = "Azure Storage container name." } + +output "resource_group_name" { + value = azurerm_resource_group.main.name + description = "The resource group name." +}