From bc4f045828e68e0657a2fc5f1e3078d7feb5b873 Mon Sep 17 00:00:00 2001
From: upodroid <upodroid@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:50:12 +0000
Subject: [PATCH] lint fixes

---
 .../update_cluster/minimal_gce_dns-none/kubernetes.tf     | 3 ---
 .../update_cluster/minimal_gce_ilb/kubernetes.tf          | 3 ---
 .../minimal_gce_ilb_longclustername/kubernetes.tf         | 3 ---
 .../update_cluster/minimal_gce_plb/kubernetes.tf          | 3 ---
 upup/pkg/fi/cloudup/gcetasks/accelerator_config.go        | 2 +-
 upup/pkg/fi/cloudup/gcetasks/address.go                   | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/backend_service.go           | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/disk.go                      | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/firewallrule.go              | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/forwardingrule.go            | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/httphealthcheck.go           | 4 ++--
 upup/pkg/fi/cloudup/gcetasks/instance.go                  | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go      | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/instancetemplate.go          | 8 ++++----
 upup/pkg/fi/cloudup/gcetasks/network.go                   | 8 ++++----
 upup/pkg/fi/cloudup/gcetasks/poolhealthcheck.go           | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/projectiambinding.go         | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/serviceaccount.go            | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go          | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go          | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go          | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/subnet.go                    | 6 +++---
 upup/pkg/fi/cloudup/gcetasks/targetpool.go                | 6 +++---
 23 files changed, 56 insertions(+), 68 deletions(-)

diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf
index 44092420178bd..526315f40351e 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf
@@ -612,9 +612,6 @@ resource "google_compute_region_health_check" "api-minimal-gce-example-com" {
   }
   name   = "api-minimal-gce-example-com"
   region = "us-test1"
-  tcp_health_check {
-    port = 0
-  }
 }
 
 resource "google_compute_router" "nat-minimal-gce-example-com" {
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf
index 71fd26d75a2f3..8d03376679308 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf
+++ b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf
@@ -581,9 +581,6 @@ resource "google_compute_region_health_check" "api-minimal-gce-ilb-example-com"
   }
   name   = "api-minimal-gce-ilb-example-com"
   region = "us-test1"
-  tcp_health_check {
-    port = 0
-  }
 }
 
 resource "google_compute_router" "nat-minimal-gce-ilb-example-com" {
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf
index 473f3397720fd..7e75fdff70768 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf
@@ -581,9 +581,6 @@ resource "google_compute_region_health_check" "api-minimal-gce-with-a-very-very-
   }
   name   = "api-minimal-gce-with-a-very-very-very-very-very-long-name-example-com"
   region = "us-test1"
-  tcp_health_check {
-    port = 0
-  }
 }
 
 resource "google_compute_router" "nat-minimal-gce-with-a-very-very-very-very-very-long-nam-96dqvi" {
diff --git a/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf
index 2906f7d30c7b7..6ea253160de2a 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf
+++ b/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf
@@ -449,9 +449,6 @@ resource "google_compute_health_check" "api-minimal-gce-plb-example-com" {
   }
   name   = "api-minimal-gce-plb-example-com"
   region = ""
-  tcp_health_check {
-    port = 0
-  }
 }
 
 resource "google_compute_instance_group_manager" "a-master-us-test1-a-minimal-gce-plb-example-com" {
diff --git a/upup/pkg/fi/cloudup/gcetasks/accelerator_config.go b/upup/pkg/fi/cloudup/gcetasks/accelerator_config.go
index a2de4d7e5fa88..cef1f75b3121e 100644
--- a/upup/pkg/fi/cloudup/gcetasks/accelerator_config.go
+++ b/upup/pkg/fi/cloudup/gcetasks/accelerator_config.go
@@ -36,7 +36,7 @@ func (a *AcceleratorConfig) GetDependencies(tasks map[string]fi.CloudupTask) []f
 	return nil
 }
 
-func (_ *AcceleratorConfig) ShouldCreate(a, e, changes *AcceleratorConfig) (bool, error) {
+func (*AcceleratorConfig) ShouldCreate(a, e, changes *AcceleratorConfig) (bool, error) {
 	if e.AcceleratorCount < 0 {
 		return false, fmt.Errorf("acceleratorCount must be positive or 0")
 	}
diff --git a/upup/pkg/fi/cloudup/gcetasks/address.go b/upup/pkg/fi/cloudup/gcetasks/address.go
index ba955e539107b..fd1271596bc1c 100644
--- a/upup/pkg/fi/cloudup/gcetasks/address.go
+++ b/upup/pkg/fi/cloudup/gcetasks/address.go
@@ -129,7 +129,7 @@ func (e *Address) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *Address) CheckChanges(a, e, changes *Address) error {
+func (*Address) CheckChanges(a, e, changes *Address) error {
 	if a != nil {
 		if changes.Name != nil {
 			return fi.CannotChangeField("Name")
@@ -141,7 +141,7 @@ func (_ *Address) CheckChanges(a, e, changes *Address) error {
 	return nil
 }
 
-func (_ *Address) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Address) error {
+func (*Address) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Address) error {
 	cloud := t.Cloud
 	addr := &compute.Address{
 		Name:        *e.Name,
@@ -180,7 +180,7 @@ type terraformAddress struct {
 	Subnetwork  *terraformWriter.Literal `cty:"subnetwork"`
 }
 
-func (_ *Address) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Address) error {
+func (*Address) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Address) error {
 	tf := &terraformAddress{
 		Name:        e.Name,
 		AddressType: e.IPAddressType,
diff --git a/upup/pkg/fi/cloudup/gcetasks/backend_service.go b/upup/pkg/fi/cloudup/gcetasks/backend_service.go
index 6c74fdbea17ae..3c85f299389db 100644
--- a/upup/pkg/fi/cloudup/gcetasks/backend_service.go
+++ b/upup/pkg/fi/cloudup/gcetasks/backend_service.go
@@ -95,7 +95,7 @@ func (e *BackendService) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *BackendService) CheckChanges(a, e, changes *BackendService) error {
+func (*BackendService) CheckChanges(a, e, changes *BackendService) error {
 	if a != nil {
 		if changes.Name != nil {
 			return fi.CannotChangeField("Name")
@@ -104,7 +104,7 @@ func (_ *BackendService) CheckChanges(a, e, changes *BackendService) error {
 	return nil
 }
 
-func (_ *BackendService) RenderGCE(t *gce.GCEAPITarget, a, e, changes *BackendService) error {
+func (*BackendService) RenderGCE(t *gce.GCEAPITarget, a, e, changes *BackendService) error {
 	cloud := t.Cloud
 	var hcs []string
 	for _, hc := range e.HealthChecks {
@@ -167,7 +167,7 @@ type terraformBackendService struct {
 	Backend             []terraformBackend         `cty:"backend"`
 }
 
-func (_ *BackendService) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *BackendService) error {
+func (*BackendService) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *BackendService) error {
 	tf := &terraformBackendService{
 		Name:                e.Name,
 		LoadBalancingScheme: e.LoadBalancingScheme,
diff --git a/upup/pkg/fi/cloudup/gcetasks/disk.go b/upup/pkg/fi/cloudup/gcetasks/disk.go
index 9cf9579c98290..616bc5cb15f17 100644
--- a/upup/pkg/fi/cloudup/gcetasks/disk.go
+++ b/upup/pkg/fi/cloudup/gcetasks/disk.go
@@ -84,7 +84,7 @@ func (e *Disk) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *Disk) CheckChanges(a, e, changes *Disk) error {
+func (*Disk) CheckChanges(a, e, changes *Disk) error {
 	if a != nil {
 		if changes.SizeGB != nil {
 			return fi.CannotChangeField("SizeGB")
@@ -103,7 +103,7 @@ func (_ *Disk) CheckChanges(a, e, changes *Disk) error {
 	return nil
 }
 
-func (_ *Disk) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Disk) error {
+func (*Disk) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Disk) error {
 	cloud := t.Cloud
 	typeURL := fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/diskTypes/%s",
 		cloud.Project(),
@@ -170,7 +170,7 @@ type terraformDisk struct {
 	Labels     map[string]string `cty:"labels"`
 }
 
-func (_ *Disk) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Disk) error {
+func (*Disk) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Disk) error {
 	cloud := t.Cloud.(gce.GCECloud)
 
 	labels := make(map[string]string)
diff --git a/upup/pkg/fi/cloudup/gcetasks/firewallrule.go b/upup/pkg/fi/cloudup/gcetasks/firewallrule.go
index 29ceb66297493..dcf2f98c03bb6 100644
--- a/upup/pkg/fi/cloudup/gcetasks/firewallrule.go
+++ b/upup/pkg/fi/cloudup/gcetasks/firewallrule.go
@@ -142,7 +142,7 @@ func (e *FirewallRule) Normalize(c *fi.CloudupContext) error {
 	return nil
 }
 
-func (_ *FirewallRule) CheckChanges(a, e, changes *FirewallRule) error {
+func (*FirewallRule) CheckChanges(a, e, changes *FirewallRule) error {
 	if e.Network == nil {
 		return fi.RequiredField("Network")
 	}
@@ -202,7 +202,7 @@ func (e *FirewallRule) mapToGCE(project string) (*compute.Firewall, error) {
 	return firewall, nil
 }
 
-func (_ *FirewallRule) RenderGCE(t *gce.GCEAPITarget, a, e, changes *FirewallRule) error {
+func (*FirewallRule) RenderGCE(t *gce.GCEAPITarget, a, e, changes *FirewallRule) error {
 	cloud := t.Cloud
 	firewall, err := e.mapToGCE(cloud.Project())
 	if err != nil {
@@ -243,7 +243,7 @@ type terraformFirewall struct {
 	Disabled bool `cty:"disabled"`
 }
 
-func (_ *FirewallRule) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *FirewallRule) error {
+func (*FirewallRule) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *FirewallRule) error {
 	g, err := e.mapToGCE(t.Project)
 	if err != nil {
 		return err
diff --git a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go
index ab0d3d1718414..45155a4335f9e 100644
--- a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go
+++ b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go
@@ -132,14 +132,14 @@ func (e *ForwardingRule) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *ForwardingRule) CheckChanges(a, e, changes *ForwardingRule) error {
+func (*ForwardingRule) CheckChanges(a, e, changes *ForwardingRule) error {
 	if fi.ValueOf(e.Name) == "" {
 		return fi.RequiredField("Name")
 	}
 	return nil
 }
 
-func (_ *ForwardingRule) RenderGCE(t *gce.GCEAPITarget, a, e, changes *ForwardingRule) error {
+func (*ForwardingRule) RenderGCE(t *gce.GCEAPITarget, a, e, changes *ForwardingRule) error {
 	ctx := context.TODO()
 
 	name := fi.ValueOf(e.Name)
@@ -283,7 +283,7 @@ type terraformForwardingRule struct {
 	Labels              map[string]string        `cty:"labels"`
 }
 
-func (_ *ForwardingRule) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ForwardingRule) error {
+func (*ForwardingRule) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ForwardingRule) error {
 	name := fi.ValueOf(e.Name)
 
 	tf := &terraformForwardingRule{
diff --git a/upup/pkg/fi/cloudup/gcetasks/httphealthcheck.go b/upup/pkg/fi/cloudup/gcetasks/httphealthcheck.go
index 63f550779fd45..685fb7e3af96b 100644
--- a/upup/pkg/fi/cloudup/gcetasks/httphealthcheck.go
+++ b/upup/pkg/fi/cloudup/gcetasks/httphealthcheck.go
@@ -70,7 +70,7 @@ func (e *HTTPHealthcheck) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *HTTPHealthcheck) CheckChanges(a, e, changes *HTTPHealthcheck) error {
+func (*HTTPHealthcheck) CheckChanges(a, e, changes *HTTPHealthcheck) error {
 	if fi.ValueOf(e.Name) == "" {
 		return fi.RequiredField("Name")
 	}
@@ -104,7 +104,7 @@ type terraformHTTPHealthcheck struct {
 	RequestPath *string `cty:"request_path"`
 }
 
-func (_ *HTTPHealthcheck) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *HTTPHealthcheck) error {
+func (*HTTPHealthcheck) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *HTTPHealthcheck) error {
 	tf := &terraformHTTPHealthcheck{
 		Name:        *e.Name,
 		Port:        e.Port,
diff --git a/upup/pkg/fi/cloudup/gcetasks/instance.go b/upup/pkg/fi/cloudup/gcetasks/instance.go
index f47d3c3cd0e02..d17bd3316ac61 100644
--- a/upup/pkg/fi/cloudup/gcetasks/instance.go
+++ b/upup/pkg/fi/cloudup/gcetasks/instance.go
@@ -153,7 +153,7 @@ func (e *Instance) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *Instance) CheckChanges(a, e, changes *Instance) error {
+func (*Instance) CheckChanges(a, e, changes *Instance) error {
 	return nil
 }
 
@@ -319,7 +319,7 @@ func (i *Instance) isZero() bool {
 	return reflect.DeepEqual(zero, i)
 }
 
-func (_ *Instance) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Instance) error {
+func (*Instance) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Instance) error {
 	cloud := t.Cloud
 	project := cloud.Project()
 	zone := *e.Zone
@@ -426,7 +426,7 @@ type terraformInstanceAttachedDisk struct {
 	Size    int64  `cty:"size"`
 }
 
-func (_ *Instance) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Instance) error {
+func (*Instance) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Instance) error {
 	project := t.Project
 
 	// This is a "little" hacky...
diff --git a/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go b/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go
index 8788992a2eb3d..f1179db3159b4 100644
--- a/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go
+++ b/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go
@@ -83,11 +83,11 @@ func (e *InstanceGroupManager) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *InstanceGroupManager) CheckChanges(a, e, changes *InstanceGroupManager) error {
+func (*InstanceGroupManager) CheckChanges(a, e, changes *InstanceGroupManager) error {
 	return nil
 }
 
-func (_ *InstanceGroupManager) RenderGCE(t *gce.GCEAPITarget, a, e, changes *InstanceGroupManager) error {
+func (*InstanceGroupManager) RenderGCE(t *gce.GCEAPITarget, a, e, changes *InstanceGroupManager) error {
 	project := t.Cloud.Project()
 
 	instanceTemplateURL, err := e.InstanceTemplate.URL(project)
@@ -188,7 +188,7 @@ type terraformVersion struct {
 	InstanceTemplate *terraformWriter.Literal `cty:"instance_template"`
 }
 
-func (_ *InstanceGroupManager) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *InstanceGroupManager) error {
+func (*InstanceGroupManager) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *InstanceGroupManager) error {
 	tf := &terraformInstanceGroupManager{
 		Name:                        e.Name,
 		Zone:                        e.Zone,
diff --git a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
index 1bade62278587..22b6cbc92707b 100644
--- a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
+++ b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
@@ -239,7 +239,7 @@ func (e *InstanceTemplate) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *InstanceTemplate) CheckChanges(a, e, changes *InstanceTemplate) error {
+func (*InstanceTemplate) CheckChanges(a, e, changes *InstanceTemplate) error {
 	if fi.ValueOf(e.BootDiskImage) == "" {
 		return fi.RequiredField("BootDiskImage")
 	}
@@ -457,7 +457,7 @@ func (e *InstanceTemplate) URL(project string) (string, error) {
 	return fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/instanceTemplates/%s", project, *e.ID), nil
 }
 
-func (_ *InstanceTemplate) RenderGCE(t *gce.GCEAPITarget, a, e, changes *InstanceTemplate) error {
+func (*InstanceTemplate) RenderGCE(t *gce.GCEAPITarget, a, e, changes *InstanceTemplate) error {
 	project := t.Cloud.Project()
 	region := t.Cloud.Region()
 
@@ -482,7 +482,7 @@ func (_ *InstanceTemplate) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Instanc
 			return fmt.Errorf("error creating InstanceTemplate: %v", err)
 		}
 	} else {
-		return fmt.Errorf("Cannot apply changes to InstanceTemplate: %v", changes)
+		return fmt.Errorf("cannot apply changes to InstanceTemplate: %v", changes)
 	}
 
 	return nil
@@ -613,7 +613,7 @@ func mapServiceAccountsToTerraform(serviceAccounts []*ServiceAccount, saScopes [
 	return out
 }
 
-func (_ *InstanceTemplate) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *InstanceTemplate) error {
+func (*InstanceTemplate) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *InstanceTemplate) error {
 	project := t.Project
 
 	i, err := e.mapToGCE(project, t.Cloud.Region())
diff --git a/upup/pkg/fi/cloudup/gcetasks/network.go b/upup/pkg/fi/cloudup/gcetasks/network.go
index 1eb924d28728c..a623ee0d9425b 100644
--- a/upup/pkg/fi/cloudup/gcetasks/network.go
+++ b/upup/pkg/fi/cloudup/gcetasks/network.go
@@ -104,7 +104,7 @@ func (e *Network) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *Network) CheckChanges(a, e, changes *Network) error {
+func (*Network) CheckChanges(a, e, changes *Network) error {
 	cidr := fi.ValueOf(e.CIDR)
 	switch e.Mode {
 	case "legacy":
@@ -137,7 +137,7 @@ func (_ *Network) CheckChanges(a, e, changes *Network) error {
 	return nil
 }
 
-func (_ *Network) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Network) error {
+func (*Network) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Network) error {
 	shared := fi.ValueOf(e.Shared)
 	if shared {
 		// Verify the network was found
@@ -181,7 +181,7 @@ func (_ *Network) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Network) error {
 		}
 	} else {
 		if a.Mode == "legacy" {
-			return fmt.Errorf("GCE networks in legacy mode are not supported.  Please convert to auto mode or specify a different network.")
+			return fmt.Errorf("networks in legacy mode are not supported. Please convert to auto mode or specify a different network")
 		}
 		empty := &Network{}
 		if !reflect.DeepEqual(empty, changes) {
@@ -199,7 +199,7 @@ type terraformNetwork struct {
 	AutoCreateSubnetworks *bool   `cty:"auto_create_subnetworks"`
 }
 
-func (_ *Network) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Network) error {
+func (*Network) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Network) error {
 	shared := fi.ValueOf(e.Shared)
 	if shared {
 		// Not terraform owned / managed
diff --git a/upup/pkg/fi/cloudup/gcetasks/poolhealthcheck.go b/upup/pkg/fi/cloudup/gcetasks/poolhealthcheck.go
index f332dab041eab..7976cb6a7e5a1 100644
--- a/upup/pkg/fi/cloudup/gcetasks/poolhealthcheck.go
+++ b/upup/pkg/fi/cloudup/gcetasks/poolhealthcheck.go
@@ -37,7 +37,7 @@ type PoolHealthCheck struct {
 var _ fi.CompareWithID = &PoolHealthCheck{}
 
 // GetDependencies returns the dependencies of the PoolHealthCheck task
-func (_ *PoolHealthCheck) GetDependencies(tasks map[string]fi.CloudupTask) []fi.CloudupTask {
+func (*PoolHealthCheck) GetDependencies(tasks map[string]fi.CloudupTask) []fi.CloudupTask {
 	var deps []fi.CloudupTask
 	for _, task := range tasks {
 		if _, ok := task.(*HTTPHealthcheck); ok {
@@ -81,7 +81,7 @@ func (e *PoolHealthCheck) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *PoolHealthCheck) CheckChanges(a, e, changes *PoolHealthCheck) error {
+func (*PoolHealthCheck) CheckChanges(a, e, changes *PoolHealthCheck) error {
 	return nil
 }
 
@@ -107,6 +107,6 @@ func (p *PoolHealthCheck) RenderGCE(t *gce.GCEAPITarget, a, e, changes *PoolHeal
 	return nil
 }
 
-func (_ *PoolHealthCheck) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *PoolHealthCheck) error {
+func (*PoolHealthCheck) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *PoolHealthCheck) error {
 	return nil
 }
diff --git a/upup/pkg/fi/cloudup/gcetasks/projectiambinding.go b/upup/pkg/fi/cloudup/gcetasks/projectiambinding.go
index 24c61359f1dde..92a891c033198 100644
--- a/upup/pkg/fi/cloudup/gcetasks/projectiambinding.go
+++ b/upup/pkg/fi/cloudup/gcetasks/projectiambinding.go
@@ -84,7 +84,7 @@ func (e *ProjectIAMBinding) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *ProjectIAMBinding) CheckChanges(a, e, changes *ProjectIAMBinding) error {
+func (*ProjectIAMBinding) CheckChanges(a, e, changes *ProjectIAMBinding) error {
 	if fi.ValueOf(e.Project) == "" {
 		return fi.RequiredField("Project")
 	}
@@ -97,7 +97,7 @@ func (_ *ProjectIAMBinding) CheckChanges(a, e, changes *ProjectIAMBinding) error
 	return nil
 }
 
-func (_ *ProjectIAMBinding) RenderGCE(t *gce.GCEAPITarget, a, e, changes *ProjectIAMBinding) error {
+func (*ProjectIAMBinding) RenderGCE(t *gce.GCEAPITarget, a, e, changes *ProjectIAMBinding) error {
 	ctx := context.TODO()
 
 	projectID := fi.ValueOf(e.Project)
@@ -137,7 +137,7 @@ type terraformProjectIAMBinding struct {
 	Members []string `cty:"members"`
 }
 
-func (_ *ProjectIAMBinding) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ProjectIAMBinding) error {
+func (*ProjectIAMBinding) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ProjectIAMBinding) error {
 	tf := &terraformProjectIAMBinding{
 		Project: fi.ValueOf(e.Project),
 		Role:    fi.ValueOf(e.Role),
diff --git a/upup/pkg/fi/cloudup/gcetasks/serviceaccount.go b/upup/pkg/fi/cloudup/gcetasks/serviceaccount.go
index 7f7e8a337dfc1..78ca9a406ff16 100644
--- a/upup/pkg/fi/cloudup/gcetasks/serviceaccount.go
+++ b/upup/pkg/fi/cloudup/gcetasks/serviceaccount.go
@@ -94,11 +94,11 @@ func (e *ServiceAccount) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *ServiceAccount) CheckChanges(a, e, changes *ServiceAccount) error {
+func (*ServiceAccount) CheckChanges(a, e, changes *ServiceAccount) error {
 	return nil
 }
 
-func (_ *ServiceAccount) RenderGCE(t *gce.GCEAPITarget, a, e, changes *ServiceAccount) error {
+func (*ServiceAccount) RenderGCE(t *gce.GCEAPITarget, a, e, changes *ServiceAccount) error {
 	ctx := context.TODO()
 
 	cloud := t.Cloud
@@ -171,7 +171,7 @@ type terraformServiceAccount struct {
 	DisplayName *string `cty:"display_name"`
 }
 
-func (_ *ServiceAccount) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ServiceAccount) error {
+func (*ServiceAccount) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ServiceAccount) error {
 	shared := fi.ValueOf(e.Shared)
 	if shared {
 		// Not terraform owned / managed
diff --git a/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go b/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go
index 5494dc60a722e..30f599f601361 100644
--- a/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go
+++ b/upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go
@@ -76,7 +76,7 @@ func (e *StorageBucketAcl) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *StorageBucketAcl) CheckChanges(a, e, changes *StorageBucketAcl) error {
+func (*StorageBucketAcl) CheckChanges(a, e, changes *StorageBucketAcl) error {
 	if fi.ValueOf(e.Bucket) == "" {
 		return fi.RequiredField("Bucket")
 	}
@@ -86,7 +86,7 @@ func (_ *StorageBucketAcl) CheckChanges(a, e, changes *StorageBucketAcl) error {
 	return nil
 }
 
-func (_ *StorageBucketAcl) RenderGCE(t *gce.GCEAPITarget, a, e, changes *StorageBucketAcl) error {
+func (*StorageBucketAcl) RenderGCE(t *gce.GCEAPITarget, a, e, changes *StorageBucketAcl) error {
 	bucket := fi.ValueOf(e.Bucket)
 	entity := fi.ValueOf(e.Entity)
 	role := fi.ValueOf(e.Role)
@@ -121,7 +121,7 @@ type terraformStorageBucketAcl struct {
 	RoleEntity []string `cty:"role_entity"`
 }
 
-func (_ *StorageBucketAcl) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *StorageBucketAcl) error {
+func (*StorageBucketAcl) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *StorageBucketAcl) error {
 	var roleEntities []string
 	roleEntities = append(roleEntities, fi.ValueOf(e.Role)+":"+fi.ValueOf(e.Entity))
 	tf := &terraformStorageBucketAcl{
diff --git a/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go b/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go
index b147dd3c1e47a..fb9527151ef5e 100644
--- a/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go
+++ b/upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go
@@ -83,7 +83,7 @@ func (e *StorageBucketIAM) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *StorageBucketIAM) CheckChanges(a, e, changes *StorageBucketIAM) error {
+func (*StorageBucketIAM) CheckChanges(a, e, changes *StorageBucketIAM) error {
 	if fi.ValueOf(e.Bucket) == "" {
 		return fi.RequiredField("Bucket")
 	}
@@ -96,7 +96,7 @@ func (_ *StorageBucketIAM) CheckChanges(a, e, changes *StorageBucketIAM) error {
 	return nil
 }
 
-func (_ *StorageBucketIAM) RenderGCE(t *gce.GCEAPITarget, a, e, changes *StorageBucketIAM) error {
+func (*StorageBucketIAM) RenderGCE(t *gce.GCEAPITarget, a, e, changes *StorageBucketIAM) error {
 	ctx := context.TODO()
 
 	bucket := fi.ValueOf(e.Bucket)
@@ -131,7 +131,7 @@ type terraformStorageBucketIAM struct {
 	Member string `cty:"member"`
 }
 
-func (_ *StorageBucketIAM) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *StorageBucketIAM) error {
+func (*StorageBucketIAM) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *StorageBucketIAM) error {
 	tf := &terraformStorageBucketIAM{
 		Bucket: fi.ValueOf(e.Bucket),
 		Role:   fi.ValueOf(e.Role),
diff --git a/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go b/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go
index 69acc51140565..d4a7b18e40388 100644
--- a/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go
+++ b/upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go
@@ -79,7 +79,7 @@ func (e *StorageObjectAcl) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *StorageObjectAcl) CheckChanges(a, e, changes *StorageObjectAcl) error {
+func (*StorageObjectAcl) CheckChanges(a, e, changes *StorageObjectAcl) error {
 	if fi.ValueOf(e.Bucket) == "" {
 		return fi.RequiredField("Bucket")
 	}
@@ -92,7 +92,7 @@ func (_ *StorageObjectAcl) CheckChanges(a, e, changes *StorageObjectAcl) error {
 	return nil
 }
 
-func (_ *StorageObjectAcl) RenderGCE(t *gce.GCEAPITarget, a, e, changes *StorageObjectAcl) error {
+func (*StorageObjectAcl) RenderGCE(t *gce.GCEAPITarget, a, e, changes *StorageObjectAcl) error {
 	bucket := fi.ValueOf(e.Bucket)
 	object := fi.ValueOf(e.Object)
 	entity := fi.ValueOf(e.Entity)
@@ -129,7 +129,7 @@ type terraformStorageObjectAcl struct {
 	RoleEntity []string `cty:"role_entity"`
 }
 
-func (_ *StorageObjectAcl) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *StorageObjectAcl) error {
+func (*StorageObjectAcl) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *StorageObjectAcl) error {
 	var roleEntities []string
 	roleEntities = append(roleEntities, fi.ValueOf(e.Role)+":"+fi.ValueOf(e.Name))
 	tf := &terraformStorageObjectAcl{
diff --git a/upup/pkg/fi/cloudup/gcetasks/subnet.go b/upup/pkg/fi/cloudup/gcetasks/subnet.go
index 2508d8d809c18..66ee18835cf9d 100644
--- a/upup/pkg/fi/cloudup/gcetasks/subnet.go
+++ b/upup/pkg/fi/cloudup/gcetasks/subnet.go
@@ -105,11 +105,11 @@ func (e *Subnet) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *Subnet) CheckChanges(a, e, changes *Subnet) error {
+func (*Subnet) CheckChanges(a, e, changes *Subnet) error {
 	return nil
 }
 
-func (_ *Subnet) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Subnet) error {
+func (*Subnet) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Subnet) error {
 	shared := fi.ValueOf(e.Shared)
 	if shared {
 		// Verify the subnet was found
@@ -299,7 +299,7 @@ type terraformSubnetRange struct {
 	CIDR string `cty:"ip_cidr_range"`
 }
 
-func (_ *Subnet) RenderSubnet(t *terraform.TerraformTarget, a, e, changes *Subnet) error {
+func (*Subnet) RenderSubnet(t *terraform.TerraformTarget, a, e, changes *Subnet) error {
 	shared := fi.ValueOf(e.Shared)
 	if shared {
 		// Not terraform owned / managed
diff --git a/upup/pkg/fi/cloudup/gcetasks/targetpool.go b/upup/pkg/fi/cloudup/gcetasks/targetpool.go
index dace2132cafaf..645265c9a0944 100644
--- a/upup/pkg/fi/cloudup/gcetasks/targetpool.go
+++ b/upup/pkg/fi/cloudup/gcetasks/targetpool.go
@@ -68,7 +68,7 @@ func (e *TargetPool) Run(c *fi.CloudupContext) error {
 	return fi.CloudupDefaultDeltaRunMethod(e, c)
 }
 
-func (_ *TargetPool) CheckChanges(a, e, changes *TargetPool) error {
+func (*TargetPool) CheckChanges(a, e, changes *TargetPool) error {
 	if fi.ValueOf(e.Name) == "" {
 		return fi.RequiredField("Name")
 	}
@@ -81,7 +81,7 @@ func (e *TargetPool) URL(cloud gce.GCECloud) string {
 	return fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/targetPools/%s", cloud.Project(), cloud.Region(), name)
 }
 
-func (_ *TargetPool) RenderGCE(t *gce.GCEAPITarget, a, e, changes *TargetPool) error {
+func (*TargetPool) RenderGCE(t *gce.GCEAPITarget, a, e, changes *TargetPool) error {
 	name := fi.ValueOf(e.Name)
 
 	o := &compute.TargetPool{
@@ -111,7 +111,7 @@ type terraformTargetPool struct {
 	HealthChecks []*terraformWriter.Literal `cty:"health_checks"`
 }
 
-func (_ *TargetPool) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *TargetPool) error {
+func (*TargetPool) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *TargetPool) error {
 	name := fi.ValueOf(e.Name)
 
 	tf := &terraformTargetPool{