test: update admin tests (PSKD-1392)

sassoftware · Feb 28, 2025 · f15fd1d · f15fd1d
1 parent 73fdc43
commit f15fd1d
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 22 deletions.
diff --git a/test/default_unit_test.go b/test/default_unit_test.go
@@ -663,39 +663,43 @@ func TestDefaultSubnets(t *testing.T) {
 	}
 }
 
-// Verify Acr disabled stuff
 // TestAdminAccess verifies that NSG rules for admin access are correctly applied in the Terraform plan.
-func TestDefaultAdminAccess(t *testing.T) {
+func TestAdminAccess(t *testing.T) {
 	adminAccessTests := map[string]testCase{
 		"defaultCidrTest": {
-			expected:        "[123.45.67.89/16]",
-			resourceMapName: "default_public_access_cidrs",
-			retriever:       getOutputsFromPlan,
-			message:         "Mismatch in default_public_access_cidrs",
+			expected:          "{[123.45.67.89/16]}",
+			resourceMapName:   "default_public_access_cidrs",
+			retriever:         getVariablesFromPlan,
+			attributeJsonPath: "{$}",
+			message:           "Mismatch in default_public_access_cidrs",
 		},
 		"clusterCidrTest": {
-			expected:        "<nil>",
-			resourceMapName: "cluster_endpoint_public_access_cidrs",
-			retriever:       getOutputsFromPlan,
-			message:         "Mismatch in cluster_endpoint_public_access_cidrs",
+			expected:          "{<nil>}",
+			resourceMapName:   "cluster_endpoint_public_access_cidrs",
+			retriever:         getVariablesFromPlan,
+			attributeJsonPath: "{$}",
+			message:           "Mismatch in cluster_endpoint_public_access_cidrs",
 		},
 		"vmCidrTest": {
-			expected:        "<nil>",
-			resourceMapName: "vm_public_access_cidrs",
-			retriever:       getOutputsFromPlan,
-			message:         "Mismatch in vm_public_access_cidrs",
+			expected:          "{<nil>}",
+			resourceMapName:   "vm_public_access_cidrs",
+			retriever:         getVariablesFromPlan,
+			attributeJsonPath: "{$}",
+			message:           "Mismatch in vm_public_access_cidrs",
 		},
 		"postgresCidrTest": {
-			expected:        "<nil>",
-			resourceMapName: "vm_public_access_cidrs",
-			retriever:       getOutputsFromPlan,
-			message:         "Mismatch in postgres_public_access_cidrs",
+			expected:          "{<nil>}",
+			resourceMapName:   "vm_public_access_cidrs",
+			retriever:         getVariablesFromPlan,
+			attributeJsonPath: "{$}",
+			message:           "Mismatch in postgres_public_access_cidrs",
 		},
 		"acrCidrTest": {
-			expected:        "<nil>",
-			resourceMapName: "acr_public_access_cidrs",
-			retriever:       getOutputsFromPlan,
-			message:         "Mismatch in acr_public_access_cidrs",
+			expected:          "{<nil>}",
+			resourceMapName:   "acr_public_access_cidrs",
+			retriever:         getVariablesFromPlan,
+			attributeJsonPath: "{$}",
+			message:           "Mismatch in acr_public_access_cidrs",
 		},
 	}
 

diff --git a/test/helpers.go b/test/helpers.go
@@ -51,6 +51,33 @@ func getJsonPathFromStateResource(t *testing.T, resource *tfjson.StateResource,
 	return out, nil
 }
 
+// getVariablesFromPlan retrieves the value from 'Variables' using variablesMapName and jsonPath
+func getVariablesFromPlan(t *testing.T, plan *terraform.PlanStruct, resourceMapName string, jsonPath string) (string, error) {
+	//valuesMap, exists := plan.RawPlan.Variables[resourceMapName]
+	variablesMap := plan.RawPlan.Variables
+	variables := variablesMap[resourceMapName]
+	require.NotNil(t, variables)
+	return getJsonPathFromPlannedVariablesMap(t, variables, jsonPath)
+}
+
+// getJsonPathFromResourcePlannedVariablesMap retrieves the value of a jsonpath query on a given *tfjson.StateResource
+// map is visited in random order
+func getJsonPathFromPlannedVariablesMap(t *testing.T, resourceMap *tfjson.PlanVariable, jsonPath string) (string, error) {
+	j := jsonpath.New("PlanParser")
+	j.AllowMissingKeys(true)
+	err := j.Parse(jsonPath)
+	if err != nil {
+		return "", err
+	}
+	buf := new(bytes.Buffer)
+	err = j.Execute(buf, resourceMap)
+	if err != nil {
+		return "", err
+	}
+	out := buf.String()
+	return out, nil
+}
+
 func getOutputsFromPlan(t *testing.T, plan *terraform.PlanStruct, outputName string, jsonPath string) (string, error) {
 	output, exists := plan.RawPlan.Variables[outputName]
 	if !exists {