renamed the tags variable

Author: Khuzaima-Shakeel

examples/backup-restore/catalogValidationValues.json.template

@@ -1,6 +1,6 @@
 {
   "ibmcloud_api_key": $VALIDATION_APIKEY,
   "region": "us-south",
-  "tags": $TAGS,
+  "resource_tags": $TAGS,
   "prefix": $PREFIX
 }

examples/backup-restore/main.tf

@@ -22,7 +22,7 @@ module "restored_icd_mongodb" {
   region             = var.region
   mongodb_version    = var.mongodb_version
   access_tags        = var.access_tags
-  tags               = var.tags
+  tags               = var.resource_tags
   member_host_flavor = "multitenant"
   backup_crn         = data.ibm_database_backups.backup_database.backups[0].backup_id
 }

examples/backup-restore/variables.tf

@@ -34,7 +34,7 @@ variable "mongodb_version" {
   default     = null
 }
 
-variable "tags" {
+variable "resource_tags" {
   type        = list(string)
   description = "Optional list of tags to be added to created resources"
   default     = []

examples/basic/main.tf

@@ -21,7 +21,7 @@ module "database" {
   region             = var.region
   mongodb_version    = var.mongodb_version
   access_tags        = var.access_tags
-  tags               = var.tags
+  tags               = var.resource_tags
   service_endpoints  = var.service_endpoints
   member_host_flavor = var.member_host_flavor
   service_credential_names = {

examples/basic/variables.tf

@@ -34,7 +34,7 @@ variable "mongodb_version" {
   default     = null
 }
 
-variable "tags" {
+variable "resource_tags" {
   type        = list(string)
   description = "Optional list of tags to be added to created resources"
   default     = []

examples/complete/main.tf

@@ -31,7 +31,7 @@ module "resource_group" {
 resource "ibm_is_vpc" "example_vpc" {
   name           = "${var.prefix}-vpc"
   resource_group = module.resource_group.resource_group_id
-  tags           = var.tags
+  tags           = var.resource_tags
 }
 
 resource "ibm_is_subnet" "testacc_subnet" {
@@ -59,7 +59,7 @@ module "key_protect_all_inclusive" {
   # Note: Database instance and Key Protect must be created on the same region.
   region                    = var.region
   key_protect_instance_name = "${var.prefix}-kp"
-  resource_tags             = var.tags
+  resource_tags             = var.resource_tags
   keys = [
     {
       key_ring_name = "icd"
@@ -113,7 +113,7 @@ module "icd_mongodb" {
   region            = var.region
   plan              = var.plan
   access_tags       = var.access_tags
-  tags              = var.tags
+  tags              = var.resource_tags
   auto_scaling      = var.auto_scaling
   # Example of how to use different KMS keys for data and backups
   use_ibm_owned_encryption_key = false
@@ -139,7 +139,7 @@ module "secrets_manager" {
   secrets_manager_name = "${var.prefix}-secrets-manager"
   sm_service_plan      = "trial"
   allowed_network      = "public-and-private"
-  sm_tags              = var.tags
+  sm_tags              = var.resource_tags
 }
 
 # Add a Secrets Group to the secret manager instance

examples/complete/variables.tf

@@ -23,7 +23,7 @@ variable "resource_group" {
   default     = null
 }
 
-variable "tags" {
+variable "resource_tags" {
   type        = list(string)
   description = "Optional list of tags to be added to created resources"
   default     = []

examples/fscloud/main.tf

@@ -23,7 +23,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {
 resource "ibm_is_vpc" "example_vpc" {
   name           = "${var.prefix}-vpc"
   resource_group = module.resource_group.resource_group_id
-  tags           = var.tags
+  tags           = var.resource_tags
 }
 
 resource "ibm_is_subnet" "testacc_subnet" {
@@ -58,7 +58,7 @@ module "mongodb" {
   resource_group_id         = module.resource_group.resource_group_id
   name                      = "${var.prefix}-mongodb"
   region                    = var.region
-  tags                      = var.tags
+  tags                      = var.resource_tags
   access_tags               = var.access_tags
   kms_key_crn               = var.kms_key_crn
   backup_encryption_key_crn = var.backup_encryption_key_crn

examples/fscloud/variables.tf

@@ -22,7 +22,7 @@ variable "resource_group" {
   default     = null
 }
 
-variable "tags" {
+variable "resource_tags" {
   type        = list(string)
   description = "Optional list of tags to be added to created resources"
   default     = []

tests/other_test.go

@@ -3,26 +3,21 @@ package test
 
 import (
 	"fmt"
-	"strings"
 
 	"testing"
 
-	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/stretchr/testify/assert"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
 )
 
 func testPlanICDVersions(t *testing.T, version string) {
 	t.Parallel()
 
-	prefix := fmt.Sprintf("mongo-%s", strings.ToLower(random.UniqueId()))
-	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
+	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: "examples/basic",
 		TerraformVars: map[string]interface{}{
 			"mongodb_version": version,
-			"prefix":          prefix,
-			"region":          fmt.Sprint(permanentResources["mongodbRegion"]),
 		},
 		CloudInfoService: sharedInfoSvc,
 	})
@@ -43,15 +38,15 @@ func TestPlanICDVersions(t *testing.T) {
 
 func TestRunRestoredDBExample(t *testing.T) {
 	t.Parallel()
-	prefix := fmt.Sprintf("mongodb-res-%s", strings.ToLower(random.UniqueId()))
-	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
-		Testing:      t,
-		TerraformDir: "examples/backup-restore",
+
+	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
+		Testing:       t,
+		TerraformDir:  "examples/backup-restore",
+		Prefix:        "mongo-restored",
+		Region:        fmt.Sprint(permanentResources["mongodbRegion"]),
+		ResourceGroup: resourceGroup,
 		TerraformVars: map[string]interface{}{
 			"existing_database_crn": permanentResources["mongodbCrn"],
-			"prefix":                prefix,
-			"region":                fmt.Sprint(permanentResources["mongodbRegion"]),
-			"resource_group":        resourceGroup,
 		},
 		CloudInfoService: sharedInfoSvc,
 	})