.changelog/8217.txt

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

.changelog/8267.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added `user_ip_request_headers` field to `google_compute_security_policy` resource(beta)
+```

.changelog/8378.txt

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

.changelog/8459.txt

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

.changelog/8470.txt

@@ -0,0 +1,4 @@
+```release-note:enhancement
+dns: added `globalL7ilb` enum support to the `routing_policy.load_balancer_type` field in `google_dns_record_set`
+
+```

.changelog/8477.txt

@@ -0,0 +1,6 @@
+```release-note:new-resource
+`google_compute_region_security_policy_rule`
+```
+```release-note:enhancement
+compute: added support for `user_defined_fields` to `google_compute_region_security_policy`
+```

.changelog/8514.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkeonprem: add field `storage_policy_name` in resource `google_gkeonprem_vmware_cluster` (beta)
+```

.changelog/8526.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+dataproc_metastore: added `scaling_config` field to `google_dataproc_metastore_service` resource
+```

.changelog/8528.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+compute: added `disk.provisioned_iops` to `google_compute_instance_template`
+```
+```release-note:enhancement
+compute: added `disk.provisioned_iops` to `google_compute_region_instance_template`
+```

.changelog/8533.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+Adding support for connection type in private environments for Cloud Composer.
+```

.changelog/8544.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudbuild: added `git_file_source.bitbucket_server_config` and `source_to_build.bitbucket_server_config` fields to `google_cloudbuild_trigger` resource
+```

.changelog/8555.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+secretmanager: added `version_aliases` field to `google_secret_manager_secret` resource
+```

.changelog/8560.txt

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

.changelog/8571.txt

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

.changelog/8572.txt

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

.changelog/8574.txt

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

.changelog/8578.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+dataplex: fixed a bug when importing `google_dataplex_datascan` after running a job
+```

.changelog/8581.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+DNS: changed `private_visibility_config.networks` from `required` to requiring at least one of `private_visibility_config.networks` or `private_visibility_config.gke_clusters` in `google_dns_managed_zone`
+```

.changelog/8589.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+alloydb: changed `backup_window`, `enabled` and `location` fields to default to API value when unset in `google_alloydb_cluster` 
+```

.changelog/8590.txt

@@ -0,0 +1,3 @@
+```release-note:none
+docs: changed the subcategory to AlloyDB for datasources `google_alloydb_locations` and `google_alloydb_supported_database_flags` 
+```

.changelog/8594.txt

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

.changelog/8601.txt

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

.changelog/8602.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+dms: added `edition` field on the `google_database_migration_service_connection_profile` resource
+```

.changelog/8603.txt

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

.changelog/8606.txt

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

.changelog/8607.txt

@@ -0,0 +1,3 @@
+```release-note:none
+bigquery: added google_bigquery_table to version 5 upgrade doc
+```

.changelog/8611.txt

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

.changelog/8612.txt

@@ -0,0 +1,4 @@
+```release-note:new-resource 
+`google_backup_dr_management_server`
+
+```

.changelog/8613.txt

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

.changelog/8619.txt

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

.changelog/8625.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+certificatemanager: updated the description of the `scope` field in `certificate` resource to show that ALL_REGIONS is supported 
+```

.changelog/8626.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+containeraws: added diff suppression for case changes of enum values in `google_container_aws_cluster` and `google_container_aws_node_pool`
+```

.changelog/8628.txt

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

.changelog/8629.txt

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

.changelog/8632.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+healthcare: added `defaultSearchHandlingStrict` field to `google_healthcare_fhir_store` resource
+```

.changelog/8634.txt

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

.changelog/8636.txt

@@ -0,0 +1,3 @@
+```release-note:none
+docs: added the breaking change of the resource `google_firebaserules_release` to the 5.0.0 guides
+```

.changelog/8642.txt

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

.changelog/8645.txt

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

.changelog/8646.txt

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

.changelog/8648.txt

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

.changelog/8649.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+cloudrunv2: Added the following output only fields to `google_cloud_run_v2_job` resource: `create_time`, `update_time`, `delete_time`, `expire_time`, `creator` and `last_modifier`.
+```
+```release-note:enhancement
+cloudrunv2: Added the following output only fields to `google_cloud_run_v2_service` resource: `create_time`, `update_time`, `delete_time`, `expire_time`, `creator` and `last_modifier`.
+```

.changelog/8650.txt

@@ -0,0 +1,3 @@
+```release-note:note
+bigquery: added google_bigquery_table to version 5 upgrade doc for #8573.
+```

.copywrite.hcl

@@ -15,7 +15,7 @@ project {
     ".changelog/**",
     "examples/**",
     "scripts/**",
-    "google/test-fixtures/**",
+    "google/**/test-fixtures/**",
     "META.d/*.yml",
     ".golangci.yml",
     ".goreleaser.yml",

.github/ISSUE_TEMPLATE/10_test_failure.md

@@ -12,6 +12,22 @@ title: "Failing test(s): TestAccWhatever"
 - 100% since YYYY-MM-DD
 - X% in MONTH
 
+<!--
+
+Note: test history data will be split between the old TeamCity projects and the new projects for a while. By October the new projects will have enough new test data to avoid you needing to refer to both places.
+
+New TC projects can be found here:
+- [GA](https://hashicorp.teamcity.com/project/TerraformProviders_Google_NightlyTests)
+- [Beta](https://hashicorp.teamcity.com/project/TerraformProviders_GoogleBeta_NightlyTests)
+
+Old TC projects can be found here:
+- [GA](https://ci-oss.hashicorp.engineering/viewType.html?buildTypeId=GoogleCloud_ProviderGoogleCloudGoogleProject)
+- [Beta](https://ci-oss.hashicorp.engineering/viewType.html?buildTypeId=GoogleCloudBeta_ProviderGoogleCloudBetaGoogleProject)
+
+-->
+
+
+
 ### Impacted tests
 <!-- List all impacted tests for searchability. The title of the issue can instead list one or more groups of tests, or describe the overall root cause. -->
 
@@ -25,7 +41,7 @@ title: "Failing test(s): TestAccWhatever"
 
 ### Nightly build test history
 
-<!-- Link to the test failure(s) page ie https://ci-oss.hashicorp.engineering/test/4373437493444570564?currentProjectId=GoogleCloudBeta&branch=%3Cdefault%3E -->
+<!-- Link to the test failure(s) page ie https://hashicorp.teamcity.com/test/-4508774451323501918?currentProjectId=TerraformProviders_Google_NightlyTests&testTab=overview -->
 - Link
 
 <!-- The error message that displays in the tests tab, for reference -->

.teamcity/components/build_config_package.kt

@@ -8,18 +8,23 @@
 import jetbrains.buildServer.configs.kotlin.*
 import jetbrains.buildServer.configs.kotlin.AbsoluteId
 
-class packageDetails(name: String, displayName: String, environment: String, branchRef: String) {
-    val packageName = name
+class packageDetails(packageName: String, displayName: String, providerName: String) {
+    val packageName = packageName
     val displayName = displayName
-    val environment = environment
-    val branchRef = branchRef
+    val providerName = providerName
 
     // buildConfiguration returns a BuildType for a service package
     // For BuildType docs, see https://teamcity.jetbrains.com/app/dsl-documentation/root/build-type/index.html
-    fun buildConfiguration(providerName : String, path : String, manualVcsRoot: AbsoluteId, nightlyTestsEnabled: Boolean, startHour: Int, parallelism: Int, daysOfWeek: String, daysOfMonth: String) : BuildType {
+    fun buildConfiguration(path: String, manualVcsRoot: AbsoluteId, parallelism: Int, environmentVariables: ClientConfiguration, buildTimeout: Int = defaultBuildTimeoutDuration) : BuildType {
+
+        val testPrefix: String = "TestAcc"
+        val testTimeout: String = "12"
+        val sweeperRegions: String = "" // Not used
+        val sweeperRun: String = "" // Not used
+
         return BuildType {
             // TC needs a consistent ID for dynamically generated packages
-            id(uniqueID(providerName))
+            id(uniqueID())
 
             name = "%s - Acceptance Tests".format(displayName)
 
@@ -29,47 +34,44 @@ class packageDetails(name: String, displayName: String, environment: String, bra
             }
 
             steps {
+                SetGitCommitBuildId()
                 ConfigureGoEnv()
                 DownloadTerraformBinary()
-                // Adds steps:
-                // - Determine Working Directory for this Package
-                // - Pre-Sweeper
-                // - Compile Test Binary
-                // - Run via jen20/teamcity-go-test
-                // - Post-Sweeper
-                RunAcceptanceTests(path, packageName)
-            }
-
-            failureConditions {
-                errorMessage = true
+                RunAcceptanceTests()
             }
 
             features {
                 Golang()
             }
 
             params {
-                TerraformAcceptanceTestParameters(parallelism, "TestAcc", "12", "us-central1", "")
+                ConfigureGoogleSpecificTestParameters(environmentVariables)
+                // TODO(SarahFrench) Split TerraformAcceptanceTestParameters function into 2: one that's used for all tests/sweeper commands, and one that's specific to sweepers
+                // We shouldn't be adding sweeper-specific parameters to non-sweeper builds
+                TerraformAcceptanceTestParameters(parallelism, testPrefix, testTimeout, sweeperRegions, sweeperRun)
                 TerraformAcceptanceTestsFlag()
                 TerraformCoreBinaryTesting()
                 TerraformShouldPanicForSchemaErrors()
                 ReadOnlySettings()
-                WorkingDirectory(path, packageName)
+                WorkingDirectory(path)
             }
 
-            triggers {
-                RunNightly(nightlyTestsEnabled, startHour, daysOfWeek, daysOfMonth, branchRef)
+            failureConditions {
+                errorMessage = true
+                executionTimeoutMin = buildTimeout
             }
+
+            // Dependencies are not set here; instead, the `sequential` block in the Project instance creates dependencies between builds
+            // Triggers are not set here; the pre-sweeper at the start of the `sequential` block has a cron trigger.
         }
     }
 
-    fun uniqueID(provider : String) : String {
+    fun uniqueID() : String {
         // Replacing chars can be necessary, due to limitations on IDs
         // "ID should start with a latin letter and contain only latin letters, digits and underscores (at most 225 characters)." 
-        var pv = provider.replace("-", "").toUpperCase()
-        var env = environment.toUpperCase().replace("-", "").replace(".", "").toUpperCase()
-        var pkg = packageName.toUpperCase()
+        var pv = this.providerName.replace("-", "").toUpperCase()
+        var pkg = this.packageName.replace("-", "").toUpperCase()
 
-        return "%s_SERVICE_%s_%s".format(pv, env, pkg)
+        return "%s_PACKAGE_%s".format(pv, pkg)
     }
 }

.teamcity/components/build_google.kt

@@ -7,8 +7,9 @@
 
 import jetbrains.buildServer.configs.kotlin.ParametrizedWithType
 
-class ClientConfiguration(var custId: String,
-                          var org: String,
+// TODO(SarahFrench) Refactor this - ENVs stored here aren't all client configuration
+class ClientConfiguration(val custId: String,
+                          val org: String,
                           val org2 : String,
                           val billingAccount : String,
                           val billingAccount2: String,