diff --git a/.changelog/7663.txt b/.changelog/7663.txt
new file mode 100644
index 0000000000..8ec013c069
--- /dev/null
+++ b/.changelog/7663.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/data_source_google_iam_policy.go b/google-beta/data_source_google_iam_policy.go
index 78147642fb..c28d5b124b 100644
--- 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:evanbrown@google.com",
-//     ]
-//   }
-// }
+//	data "google_iam_policy" "admin" {
+//	  binding {
+//	    role = "roles/storage.objectViewer"
+//	    members = [
+//	      "user:evanbrown@google.com",
+//	    ]
+//	  }
+//	}
 func DataSourceGoogleIamPolicy() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceGoogleIamPolicyRead,
diff --git a/google-beta/resource_compute_disk_resource_policy_attachment.go b/google-beta/resource_compute_disk_resource_policy_attachment.go
index 568fb3eaa0..b306a1aaac 100644
--- a/google-beta/resource_compute_disk_resource_policy_attachment.go
+++ b/google-beta/resource_compute_disk_resource_policy_attachment.go
@@ -236,7 +236,8 @@ func resourceComputeDiskResourcePolicyAttachmentDelete(d *schema.ResourceData, m
 
 	// resourcePolicies are referred to by region but affixed to zonal disks.
 	// We construct the regional name from the zone:
-	//   projects/{project}/regions/{region}/resourcePolicies/{resourceId}
+	//
+	//	projects/{project}/regions/{region}/resourcePolicies/{resourceId}
 	region := getRegionFromZone(zone)
 	if region == "" {
 		return fmt.Errorf("invalid zone %q, unable to infer region from zone", zone)
@@ -318,7 +319,8 @@ func resourceComputeDiskResourcePolicyAttachmentEncoder(d *schema.ResourceData,
 
 	// resourcePolicies are referred to by region but affixed to zonal disks.
 	// We construct the regional name from the zone:
-	//   projects/{project}/regions/{region}/resourcePolicies/{resourceId}
+	//
+	//	projects/{project}/regions/{region}/resourcePolicies/{resourceId}
 	region := getRegionFromZone(zone)
 	if region == "" {
 		return nil, fmt.Errorf("invalid zone %q, unable to infer region from zone", zone)
diff --git a/google-beta/resource_container_attached_cluster.go b/google-beta/resource_container_attached_cluster.go
index d5c05b99b5..884ee9be4a 100644
--- a/google-beta/resource_container_attached_cluster.go
+++ b/google-beta/resource_container_attached_cluster.go
@@ -964,19 +964,22 @@ func flattenContainerAttachedClusterErrorsMessage(v interface{}, d *schema.Resou
 }
 
 // The custom expander transforms input into something like this:
-// authorization {
-//    admin_users [
-//      { username = "user1" },
-//      { username = "user2" }
-//    ]
-// }
+//
+//	authorization {
+//	   admin_users [
+//	     { username = "user1" },
+//	     { username = "user2" }
+//	   ]
+//	}
+//
 // The custom flattener transforms input back into something like this:
-// authorization {
-//    admin_users = [
-//      "user1",
-//      "user2"
-//    ]
-// }
+//
+//	authorization {
+//	   admin_users = [
+//	     "user1",
+//	     "user2"
+//	   ]
+//	}
 func flattenContainerAttachedClusterAuthorization(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	if v == nil {
 		return nil
@@ -1166,19 +1169,22 @@ type attachedClusterUser struct {
 }
 
 // The custom expander transforms input into something like this:
-// authorization {
-//    admin_users [
-//      { username = "user1" },
-//      { username = "user2" }
-//    ]
-// }
+//
+//	authorization {
+//	   admin_users [
+//	     { username = "user1" },
+//	     { username = "user2" }
+//	   ]
+//	}
+//
 // The custom flattener transforms input back into something like this:
-// authorization {
-//    admin_users = [
-//      "user1",
-//      "user2"
-//    ]
-// }
+//
+//	authorization {
+//	   admin_users = [
+//	     "user1",
+//	     "user2"
+//	   ]
+//	}
 func expandContainerAttachedClusterAuthorization(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
diff --git a/google-beta/resource_data_catalog_tag_template.go b/google-beta/resource_data_catalog_tag_template.go
index 22d1cc6e81..49129ec5b6 100644
--- a/google-beta/resource_data_catalog_tag_template.go
+++ b/google-beta/resource_data_catalog_tag_template.go
@@ -25,7 +25,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-//Use it to delete TagTemplate Field
+// Use it to delete TagTemplate Field
 func deleteTagTemplateField(d *schema.ResourceData, config *Config, name, billingProject, userAgent string) error {
 
 	url_delete, err := replaceVars(d, config, "{{DataCatalogBasePath}}{{name}}/fields/"+name+"?force={{force_delete}}")
@@ -42,7 +42,7 @@ func deleteTagTemplateField(d *schema.ResourceData, config *Config, name, billin
 	return nil
 }
 
-//Use it to create TagTemplate Field
+// Use it to create TagTemplate Field
 func createTagTemplateField(d *schema.ResourceData, config *Config, body map[string]interface{}, name, billingProject, userAgent string) error {
 
 	url_create, err := replaceVars(d, config, "{{DataCatalogBasePath}}{{name}}/fields")
diff --git a/google-beta/resource_spanner_database.go b/google-beta/resource_spanner_database.go
index e8d78a38a0..04e3d40552 100644
--- a/google-beta/resource_spanner_database.go
+++ b/google-beta/resource_spanner_database.go
@@ -751,14 +751,14 @@ func resourceSpannerDatabaseUpdateEncoder(d *schema.ResourceData, meta interface
 	newDdls := new.([]interface{})
 	updateDdls := []string{}
 
-	//Only new ddl statments to be add to update call
+	// Only new ddl statments to be add to update call
 	for i := len(oldDdls); i < len(newDdls); i++ {
 		if newDdls[i] != nil {
 			updateDdls = append(updateDdls, newDdls[i].(string))
 		}
 	}
 
-	//Add statement to update version_retention_period property, if needed
+	// Add statement to update version_retention_period property, if needed
 	if d.HasChange("version_retention_period") {
 		dbName := d.Get("name")
 		retentionDdl := fmt.Sprintf("ALTER DATABASE `%s` SET OPTIONS (version_retention_period=\"%s\")", dbName, obj["versionRetentionPeriod"])