Merge pull request #8 from clouddrove/internal-416

fix: default variable pass in variable.tf
clouddrove · May 23, 2023 · 719cd0a · 719cd0a
2 parents 2eadca3 + e9228df
commit 719cd0a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/_examples/AzMonitor-ActionGroups/main.tf b/_examples/AzMonitor-ActionGroups/main.tf
@@ -7,7 +7,7 @@ module "resource_group" {
   source  = "clouddrove/resource-group/azure"
   version = "1.0.2"
 
-  name        = "app-action"
+  name        = "app"
   environment = "test"
   label_order = ["name", "environment"]
   location    = "Canada Central"
@@ -17,7 +17,6 @@ module "azmonitor-action-groups" {
   source      = "./../.."
   name        = "app"
   environment = "test"
-  label_order = ["name", "environment"]
 
   actionGroups = {
     "group1" = {

diff --git a/_examples/AzMonitor-ActivityLogAlerts/example.tf b/_examples/AzMonitor-ActivityLogAlerts/example.tf
@@ -6,7 +6,7 @@ module "resource_group" {
   source  = "clouddrove/resource-group/azure"
   version = "1.0.2"
 
-  name        = "app-example"
+  name        = "app"
   environment = "test"
   label_order = ["name", "environment"]
   location    = "Canada Central"
@@ -16,7 +16,6 @@ module "azmonitor-action-group" {
   source      = "./../../"
   name        = "app"
   environment = "test"
-  label_order = ["name", "environment"]
 
   actionGroups = {
     "group1" = {
@@ -49,7 +48,6 @@ module "alerts" {
 
   name        = "app"
   environment = "test"
-  label_order = ["name", "environment"]
 
   activity_log_alert = {
     "test1" = {

diff --git a/_examples/AzMonitor-MetricAlerts/main.tf b/_examples/AzMonitor-MetricAlerts/main.tf
@@ -7,7 +7,7 @@ module "resource_group" {
   source  = "clouddrove/resource-group/azure"
   version = "1.0.2"
 
-  name        = "app1"
+  name        = "app"
   environment = "test"
   label_order = ["name", "environment"]
   location    = "Canada Central"
@@ -18,7 +18,6 @@ module "azmonitor-action-groups" {
   source      = "./../../"
   name        = "app"
   environment = "test"
-  label_order = ["name", "environment"]
 
   actionGroups = {
     "group1" = {
@@ -60,7 +59,6 @@ module "azmonitor-metric-alerts" {
 
   name        = "app"
   environment = "test"
-  label_order = ["name", "environment"]
 
   metricAlerts = {
     "alert1" = {

diff --git a/variables.tf b/variables.tf
@@ -32,7 +32,7 @@ variable "managedby" {
 
 variable "label_order" {
   type        = list(any)
-  default     = []
+  default     = ["name", "environment"]
   description = "Label order, e.g. `name`,`application`."
 }
 variable "repository" {
@@ -85,4 +85,4 @@ variable "activity_log_alert" {
   }))
 
   default = {}
-}
+}