OCM-6113 | ci: Fix teardown KMS issue with kmsname

terraform-redhat · Feb 15, 2024 · 0976a7e · 0976a7e
1 parent 95ef4f5
commit 0976a7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/tf-manifests/rhcs/clusters/rosa-classic/output.tf b/tests/tf-manifests/rhcs/clusters/rosa-classic/output.tf
@@ -3,7 +3,7 @@ output "cluster_id" {
 }
 
 output "cluster_name" {
-  value = rhcs_cluster_rosa_classic.rosa_sts_cluster.cluster_name
+  value = rhcs_cluster_rosa_classic.rosa_sts_cluster.name
 }
 
 output "additional_compute_security_groups" {

diff --git a/tests/utils/exec/cluster.go b/tests/utils/exec/cluster.go
@@ -55,7 +55,7 @@ type Proxy struct {
 // Just a placeholder, not research what to output yet.
 type ClusterOutput struct {
 	ClusterID                            string   `json:"cluster_id,omitempty"`
-	ClusterName                          string   `json:"cluster_name,omitempty"`
+	ClusterName                          string   `json:"name,omitempty"`
 	AdditionalComputeSecurityGroups      []string `json:"additional_compute_security_groups,omitempty"`
 	AdditionalInfraSecurityGroups        []string `json:"additional_infra_security_groups,omitempty"`
 	AdditionalControlPlaneSecurityGroups []string `json:"additional_control_plane_security_groups,omitempty"`
@@ -127,7 +127,7 @@ func (creator *ClusterService) Output() (*ClusterOutput, error) {
 	}
 	clusterOutput := &ClusterOutput{
 		ClusterID:                            h.DigString(out["cluster_id"], "value"),
-		ClusterName:                          h.DigString(out["cluster_name"], "value"),
+		ClusterName:                          h.DigString(out["name"], "value"),
 		AdditionalComputeSecurityGroups:      h.DigArrayToString(out["additional_compute_security_groups"], "value"),
 		AdditionalInfraSecurityGroups:        h.DigArrayToString(out["additional_infra_security_groups"], "value"),
 		AdditionalControlPlaneSecurityGroups: h.DigArrayToString(out["additional_control_plane_security_groups"], "value"),