Fix new lint errors introduced in Go 1.19.0 (#6398) (#4585)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 9, 2022 · b1b8485 · b1b8485
1 parent 54a2128
commit b1b8485
Show file tree

Hide file tree

Showing 101 changed files with 127 additions and 41 deletions.
diff --git a/.changelog/6398.txt b/.changelog/6398.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/google-beta/access_context_manager_operation.go b/google-beta/access_context_manager_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/active_directory_operation.go b/google-beta/active_directory_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/api_gateway_operation.go b/google-beta/api_gateway_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/apigee_operation.go b/google-beta/apigee_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/artifact_registry_operation.go b/google-beta/artifact_registry_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/certificate_manager_operation.go b/google-beta/certificate_manager_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/cloudfunctions2_operation.go b/google-beta/cloudfunctions2_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/compute_instance_helpers.go b/google-beta/compute_instance_helpers.go
@@ -1,4 +1,3 @@
-//
 package google
 
 import (

diff --git a/google-beta/data_fusion_operation.go b/google-beta/data_fusion_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/data_source_google_iam_policy.go b/google-beta/data_source_google_iam_policy.go
@@ -16,14 +16,14 @@ import (
 // to express a Google Cloud IAM policy in a data resource. This is an example
 // of how the schema would be used in a config:
 //
-// data "google_iam_policy" "admin" {
-//   binding {
-//     role = "roles/storage.objectViewer"
-//     members = [
-//       "user:[email protected]",
-//     ]
-//   }
-// }
+//	data "google_iam_policy" "admin" {
+//	  binding {
+//	    role = "roles/storage.objectViewer"
+//	    members = [
+//	      "user:[email protected]",
+//	    ]
+//	  }
+//	}
 func dataSourceGoogleIamPolicy() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceGoogleIamPolicyRead,

diff --git a/google-beta/data_source_storage_object_signed_url.go b/google-beta/data_source_storage_object_signed_url.go
@@ -14,12 +14,11 @@ import (
 	"log"
 	"net/url"
 	"os"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
 
-	"sort"
-
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -170,10 +169,9 @@ func dataSourceGoogleSignedUrlRead(d *schema.ResourceData, meta interface{}) err
 
 // loadJwtConfig looks for credentials json in the following places,
 // in order of preference:
-//   1. `credentials` attribute of the datasource
-//   2. `credentials` attribute in the provider definition.
-//   3. A JSON file whose path is specified by the
-//      GOOGLE_APPLICATION_CREDENTIALS environment variable.
+//  1. `credentials` attribute of the datasource
+//  2. `credentials` attribute in the provider definition.
+//  3. A JSON file whose path is specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable.
 func loadJwtConfig(d *schema.ResourceData, meta interface{}) (*jwt.Config, error) {
 	config := meta.(*Config)
 
@@ -250,7 +248,6 @@ type UrlData struct {
 // -------------------
 // GET
 //
-//
 // 1388534400
 // bucket/objectname
 // -------------------

diff --git a/google-beta/dataproc_metastore_operation.go b/google-beta/dataproc_metastore_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/datastore_operation.go b/google-beta/datastore_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/dialogflow_cx_operation.go b/google-beta/dialogflow_cx_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/error_retry_predicates.go b/google-beta/error_retry_predicates.go
@@ -97,7 +97,7 @@ func isConnectionResetNetworkError(err error) (bool, string) {
 // Retry 409s because some APIs like Cloud SQL throw a 409 if concurrent calls
 // are being made.
 //
-//The only way right now to determine it is a retryable 409 due to
+// The only way right now to determine it is a retryable 409 due to
 // concurrent calls is to look at the contents of the error message.
 // See https://github.com/hashicorp/terraform-provider-google/issues/3279
 func is409OperationInProgressError(err error) (bool, string) {

diff --git a/google-beta/filestore_operation.go b/google-beta/filestore_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/firebase_operation.go b/google-beta/firebase_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/firestore_operation.go b/google-beta/firestore_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/game_services_operation.go b/google-beta/game_services_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/gke_hub_operation.go b/google-beta/gke_hub_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam2_operation.go b/google-beta/iam2_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_access_context_manager_access_policy.go b/google-beta/iam_access_context_manager_access_policy.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_api_gateway_api.go b/google-beta/iam_api_gateway_api.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_api_gateway_api_config.go b/google-beta/iam_api_gateway_api_config.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_api_gateway_gateway.go b/google-beta/iam_api_gateway_gateway.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_apigee_environment.go b/google-beta/iam_apigee_environment.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_artifact_registry_repository.go b/google-beta/iam_artifact_registry_repository.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_beta_operation.go b/google-beta/iam_beta_operation.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_bigquery_connection.go b/google-beta/iam_bigquery_connection.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_bigquery_table.go b/google-beta/iam_bigquery_table.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_binary_authorization_attestor.go b/google-beta/iam_binary_authorization_attestor.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_cloud_run_service.go b/google-beta/iam_cloud_run_service.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_cloud_tasks_queue.go b/google-beta/iam_cloud_tasks_queue.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_cloudfunctions2_function.go b/google-beta/iam_cloudfunctions2_function.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_cloudfunctions_function.go b/google-beta/iam_cloudfunctions_function.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_cloudiot_registry.go b/google-beta/iam_cloudiot_registry.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_backend_bucket.go b/google-beta/iam_compute_backend_bucket.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_backend_service.go b/google-beta/iam_compute_backend_service.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_disk.go b/google-beta/iam_compute_disk.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_image.go b/google-beta/iam_compute_image.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_instance.go b/google-beta/iam_compute_instance.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_machine_image.go b/google-beta/iam_compute_machine_image.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_region_backend_service.go b/google-beta/iam_compute_region_backend_service.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (

diff --git a/google-beta/iam_compute_region_disk.go b/google-beta/iam_compute_region_disk.go
@@ -11,6 +11,7 @@
 //     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
+
 package google
 
 import (