From 7e4e239b9c21afdaf578190cb944eecc7b1ed908 Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Tue, 14 Feb 2023 11:23:14 +0800 Subject: [PATCH 1/2] update for pwl --- .../servicebus-jms-queue/README.md | 8 ++++---- .../src/main/resources/META-INF/spring.factories | 2 ++ .../src/main/resources/application.yaml | 3 ++- .../servicebus-jms-queue/terraform/main.tf | 9 +++++++++ .../servicebus-jms-queue/terraform/outputs.tf | 7 +++---- .../servicebus-jms-queue/terraform/setup_env.ps1 | 4 ++-- .../servicebus-jms-queue/terraform/setup_env.sh | 4 ++-- .../servicebus-jms-topic/README.md | 2 +- .../src/main/resources/application.yaml | 3 ++- .../servicebus-jms-topic/terraform/main.tf | 10 ++++++++++ .../servicebus-jms-topic/terraform/outputs.tf | 7 +++---- .../servicebus-jms-topic/terraform/setup_env.ps1 | 4 ++-- .../servicebus-jms-topic/terraform/setup_env.sh | 4 ++-- 13 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories 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 583838506..b6cac15e1 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 @@ -4,11 +4,11 @@ languages: - java products: - azure-service-bus -name: Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application -description: This sample demonstrates how to send and receive message by Azure Service Bus (queue) and JMS in Spring Boot application. +name: Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application without Password +description: This sample demonstrates how to send and receive message by Azure Service Bus (queue) and JMS in Spring Boot application without password. --- -# Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application +# Sending and Receiving Message by Azure Service Bus (Queue) And Jms in Spring Boot Application without Password This sample project demonstrates how to use Spring JMS for Azure Service Bus Queue via Spring Boot Starter `spring-cloud-azure-starter-servicebus-jms`. @@ -140,7 +140,7 @@ terraform\setup_env.ps1 If you want to run the sample in debug mode, you can save the output value. ```shell -SERVICEBUS_NAMESPACE_CONNECTION_STRING=... +SERVICEBUS_NAMESPACE=... PRICING_TIER=... ``` diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..7341d36bc --- /dev/null +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.azure.spring.cloud.autoconfigure.messaging.AzureMessagingListenerAutoConfiguration \ No newline at end of file diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml index 06804e564..217612787 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml @@ -1,5 +1,6 @@ spring: jms: servicebus: - connection-string: ${SERVICEBUS_NAMESPACE_CONNECTION_STRING} + endpoint: ${SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME} + passwordless-enabled: true pricing-tier: ${PRICING_TIER} diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf index aebba3351..8b86c1288 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf @@ -66,3 +66,12 @@ resource "azurerm_servicebus_queue" "queue" { requires_session = false default_message_ttl = "P14D" } + +data "azurerm_client_config" "current" { +} + +resource "azurerm_role_assignment" "role_servicebus_data_owner" { + scope = azurerm_servicebus_namespace.servicebus_namespace.id + role_definition_name = "Azure Service Bus Data Owner" + principal_id = data.azurerm_client_config.current.object_id +} 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 1c40d05b0..994382ca8 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 @@ -1,7 +1,6 @@ -output "SERVICEBUS_NAMESPACE_CONNECTION_STRING" { - value = azurerm_servicebus_namespace.servicebus_namespace.default_primary_connection_string - description = "The connection_string of servicebus namespace." - sensitive = true +output "SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME" { + value = azurerm_servicebus_namespace.servicebus_namespace.name + description = "The name of service bus namespace." } output "PRICING_TIER" { diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 index 42a68c424..3098b3e50 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 @@ -1,5 +1,5 @@ -$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING) +$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) $env:PRICING_TIER=$(terraform -chdir=terraform output -raw PRICING_TIER) -echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING +echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME echo PRICING_TIER=$env:PRICING_TIER diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh index 25b0b945e..11a63867c 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh @@ -1,5 +1,5 @@ -export SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING) +export SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) export PRICING_TIER=$(terraform -chdir=./terraform output -raw PRICING_TIER) -echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$SERVICEBUS_NAMESPACE_CONNECTION_STRING +echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME echo PRICING_TIER=$PRICING_TIER 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 80baacd4b..650043629 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 @@ -140,7 +140,7 @@ terraform\setup_env.ps1 If you want to run the sample in debug mode, you can save the output value. ```shell -SERVICEBUS_NAMESPACE_CONNECTION_STRING=... +SERVICEBUS_NAMESPACE=... PRICING_TIER=... ``` diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml index 85392ac4c..6c5c53039 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml @@ -1,6 +1,7 @@ spring: jms: servicebus: - connection-string: ${SERVICEBUS_NAMESPACE_CONNECTION_STRING} + endpoint: ${SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME} + passwordless-enabled: true pricing-tier: ${PRICING_TIER} topic-client-id: topic-client-id diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf index bd16c4192..30aa444c0 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf @@ -66,3 +66,13 @@ resource "azurerm_servicebus_subscription" "application" { max_delivery_count = 1 } + + +data "azurerm_client_config" "current" { +} + +resource "azurerm_role_assignment" "role_servicebus_data_owner" { + scope = azurerm_servicebus_namespace.servicebus_namespace.id + role_definition_name = "Azure Service Bus Data Owner" + principal_id = data.azurerm_client_config.current.object_id +} 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 1c40d05b0..aed43edc0 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 @@ -1,7 +1,6 @@ -output "SERVICEBUS_NAMESPACE_CONNECTION_STRING" { - value = azurerm_servicebus_namespace.servicebus_namespace.default_primary_connection_string - description = "The connection_string of servicebus namespace." - sensitive = true +output "SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME" { + value = azurerm_servicebus_namespace.servicebus_namespace.name + description = "The name of Service Bus namespace." } output "PRICING_TIER" { diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 index 42a68c424..3098b3e50 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 @@ -1,5 +1,5 @@ -$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING) +$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) $env:PRICING_TIER=$(terraform -chdir=terraform output -raw PRICING_TIER) -echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$env:SERVICEBUS_NAMESPACE_CONNECTION_STRING +echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME echo PRICING_TIER=$env:PRICING_TIER diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh index 25b0b945e..11a63867c 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh @@ -1,5 +1,5 @@ -export SERVICEBUS_NAMESPACE_CONNECTION_STRING=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_CONNECTION_STRING) +export SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) export PRICING_TIER=$(terraform -chdir=./terraform output -raw PRICING_TIER) -echo SERVICEBUS_NAMESPACE_CONNECTION_STRING=$SERVICEBUS_NAMESPACE_CONNECTION_STRING +echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME echo PRICING_TIER=$PRICING_TIER From fe6037ee912b4a183a646cecb43c0f881cbaae50 Mon Sep 17 00:00:00 2001 From: yiliu6 Date: Wed, 15 Feb 2023 10:22:27 +0800 Subject: [PATCH 2/2] update property name --- .../servicebus-jms-queue/README.md | 2 +- .../src/main/resources/META-INF/spring.factories | 2 -- .../servicebus-jms-queue/src/main/resources/application.yaml | 2 +- .../servicebus-jms-queue/terraform/outputs.tf | 2 +- .../servicebus-jms-queue/terraform/setup_env.ps1 | 4 ++-- .../servicebus-jms-queue/terraform/setup_env.sh | 4 ++-- .../servicebus-jms-topic/README.md | 2 +- .../servicebus-jms-topic/src/main/resources/application.yaml | 2 +- .../servicebus-jms-topic/terraform/outputs.tf | 2 +- .../servicebus-jms-topic/terraform/setup_env.ps1 | 4 ++-- .../servicebus-jms-topic/terraform/setup_env.sh | 4 ++-- 11 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories 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 b6cac15e1..6bcf407cf 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 @@ -140,7 +140,7 @@ terraform\setup_env.ps1 If you want to run the sample in debug mode, you can save the output value. ```shell -SERVICEBUS_NAMESPACE=... +SERVICEBUS_NAMESPACE_NAME=... PRICING_TIER=... ``` diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 7341d36bc..000000000 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.azure.spring.cloud.autoconfigure.messaging.AzureMessagingListenerAutoConfiguration \ No newline at end of file diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml index 217612787..f6e96ba8c 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/src/main/resources/application.yaml @@ -1,6 +1,6 @@ spring: jms: servicebus: - endpoint: ${SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME} + namespace: ${SERVICEBUS_NAMESPACE_NAME} passwordless-enabled: true pricing-tier: ${PRICING_TIER} 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 994382ca8..50c9eaba5 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 @@ -1,4 +1,4 @@ -output "SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME" { +output "SERVICEBUS_NAMESPACE_NAME" { value = azurerm_servicebus_namespace.servicebus_namespace.name description = "The name of service bus namespace." } diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 index 3098b3e50..9242dbdd8 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.ps1 @@ -1,5 +1,5 @@ -$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) +$env:SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_NAME) $env:PRICING_TIER=$(terraform -chdir=terraform output -raw PRICING_TIER) -echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME +echo SERVICEBUS_NAMESPACE_NAME=$env:SERVICEBUS_NAMESPACE_NAME echo PRICING_TIER=$env:PRICING_TIER diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh index 11a63867c..e7828fbd0 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/setup_env.sh @@ -1,5 +1,5 @@ -export SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) +export SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_NAME) export PRICING_TIER=$(terraform -chdir=./terraform output -raw PRICING_TIER) -echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME +echo SERVICEBUS_NAMESPACE_NAME=$SERVICEBUS_NAMESPACE_NAME echo PRICING_TIER=$PRICING_TIER 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 650043629..b3db21d67 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 @@ -140,7 +140,7 @@ terraform\setup_env.ps1 If you want to run the sample in debug mode, you can save the output value. ```shell -SERVICEBUS_NAMESPACE=... +SERVICEBUS_NAMESPACE_NAME=... PRICING_TIER=... ``` diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml index 6c5c53039..7924d1355 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/src/main/resources/application.yaml @@ -1,7 +1,7 @@ spring: jms: servicebus: - endpoint: ${SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME} + namespace: ${SERVICEBUS_NAMESPACE_NAME} passwordless-enabled: true pricing-tier: ${PRICING_TIER} topic-client-id: topic-client-id 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 aed43edc0..15b6ee76e 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 @@ -1,4 +1,4 @@ -output "SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME" { +output "SERVICEBUS_NAMESPACE_NAME" { value = azurerm_servicebus_namespace.servicebus_namespace.name description = "The name of Service Bus namespace." } diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 index 3098b3e50..9242dbdd8 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.ps1 @@ -1,5 +1,5 @@ -$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) +$env:SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=terraform output -raw SERVICEBUS_NAMESPACE_NAME) $env:PRICING_TIER=$(terraform -chdir=terraform output -raw PRICING_TIER) -echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$env:SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME +echo SERVICEBUS_NAMESPACE_NAME=$env:SERVICEBUS_NAMESPACE_NAME echo PRICING_TIER=$env:PRICING_TIER diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh index 11a63867c..e7828fbd0 100644 --- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh +++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/setup_env.sh @@ -1,5 +1,5 @@ -export SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME) +export SERVICEBUS_NAMESPACE_NAME=$(terraform -chdir=./terraform output -raw SERVICEBUS_NAMESPACE_NAME) export PRICING_TIER=$(terraform -chdir=./terraform output -raw PRICING_TIER) -echo SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME=$SERVICEBUS_FULL_QUALIFIED_DOMAIN_NAME +echo SERVICEBUS_NAMESPACE_NAME=$SERVICEBUS_NAMESPACE_NAME echo PRICING_TIER=$PRICING_TIER