Add safe self_link comparison to compute DS tests (#2586)

Merged PR #2586.
GoogleCloudPlatform · Nov 5, 2019 · 163f190 · 163f190
1 parent e655cea
commit 163f190
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 14 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/tests/data_source_google_compute_address_test.go b/third_party/terraform/tests/data_source_google_compute_address_test.go
@@ -107,7 +107,6 @@ func testAccDataSourceComputeAddressCheck(data_source_name string, resource_name
 		rs_attr := rs.Primary.Attributes
 
 		address_attrs_to_test := []string{
-			"self_link",
 			"name",
 			"address",
 		}
@@ -123,6 +122,10 @@ func testAccDataSourceComputeAddressCheck(data_source_name string, resource_name
 			}
 		}
 
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], rs_attr["self_link"], nil) && ds_attr["self_link"] != rs_attr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], rs_attr["self_link"])
+		}
+
 		if ds_attr["status"] != "RESERVED" {
 			return fmt.Errorf("status is %s; want RESERVED", ds_attr["status"])
 		}

diff --git a/third_party/terraform/tests/data_source_google_compute_forwarding_rule_test.go b/third_party/terraform/tests/data_source_google_compute_forwarding_rule_test.go
@@ -45,7 +45,6 @@ func testAccDataSourceGoogleForwardingRuleCheck(data_source_name string, resourc
 		rs_attr := rs.Primary.Attributes
 		forwarding_rule_attrs_to_test := []string{
 			"id",
-			"self_link",
 			"name",
 			"description",
 			"region",
@@ -70,6 +69,11 @@ func testAccDataSourceGoogleForwardingRuleCheck(data_source_name string, resourc
 				)
 			}
 		}
+
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], rs_attr["self_link"], nil) && ds_attr["self_link"] != rs_attr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], rs_attr["self_link"])
+		}
+
 		return nil
 	}
 }

diff --git a/third_party/terraform/tests/data_source_google_compute_global_address_test.go b/third_party/terraform/tests/data_source_google_compute_global_address_test.go
@@ -47,7 +47,6 @@ func testAccDataSourceComputeGlobalAddressCheck(data_source_name string, resourc
 		rs_attr := rs.Primary.Attributes
 
 		address_attrs_to_test := []string{
-			"self_link",
 			"name",
 			"address",
 		}
@@ -63,6 +62,10 @@ func testAccDataSourceComputeGlobalAddressCheck(data_source_name string, resourc
 			}
 		}
 
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], rs_attr["self_link"], nil) && ds_attr["self_link"] != rs_attr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], rs_attr["self_link"])
+		}
+
 		if ds_attr["status"] != "RESERVED" {
 			return fmt.Errorf("status is %s; want RESERVED", ds_attr["status"])
 		}

diff --git a/third_party/terraform/tests/data_source_google_compute_image_test.go b/third_party/terraform/tests/data_source_google_compute_image_test.go
@@ -51,8 +51,7 @@ func testAccDataSourceCheckPublicImage() resource.TestCheckFunc {
 
 		ds_attr := ds.Primary.Attributes
 		attrs_to_test := map[string]string{
-			"self_link": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-9-stretch-v20171129",
-			"family":    "debian-9",
+			"family": "debian-9",
 		}
 
 		for attr, expect_value := range attrs_to_test {
@@ -66,6 +65,12 @@ func testAccDataSourceCheckPublicImage() resource.TestCheckFunc {
 			}
 		}
 
+		selfLink := "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-9-stretch-v20171129"
+
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], selfLink, nil) && ds_attr["self_link"] != selfLink {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], selfLink)
+		}
+
 		return nil
 	}
 }

diff --git a/third_party/terraform/tests/data_source_google_compute_instance_group_test.go.erb b/third_party/terraform/tests/data_source_google_compute_instance_group_test.go.erb
@@ -90,7 +90,6 @@ func testAccCheckDataSourceGoogleComputeInstanceGroup(dataSourceName string) res
 			"project",
 			"description",
 			"network",
-			"self_link",
 			"size",
 		}
 
@@ -100,6 +99,10 @@ func testAccCheckDataSourceGoogleComputeInstanceGroup(dataSourceName string) res
 			}
 		}
 
+		if !compareSelfLinkOrResourceName("", dsAttrs["self_link"], rsAttrs["self_link"], nil) && dsAttrs["self_link"] != rsAttrs["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", dsAttrs["self_link"], rsAttrs["self_link"])
+		}
+
 		dsNamedPortsCount, ok := dsAttrs["named_port.#"]
 		if !ok {
 			return errors.New("can't find 'named_port' attribute in data source")

diff --git a/third_party/terraform/tests/data_source_google_compute_network_test.go b/third_party/terraform/tests/data_source_google_compute_network_test.go
@@ -43,7 +43,6 @@ func testAccDataSourceGoogleNetworkCheck(data_source_name string, resource_name
 		rs_attr := rs.Primary.Attributes
 		network_attrs_to_test := []string{
 			"id",
-			"self_link",
 			"name",
 			"description",
 		}
@@ -58,6 +57,11 @@ func testAccDataSourceGoogleNetworkCheck(data_source_name string, resource_name
 				)
 			}
 		}
+
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], rs_attr["self_link"], nil) && ds_attr["self_link"] != rs_attr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], rs_attr["self_link"])
+		}
+
 		return nil
 	}
 }

diff --git a/third_party/terraform/tests/data_source_google_compute_resource_policy_test.go.erb b/third_party/terraform/tests/data_source_google_compute_resource_policy_test.go.erb
@@ -52,7 +52,6 @@ func testAccDataSourceComputeResourcePolicyCheck(dataSourceName string, resource
 		rsAttr := rs.Primary.Attributes
 
 		policyAttrsToTest := []string{
-			"self_link",
 			"name",
 		}
 
@@ -67,6 +66,10 @@ func testAccDataSourceComputeResourcePolicyCheck(dataSourceName string, resource
 			}
 		}
 
+		if !compareSelfLinkOrResourceName("", dsAttr["self_link"], rsAttr["self_link"], nil) && dsAttr["self_link"] != rsAttr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", dsAttr["self_link"], rsAttr["self_link"])
+		}
+
 		return nil
 	}
 }

diff --git a/third_party/terraform/tests/data_source_google_compute_subnetwork_test.go b/third_party/terraform/tests/data_source_google_compute_subnetwork_test.go
@@ -43,7 +43,6 @@ func testAccDataSourceGoogleSubnetworkCheck(data_source_name string, resource_na
 
 		subnetwork_attrs_to_test := []string{
 			"id",
-			"self_link",
 			"name",
 			"description",
 			"ip_cidr_range",
@@ -62,8 +61,12 @@ func testAccDataSourceGoogleSubnetworkCheck(data_source_name string, resource_na
 			}
 		}
 
-		if v1RsNetwork := ConvertSelfLinkToV1(rs_attr["network"]); ds_attr["network"] != v1RsNetwork {
-			return fmt.Errorf("network is %s; want %s", ds_attr["network"], v1RsNetwork)
+		if !compareSelfLinkOrResourceName("", ds_attr["network"], rs_attr["network"], nil) && ds_attr["network"] != rs_attr["network"] {
+			return fmt.Errorf("network does not match: %s vs %s", ds_attr["network"], rs_attr["network"])
+		}
+
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], rs_attr["self_link"], nil) && ds_attr["self_link"] != rs_attr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], rs_attr["self_link"])
 		}
 
 		return nil

diff --git a/third_party/terraform/tests/data_source_google_compute_vpn_gateway_test.go b/third_party/terraform/tests/data_source_google_compute_vpn_gateway_test.go
@@ -43,7 +43,6 @@ func testAccDataSourceGoogleVpnGatewayCheck(data_source_name string, resource_na
 		rs_attr := rs.Primary.Attributes
 		vpn_gateway_attrs_to_test := []string{
 			"id",
-			"self_link",
 			"name",
 			"description",
 			"network",
@@ -59,6 +58,11 @@ func testAccDataSourceGoogleVpnGatewayCheck(data_source_name string, resource_na
 				)
 			}
 		}
+
+		if !compareSelfLinkOrResourceName("", ds_attr["self_link"], rs_attr["self_link"], nil) && ds_attr["self_link"] != rs_attr["self_link"] {
+			return fmt.Errorf("self link does not match: %s vs %s", ds_attr["self_link"], rs_attr["self_link"])
+		}
+
 		return nil
 	}
 }