From ba34f46225a361e0ed869da7577cc5bdff01da89 Mon Sep 17 00:00:00 2001 From: unnatinadupalli <156947936+unnatinadupalli@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:08:16 -0800 Subject: [PATCH] fixing version == beta to unless version = ga (#9922) --- .../services/compute/compute_instance_helpers.go.erb | 6 +++--- .../services/compute/resource_compute_instance.go.erb | 2 +- .../compute/resource_compute_instance_template_test.go.erb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mmv1/third_party/terraform/services/compute/compute_instance_helpers.go.erb b/mmv1/third_party/terraform/services/compute/compute_instance_helpers.go.erb index 07b2a96be328..2ee4a302d8c3 100644 --- a/mmv1/third_party/terraform/services/compute/compute_instance_helpers.go.erb +++ b/mmv1/third_party/terraform/services/compute/compute_instance_helpers.go.erb @@ -371,7 +371,7 @@ func flattenNetworkInterfaces(d *schema.ResourceData, config *transport_tpg.Conf internalIP = iface.NetworkIP } - <% if version == "beta" -%> + <% unless version == 'ga' -%> if iface.NetworkAttachment != "" { networkAttachment, err := tpgresource.GetRelativePath(iface.NetworkAttachment) if err != nil { @@ -447,7 +447,7 @@ func expandNetworkInterfaces(d tpgresource.TerraformResourceData, config *transp data := raw.(map[string]interface{}) - <% if version == "beta" -%> + <% unless version == 'ga' -%> var networkAttachment = "" network := data["network"].(string) subnetwork := data["subnetwork"].(string) @@ -483,7 +483,7 @@ func expandNetworkInterfaces(d tpgresource.TerraformResourceData, config *transp ifaces[i] = &compute.NetworkInterface{ NetworkIP: data["network_ip"].(string), Network: nf.RelativeLink(), - <% if version == "beta" -%> + <% unless version == 'ga' -%> NetworkAttachment: networkAttachment, <% end -%> Subnetwork: sf.RelativeLink(), diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.erb index 19b5d93c59a7..9b5d047e1a4c 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.erb @@ -336,7 +336,7 @@ func ResourceComputeInstance() *schema.Resource { Description: `The name or self_link of the subnetwork attached to this interface.`, }, - <% if version == "beta" -%> + <% unless version == 'ga' -%> "network_attachment": { Type: schema.TypeString, Optional: true, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb index f00b359a1b8a..cf4e85de6703 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb @@ -1211,7 +1211,7 @@ func TestAccComputeInstanceTemplate_sourceImageEncryptionKey(t *testing.T) { }) } -<% if version == "beta" -%> +<% unless version == 'ga' -%> func TestAccComputeInstanceTemplate_NetworkAttachment(t *testing.T) { t.Parallel() @@ -1720,7 +1720,7 @@ func testAccCheckComputeInstanceTemplateHasMinCpuPlatform(instanceTemplate *comp } } -<% if version == "beta" -%> +<% unless version == 'ga' -%> func testAccCheckComputeInstanceTemplateHasNetworkAttachment(instanceTemplate *compute.InstanceTemplate, networkAttachmentName string) resource.TestCheckFunc { return func(s *terraform.State) error { for _, networkInterface := range instanceTemplate.Properties.NetworkInterfaces { @@ -3878,7 +3878,7 @@ resource "google_compute_instance_template" "foobar" { `, context) } -<% if version == "beta" -%> +<% unless version == 'ga' -%> func testAccComputeInstanceTemplate_network_attachment(context map[string]interface{}) string { return acctest.Nprintf(` data "google_compute_image" "my_image" {