make sure all samples using same tags

Azure-Samples · Dec 5, 2022 · 4c05903 · 4c05903
1 parent ee1a82c
commit 4c05903
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 16 deletions.
diff --git a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
@@ -27,7 +27,9 @@ resource "azurerm_resource_group" "main" {
   location = var.location
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
@@ -57,7 +59,9 @@ resource "azurerm_cosmosdb_account" "application" {
   }
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/...g-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf b/...g-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
@@ -27,7 +27,9 @@ resource "azurerm_resource_group" "main" {
   location = var.location
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
@@ -57,7 +59,9 @@ resource "azurerm_cosmosdb_account" "application" {
   }
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf b/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/.../spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf b/.../spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/...bs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf b/...bs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
@@ -51,7 +51,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/...thubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf b/...thubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace_01" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
+    "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
 
@@ -86,7 +88,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace_02" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
+    "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
 

diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
@@ -70,8 +70,9 @@ resource "azurerm_key_vault" "kv_account_01" {
   }
 
   tags = {
-    "terraform"                 = "true"
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
@@ -121,8 +122,9 @@ resource "azurerm_key_vault" "kv_account_02" {
   }
 
   tags = {
-    "terraform"                 = "true"
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
@@ -71,6 +71,7 @@ resource "azurerm_key_vault" "kv_account" {
 
   tags = {
     "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

diff --git a/...s/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf b/...s/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
@@ -51,6 +51,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_01" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -84,6 +86,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_02" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

diff --git a/...ebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf b/...ebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
@@ -49,6 +49,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

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
@@ -49,7 +49,9 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

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
@@ -49,7 +49,9 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 

diff --git a/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf b/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
@@ -55,6 +55,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_01" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -94,6 +96,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_02" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

diff --git a/...spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf b/...spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
@@ -87,6 +87,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

diff --git a/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf b/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
@@ -51,6 +51,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

diff --git a/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf b/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
@@ -51,6 +51,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }

diff --git a/spring-petclinic-microservices/terraform/main.tf b/spring-petclinic-microservices/terraform/main.tf
@@ -27,6 +27,8 @@ resource "azurerm_resource_group" "main" {
   location = var.location
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -58,6 +60,8 @@ resource "azurerm_cosmosdb_account" "application" {
   }
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -152,6 +156,7 @@ resource "azurerm_key_vault" "kv_account" {
 
   tags = {
     "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }