fix

Author: Aditya-ranjan-16

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-01-27T09:12:20Z",
+  "generated_at": "2025-01-31T06:45:18Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -82,7 +82,7 @@
         "hashed_secret": "33da8d0e8af2efc260f01d8e5edfcc5c5aba44ad",
         "is_secret": true,
         "is_verified": false,
-        "line_number": 35,
+        "line_number": 36,
         "type": "Secret Keyword",
         "verified_result": null
       }

README.md

@@ -16,6 +16,7 @@
     * [Basic example with index creation and updates to cluster-wide settings](./examples/basic)
     * [Complete example with autoscaling, BYOK encryption and service credentials creation](./examples/complete)
     * [Financial Services Cloud profile example with autoscaling enabled](./examples/fscloud)
+    * [Restore from backup example](./examples/backup-restore)
 * [Contributing](#contributing)
 <!-- END OVERVIEW HOOK -->
 

examples/backup-restore/main.tf

@@ -10,9 +10,8 @@ module "resource_group" {
   existing_resource_group_name = var.resource_group
 }
 
-
 data "ibm_database_backups" "backup_database" {
-  deployment_id = var.elasticsearch_db_backup_crn
+  deployment_id = var.existing_database_crn
 }
 # New elasticsearch instance pointing to the backup instance
 module "restored_icd_elasticsearch" {

examples/backup-restore/variables.tf

@@ -21,6 +21,7 @@ variable "elasticsearch_version" {
   description = "Version of the elasticsearch instance. If no value passed, the current ICD preferred version is used."
   default     = null
 }
+
 variable "resource_group" {
   type        = string
   description = "An existing resource group name to use for this example, if unset a new resource group will be created"
@@ -39,8 +40,8 @@ variable "access_tags" {
   default     = []
 }
 
-variable "elasticsearch_db_backup_crn" {
+variable "existing_database_crn" {
   type        = string
-  description = "The existing CRN of a backup resource to restore from. If null then it will create a new instance first and then create another instance pointing to the backup of the first instance."
+  description = "The existing CRN of a backup resource to restore from."
   default     = null
 }

tests/other_test.go

@@ -94,7 +94,7 @@ func TestRunRestoredDBExample(t *testing.T) {
 		Region:        fmt.Sprint(permanentResources["elasticsearchRegion"]),
 		ResourceGroup: resourceGroup,
 		TerraformVars: map[string]interface{}{
-			"elasticsearch_db_backup_crn": permanentResources["elasticsearchCrn"],
+			"existing_database_crn": permanentResources["elasticsearchCrn"],
 		},
 		CloudInfoService: sharedInfoSvc,
 	})

tests/pr_test.go

@@ -55,40 +55,6 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func TestRunFSCloudExample(t *testing.T) {
-	t.Parallel()
-	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
-		Testing:      t,
-		TerraformDir: fscloudExampleTerraformDir,
-		Prefix:       "es-fs-test",
-		Region:       "us-south",
-		/*
-		 Comment out the 'ResourceGroup' input to force this test to create a unique resource group to ensure tests do
-		 not clash. This is due to the fact that an auth policy may already exist in this resource group since we are
-		 re-using a permanent HPCS instance. By using a new resource group, the auth policy will not already exist
-		 since this module scopes auth policies by resource group.
-		*/
-		//ResourceGroup: resourceGroup,
-		TerraformVars: map[string]interface{}{
-			"elasticsearch_version": latestVersion, // Always lock this test into the latest supported elasticsearch version
-			"access_tags":           permanentResources["accessTags"],
-			"kms_key_crn":           permanentResources["hpcs_south_root_key_crn"],
-		},
-		CloudInfoService: sharedInfoSvc,
-	})
-	options.SkipTestTearDown = true
-	output, err := options.RunTestConsistency()
-	assert.Nil(t, err, "This should not have errored")
-	assert.NotNil(t, output, "Expected some output")
-
-	// check if outputs exist
-	outputs := terraform.OutputAll(options.Testing, options.TerraformOptions)
-	expectedOutputs := []string{"port", "hostname"}
-	_, outputErr := testhelper.ValidateTerraformOutputs(outputs, expectedOutputs...)
-	assert.NoErrorf(t, outputErr, "Some outputs not found or nil")
-	options.TestTearDown()
-}
-
 func TestRunStandardSolutionSchematics(t *testing.T) {
 	t.Parallel()
 
@@ -178,27 +144,6 @@ func TestRunStandardUpgradeSolution(t *testing.T) {
 	}
 }
 
-func TestRunBasicExample(t *testing.T) {
-	t.Parallel()
-	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
-		Testing:            t,
-		TerraformDir:       "examples/basic",
-		Prefix:             "es-test",
-		ResourceGroup:      resourceGroup,
-		BestRegionYAMLPath: regionSelectionPath,
-		CloudInfoService:   sharedInfoSvc,
-
-		TerraformVars: map[string]interface{}{
-			"elasticsearch_version": latestVersion,
-			"member_host_flavor":    "multitenant", // Always lock this test into the latest supported elasticsearch version
-		},
-	})
-
-	output, err := options.RunTestConsistency()
-	assert.Nil(t, err, "This should not have errored")
-	assert.NotNil(t, output, "Expected some output")
-}
-
 func TestRunExistingInstance(t *testing.T) {
 	t.Parallel()
 	prefix := fmt.Sprintf("elastic-t-%s", strings.ToLower(random.UniqueId()))