rename master to main (#5745) (#11211)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/5745.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google/data_source_sql_database_instance_test.go

@@ -22,7 +22,7 @@ func TestAccDataSourceSqlDatabaseInstance_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					checkDataSourceStateMatchesResourceStateWithIgnores(
 						"data.google_sql_database_instance.qa",
-						"google_sql_database_instance.master",
+						"google_sql_database_instance.main",
 						map[string]struct{}{
 							"deletion_protection": {},
 						},
@@ -35,8 +35,8 @@ func TestAccDataSourceSqlDatabaseInstance_basic(t *testing.T) {
 
 func testAccDataSourceSqlDatabaseInstance_basic(context map[string]interface{}) string {
 	return Nprintf(`
-resource "google_sql_database_instance" "master" {
-  name             = "master-instance-%{random_suffix}"
+resource "google_sql_database_instance" "main" {
+  name             = "main-instance-%{random_suffix}"
   database_version = "POSTGRES_11"
   region           = "us-central1"
 
@@ -50,7 +50,7 @@ resource "google_sql_database_instance" "master" {
 }
 
 data "google_sql_database_instance" "qa" {
-    name = google_sql_database_instance.master.name
+    name = google_sql_database_instance.main.name
 }
 `, context)
 }

google/resource_bigtable_instance.go

@@ -404,7 +404,7 @@ func getBigtableZone(z string, config *Config) (string, error) {
 // act like a TypeSet while it's a TypeList underneath. It preserves state
 // ordering on updates, and causes the resource to get recreated if it would
 // attempt to perform an impossible change.
-// This doesn't use the standard unordered list utility (https://github.com/GoogleCloudPlatform/magic-modules/blob/master/templates/terraform/unordered_list_customize_diff.erb)
+// This doesn't use the standard unordered list utility (https://github.com/GoogleCloudPlatform/magic-modules/blob/main/templates/terraform/unordered_list_customize_diff.erb)
 // because some fields can't be modified using the API and we recreate the instance
 // when they're changed.
 func resourceBigtableInstanceClusterReorderTypeList(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error {

google/resource_cloud_run_service.go

@@ -128,7 +128,7 @@ include labels and annotations that should be attached to the Revision.
 To correlate a Revision, and/or to force a Revision to be created when the
 spec doesn't otherwise change, a nonce label may be provided in the
 template metadata. For more details, see:
-https://github.com/knative/serving/blob/master/docs/client-conventions.md#associate-modifications-with-revisions
+https://github.com/knative/serving/blob/main/docs/client-conventions.md#associate-modifications-with-revisions
 
 Cloud Run does not currently support referencing a build that is
 responsible for materializing the container image from source.`,
@@ -151,7 +151,7 @@ responsible for materializing the container image from source.`,
 In the context of a Revision, we disallow a number of the fields of
 this Container, including: name, ports, and volumeMounts.
 The runtime contract is documented here:
-https://github.com/knative/serving/blob/master/docs/runtime-contract.md`,
+https://github.com/knative/serving/blob/main/docs/runtime-contract.md`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"image": {

google/resource_cloudbuild_trigger_generated_test.go

@@ -51,7 +51,7 @@ func testAccCloudBuildTrigger_cloudbuildTriggerFilenameExample(context map[strin
 	return Nprintf(`
 resource "google_cloudbuild_trigger" "filename-trigger" {
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "my-repo"
   }
 
@@ -93,7 +93,7 @@ func testAccCloudBuildTrigger_cloudbuildTriggerBuildExample(context map[string]i
 	return Nprintf(`
 resource "google_cloudbuild_trigger" "build-trigger" {
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "my-repo"
   }
 
@@ -189,7 +189,7 @@ data "google_project" "project" {}
 
 resource "google_cloudbuild_trigger" "service-account-trigger" {
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "my-repo"
   }
 

google/resource_cloudbuild_trigger_test.go

@@ -215,7 +215,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   name        = "%s"
   description = "acceptance test build trigger"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
   }
   build {
@@ -273,7 +273,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   name        = "%s"
   description = "acceptance test build trigger"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
   }
   build {
@@ -302,7 +302,7 @@ func testAccCloudBuildTrigger_fullStep() string {
 resource "google_cloudbuild_trigger" "build_trigger" {
   description = "acceptance test build trigger"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
 	invert_regex = false
   }
@@ -330,7 +330,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   description = "acceptance test build trigger updated"
   name        = "%s"
   trigger_template {
-    branch_name = "master-updated"
+    branch_name = "main-updated"
     repo_name   = "some-repo-updated"
 	invert_regex = true
   }
@@ -374,7 +374,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   name        = "%s"
   description = "acceptance test build trigger"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
   }
   build {
@@ -402,7 +402,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   name        = "%s"
   description = "acceptance test build trigger updated"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
   }
   build {
@@ -610,7 +610,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   name = "%s"
   description = "acceptance test build trigger"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
   }
   build {
@@ -644,7 +644,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   name = "%s"
   description = "acceptance test build trigger"
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "some-repo"
   }
   build {

scripts/run_diff.sh

@@ -16,7 +16,7 @@ if [[ -d ~/go/src/github.com/hashicorp/terraform-provider-clean-google ]]; then
   pushd ~/go/src/github.com/hashicorp/terraform-provider-clean-google
   git clean -fdx
   git reset --hard
-  git checkout master
+  git checkout main
   git pull
   popd
 else

website/docs/d/kms_secret.html.markdown

@@ -64,8 +64,8 @@ resource "random_id" "db_name_suffix" {
   byte_length = 4
 }
 
-resource "google_sql_database_instance" "master" {
-  name             = "master-instance-${random_id.db_name_suffix.hex}"
+resource "google_sql_database_instance" "main" {
+  name             = "main-instance-${random_id.db_name_suffix.hex}"
   database_version = "MYSQL_5_7"
 
   settings {
@@ -75,7 +75,7 @@ resource "google_sql_database_instance" "master" {
 
 resource "google_sql_user" "users" {
   name     = "me"
-  instance = google_sql_database_instance.master.name
+  instance = google_sql_database_instance.main.name
   host     = "me.com"
   password = data.google_kms_secret.sql_user_password.plaintext
 }

website/docs/d/kms_secret_asymmetric.html.markdown

@@ -116,8 +116,8 @@ resource "random_id" "db_name_suffix" {
   byte_length = 4
 }
 
-resource "google_sql_database_instance" "master" {
-  name             = "master-instance-${random_id.db_name_suffix.hex}"
+resource "google_sql_database_instance" "main" {
+  name             = "main-instance-${random_id.db_name_suffix.hex}"
   database_version = "MYSQL_5_7"
   
   settings {
@@ -127,7 +127,7 @@ resource "google_sql_database_instance" "master" {
 
 resource "google_sql_user" "users" {
   name     = "me"
-  instance = google_sql_database_instance.master.name
+  instance = google_sql_database_instance.main.name
   host     = "me.com"
   password = data.google_kms_secret.sql_user_password.plaintext
 }

website/docs/d/sql_backup_run.html.markdown

@@ -15,7 +15,7 @@ Use this data source to get information about a Cloud SQL instance backup run.
 
 ```hcl
 data "google_sql_backup_run" "backup" {
-	instance = google_sql_database_instance.master.name
+	instance = google_sql_database_instance.main.name
 	most_recent = true
 }
 ```

website/docs/guides/version_2_upgrade.html.markdown

@@ -21,7 +21,7 @@ for details if you're new to using `google-beta`.
 Most of the changes outlined in this guide have been previously marked as
 deprecated in the Terraform `plan`/`apply` output throughout previous provider
 releases, up to and including 1.20.0. These changes, such as deprecation notices,
-can always be found in the [CHANGELOG](https://github.com/hashicorp/terraform-provider-google/blob/master/CHANGELOG.md).
+can always be found in the [CHANGELOG](https://github.com/hashicorp/terraform-provider-google/blob/main/CHANGELOG.md).
 
 ## Why version 2.0.0?
 
@@ -166,7 +166,7 @@ available. For more information see [the official documentation on GCP launch st
 
 Because the API for beta features can change before their GA launch, there may
 be breaking changes in the `google-beta` provider in minor release versions.
-These changes will be announced in the [`google-beta` CHANGELOG](https://github.com/hashicorp/terraform-provider-google-beta/blob/master/CHANGELOG.md).
+These changes will be announced in the [`google-beta` CHANGELOG](https://github.com/hashicorp/terraform-provider-google-beta/blob/main/CHANGELOG.md).
 
 To have resources at different API versions, set up provider blocks for each version:
 
@@ -293,7 +293,7 @@ Example updated configuration:
 ```hcl
 resource "google_cloudbuild_trigger" "build_trigger" {
   trigger_template {
-    branch_name = "master-updated"
+    branch_name = "main-updated"
     repo_name   = "some-repo-updated"
   }
 

website/docs/guides/version_3_upgrade.html.markdown

@@ -17,8 +17,8 @@ Most of the changes outlined in this guide have been previously marked as
 deprecated in the Terraform `plan`/`apply` output throughout previous provider
 releases, up to and including the final `2.X` series release. These changes,
 such as deprecation notices, can always be found in the CHANGELOG of the
-affected providers. [google](https://github.com/hashicorp/terraform-provider-google/blob/master/CHANGELOG.md)
-[google-beta](https://github.com/hashicorp/terraform-provider-google-beta/blob/master/CHANGELOG.md)
+affected providers. [google](https://github.com/hashicorp/terraform-provider-google/blob/main/CHANGELOG.md)
+[google-beta](https://github.com/hashicorp/terraform-provider-google-beta/blob/main/CHANGELOG.md)
 
 ## What is `3.0.0-beta.1`?
 

website/docs/guides/version_4_upgrade.html.markdown

@@ -17,8 +17,8 @@ Most of the changes outlined in this guide have been previously marked as
 deprecated in the Terraform `plan`/`apply` output throughout previous provider
 releases, up to and including the final `3.X` series release. These changes,
 such as deprecation notices, can always be found in the CHANGELOG of the
-affected providers. [google](https://github.com/hashicorp/terraform-provider-google/blob/master/CHANGELOG.md)
-[google-beta](https://github.com/hashicorp/terraform-provider-google-beta/blob/master/CHANGELOG.md)
+affected providers. [google](https://github.com/hashicorp/terraform-provider-google/blob/main/CHANGELOG.md)
+[google-beta](https://github.com/hashicorp/terraform-provider-google-beta/blob/main/CHANGELOG.md)
 
 ## I accidentally upgraded to 4.0.0, how do I downgrade to `3.X`?
 

website/docs/index.html.markdown

@@ -43,8 +43,8 @@ If you have configuration questions, or general questions about using the provid
 ## Releases
 
 Interested in the provider's latest features, or want to make sure you're up to date?
-Check out the [`google` provider changelog](https://github.com/hashicorp/terraform-provider-google/blob/master/CHANGELOG.md)
-and the [`google-beta` provider changelog](https://github.com/hashicorp/terraform-provider-google-beta/blob/master/CHANGELOG.md))
+Check out the [`google` provider changelog](https://github.com/hashicorp/terraform-provider-google/blob/main/CHANGELOG.md)
+and the [`google-beta` provider changelog](https://github.com/hashicorp/terraform-provider-google-beta/blob/main/CHANGELOG.md))
 for release notes and additional information.
 
 Per [Terraform Provider Versioning](https://www.hashicorp.com/blog/hashicorp-terraform-provider-versioning),
@@ -101,7 +101,7 @@ the issue!
 ## Contributing
 
 If you'd like to help extend the Google provider, we gladly accept community
-contributions! Our full contribution guide is available at [CONTRIBUTING.md](https://github.com/hashicorp/terraform-provider-google/blob/master/.github/CONTRIBUTING.md)
+contributions! Our full contribution guide is available at [CONTRIBUTING.md](https://github.com/hashicorp/terraform-provider-google/blob/main/.github/CONTRIBUTING.md)
 
 Pull requests can be made against either provider repo where a maintainer will
 apply them to both `google` and `google-beta`, or against [Magic Modules](https://github.com/GoogleCloudPlatform/magic-modules)

website/docs/r/cloud_run_service.html.markdown

@@ -519,7 +519,7 @@ The following arguments are supported:
   In the context of a Revision, we disallow a number of the fields of
   this Container, including: name, ports, and volumeMounts.
   The runtime contract is documented here:
-  https://github.com/knative/serving/blob/master/docs/runtime-contract.md
+  https://github.com/knative/serving/blob/main/docs/runtime-contract.md
   Structure is [documented below](#nested_containers).
 
 * `container_concurrency` -
@@ -857,7 +857,7 @@ The following arguments are supported:
   To correlate a Revision, and/or to force a Revision to be created when the
   spec doesn't otherwise change, a nonce label may be provided in the
   template metadata. For more details, see:
-  https://github.com/knative/serving/blob/master/docs/client-conventions.md#associate-modifications-with-revisions
+  https://github.com/knative/serving/blob/main/docs/client-conventions.md#associate-modifications-with-revisions
   Cloud Run does not currently support referencing a build that is
   responsible for materializing the container image from source.
   Structure is [documented below](#nested_template).

website/docs/r/cloudbuild_trigger.html.markdown

@@ -44,7 +44,7 @@ To get more information about Trigger, see:
 ```hcl
 resource "google_cloudbuild_trigger" "filename-trigger" {
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "my-repo"
   }
 
@@ -67,7 +67,7 @@ resource "google_cloudbuild_trigger" "filename-trigger" {
 ```hcl
 resource "google_cloudbuild_trigger" "build-trigger" {
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "my-repo"
   }
 
@@ -144,7 +144,7 @@ data "google_project" "project" {}
 
 resource "google_cloudbuild_trigger" "service-account-trigger" {
   trigger_template {
-    branch_name = "master"
+    branch_name = "main"
     repo_name   = "my-repo"
   }
 

website/docs/r/endpoints_service.html.markdown

@@ -38,10 +38,10 @@ The following arguments are supported:
 
 - - -
 
-* `openapi_config`: (Optional) The full text of the OpenAPI YAML configuration as described [here](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md).
+* `openapi_config`: (Optional) The full text of the OpenAPI YAML configuration as described [here](https://github.com/OAI/OpenAPI-Specification/blob/main/versions/2.0.md).
 Either this, or *both* of `grpc_config` and `protoc_output_base64` must be specified.
 
-* `grpc_config`: (Optional) The full text of the Service Config YAML file (Example located [here](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/endpoints/bookstore-grpc/api_config.yaml)).
+* `grpc_config`: (Optional) The full text of the Service Config YAML file (Example located [here](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/endpoints/bookstore-grpc/api_config.yaml)).
  If provided, must also provide `protoc_output_base64`.  `open_api` config must *not* be provided.
 
 * `protoc_output_base64`: (Optional) The full contents of the Service Descriptor File generated by protoc.  This should be a compiled .pb file, base64-encoded.

website/docs/r/sql_database_instance.html.markdown

@@ -26,8 +26,8 @@ It is recommended to not set this field (or set it to true) until you're ready t
 ### SQL Second Generation Instance
 
 ```hcl
-resource "google_sql_database_instance" "master" {
-  name             = "master-instance"
+resource "google_sql_database_instance" "main" {
+  name             = "main-instance"
   database_version = "POSTGRES_11"
   region           = "us-central1"
 
@@ -459,9 +459,9 @@ performing filtering in a Terraform config.
 Database instances can be imported using one of any of these accepted formats:
 
 ```
-$ terraform import google_sql_database_instance.master projects/{{project}}/instances/{{name}}
-$ terraform import google_sql_database_instance.master {{project}}/{{name}}
-$ terraform import google_sql_database_instance.master {{name}}
+$ terraform import google_sql_database_instance.main projects/{{project}}/instances/{{name}}
+$ terraform import google_sql_database_instance.main {{project}}/{{name}}
+$ terraform import google_sql_database_instance.main {{name}}
 
 ```
 

website/docs/r/sql_ssl_cert.html.markdown

@@ -23,8 +23,8 @@ resource "random_id" "db_name_suffix" {
   byte_length = 4
 }
 
-resource "google_sql_database_instance" "master" {
-  name             = "master-instance-${random_id.db_name_suffix.hex}"
+resource "google_sql_database_instance" "main" {
+  name             = "main-instance-${random_id.db_name_suffix.hex}"
   database_version = "MYSQL_5_7"
   settings {
     tier = "db-f1-micro"
@@ -33,7 +33,7 @@ resource "google_sql_database_instance" "master" {
 
 resource "google_sql_ssl_cert" "client_cert" {
   common_name = "client-name"
-  instance    = google_sql_database_instance.master.name
+  instance    = google_sql_database_instance.main.name
 }
 ```