fix: vpe tests UNSKIP UPGRADE TESTS

Jordan-Williams2 · Jordan-Williams2 · commit 58be59de8057 · 2025-01-16T21:20:27.000Z
diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf
@@ -233,7 +233,7 @@ locals {
   # if - replace first char with J
   # elseif _ replace first char with K
   # else use asis
-  generated_admin_password = startswith(random_password.admin_password[0].result, "-") ? "J${substr(random_password.admin_password[0].result, 1, -1)}" : startswith(random_password.admin_password[0].result, "_") ? "K${substr(random_password.admin_password[0].result, 1, -1)}" : random_password.admin_password[0].result
+  generated_admin_password = var.admin_pass == null ? (startswith(random_password.admin_password[0].result, "-") ? "J${substr(random_password.admin_password[0].result, 1, -1)}" : startswith(random_password.admin_password[0].result, "_") ? "K${substr(random_password.admin_password[0].result, 1, -1)}" : random_password.admin_password[0].result) : var.admin_pass
 
   # admin password to use
   admin_pass = var.admin_pass == null ? local.generated_admin_password : var.admin_pass
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -187,6 +187,7 @@ func TestRunStandardUpgradeSolution(t *testing.T) {
 		"kms_endpoint_type":         "public",
 		"provider_visibility":       "public",
 		"resource_group_name":       options.Prefix,
+		"admin_pass":                options.Prefix,
 	}
 
 	output, err := options.RunTestUpgrade()

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ func TestRunStandardUpgradeSolution(t *testing.T) {`
`187`	`187`	`"kms_endpoint_type": "public",`
`188`	`188`	`"provider_visibility": "public",`
`189`	`189`	`"resource_group_name": options.Prefix,`
	`190`	`+ "admin_pass": options.Prefix,`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`output, err := options.RunTestUpgrade()`