added condition and updated provider version

Author: aatreyee257

README.md

@@ -60,7 +60,7 @@ You need the following permissions to run this module.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.70.0, <2.0.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.79.0, <2.0.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1, < 4.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1 |
 

examples/backup-restore/version.tf

@@ -5,7 +5,7 @@ terraform {
     # module's version.tf (basic example), and 1 example that will always use the latest provider version (complete example).
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">=1.70.0, <2.0.0"
+      version = ">=1.79.0, <2.0.0"
     }
   }
 }

examples/basic/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.70.0"
+      version = "1.79.0"
     }
     # The elasticsearch provider is not actually required by the module itself, just this example, so OK to use ">=" here instead of locking into a version
     elasticsearch = {

examples/complete/version.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">=1.70.0, <2.0.0"
+      version = ">=1.79.0, <2.0.0"
     }
   }
 }

solutions/standard/variables.tf

@@ -475,10 +475,6 @@ variable "kibana_image_secret" {
   description = "The name of the image registry access secret."
   type        = string
   default     = null
-  # validation {
-  #   condition     = !var.enable_kibana_dashboard || var.use_existing_registry_secret || (var.kibana_image_secret != null && length(var.kibana_image_secret)>0 )
-  #   error_message = "You must provide a valid secret name for Kibana image registry access."
-  # }
 }
 
 variable "kibana_visibility" {

solutions/standard/version.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.78.3"
+      version = "1.79.0"
     }
     time = {
       source  = "hashicorp/time"

tests/pr_test.go

@@ -313,10 +313,38 @@ func TestPlanValidation(t *testing.T) {
 	}
 
 	// Test the DA when using Kibana dashboard and existing KMS instance
-	var standardSolutionWithKibanaDashboardVars = map[string]interface{}{
-		"enable_kibana_dashboard":   false,
-		"existing_kms_instance_crn": permanentResources["hpcs_south_crn"],
-		"plan":                      "enterprise",
+
+	tfVarsMap := map[string]map[string]interface{}{}
+
+	if os.Getenv("ENABLE_KIBANA_DASHBOARD") == "true" {
+		tfVarsMap["standardSolutionWithKibanaDashboardVars"] = map[string]interface{}{
+			"existing_kms_instance_crn":             permanentResources["hpcs_south_crn"],
+			"kibana_image_secret":                   os.Getenv("KIBANA_IMAGE_SECRET"),
+			"kibana_registry_username":              os.Getenv("KIBANA_REGISTRY_USERNAME"),
+			"kibana_registry_personal_access_token": os.Getenv("KIBANA_REGISTRY_PERSONAL_ACCESS_TOKEN"),
+			"kibana_registry_server":                os.Getenv("KIBANA_REGISTRY_SERVER"),
+			"existingProjectID":                     os.Getenv("EXISTING_CODE_ENGINE_PROJECT_ID"),
+			"plan":                                  "enterprise",
+		}
+	}
+
+	for name, tfVars := range tfVarsMap {
+		t.Run(name, func(t *testing.T) {
+			for key, value := range tfVars {
+				options.TerraformOptions.Vars[key] = value
+			}
+
+			_, err := terraform.InitE(t, options.TerraformOptions)
+			require.NoError(t, err)
+
+			output, err := terraform.PlanE(t, options.TerraformOptions)
+			assert.Nil(t, err)
+			assert.NotNil(t, output)
+
+			for key := range tfVars {
+				delete(options.TerraformOptions.Vars, key)
+			}
+		})
 	}
 
 	// Test the DA when using IBM owned encryption key
@@ -325,10 +353,9 @@ func TestPlanValidation(t *testing.T) {
 	}
 
 	// Create a map of the variables
-	tfVarsMap := map[string]map[string]interface{}{
-		"standardSolutionWithElserModelVars":      standardSolutionWithElserModelVars,
-		"standardSolutionWithKibanaDashboardVars": standardSolutionWithKibanaDashboardVars,
-		"standardSolutionWithUseIbmOwnedEncKey":   standardSolutionWithUseIbmOwnedEncKey,
+	tfVarsMap = map[string]map[string]interface{}{
+		"standardSolutionWithElserModelVars":    standardSolutionWithElserModelVars,
+		"standardSolutionWithUseIbmOwnedEncKey": standardSolutionWithUseIbmOwnedEncKey,
 	}
 
 	_, initErr := terraform.InitE(t, options.TerraformOptions)

version.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = ">= 1.70.0, <2.0.0"
+      version = ">= 1.79.0, <2.0.0"
     }
     null = {
       source  = "hashicorp/null"