Skip to content

Commit 90b07b6

Browse files
Promote asynchronous disk replication resources to GA. (#8232) (#5843)
Signed-off-by: Modular Magician <[email protected]>
1 parent 8bbd565 commit 90b07b6

9 files changed

+20
-40
lines changed

.changelog/8232.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
```release-note:note
2+
compute: promoted `google_compute_disk_async_replication` resource to GA.
3+
```
4+
```release-note:note
5+
compute: promoted `async_primary_disk` field in `google_compute_disk` resource to GA.
6+
```
7+
```release-note:note
8+
compute: promoted `async_primary_disk` field in `google_compute_region_disk` resource to GA.
9+
```
10+
```release-note:note
11+
compute: promoted `disk_consistency_group_policy` field in `google_compute_resource_policy` resource to GA.
12+
```

google-beta/resource_compute_disk_async_replication_test.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestAccComputeDiskAsyncReplication(t *testing.T) {
4545

4646
VcrTest(t, resource.TestCase{
4747
PreCheck: func() { AccTestPreCheck(t) },
48-
ProtoV5ProviderFactories: ProtoV5ProviderBetaFactories(t),
48+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
4949
Steps: []resource.TestStep{
5050
{
5151
Config: testAccComputeDiskAsyncReplication_basicZonal(region, secondaryRegion, primaryDisk, secondaryDisk),
@@ -76,8 +76,6 @@ func TestAccComputeDiskAsyncReplication(t *testing.T) {
7676
func testAccComputeDiskAsyncReplication_basicZonal(region, secondaryRegion, primaryDisk, secondaryDisk string) string {
7777
return fmt.Sprintf(`
7878
resource "google_compute_disk" "primary" {
79-
provider = google-beta
80-
8179
zone = "%s-a"
8280
name = "%s"
8381
type = "pd-ssd"
@@ -86,8 +84,6 @@ resource "google_compute_disk" "primary" {
8684
}
8785
8886
resource "google_compute_disk" "secondary" {
89-
provider = google-beta
90-
9187
name = "%s"
9288
type = "pd-ssd"
9389
zone = "%s-b"
@@ -100,8 +96,6 @@ resource "google_compute_disk" "secondary" {
10096
}
10197
10298
resource "google_compute_disk_async_replication" "replication" {
103-
provider = google-beta
104-
10599
primary_disk = google_compute_disk.primary.id
106100
107101
secondary_disk {
@@ -114,8 +108,6 @@ resource "google_compute_disk_async_replication" "replication" {
114108
func testAccComputeDiskAsyncReplication_basicRegional(region, secondaryRegion, primaryDisk, secondaryDisk string) string {
115109
return fmt.Sprintf(`
116110
resource "google_compute_region_disk" "primary" {
117-
provider = google-beta
118-
119111
region = "%s"
120112
name = "%s"
121113
type = "pd-ssd"
@@ -129,8 +121,6 @@ resource "google_compute_region_disk" "primary" {
129121
}
130122
131123
resource "google_compute_region_disk" "secondary" {
132-
provider = google-beta
133-
134124
region = "%s"
135125
name = "%s"
136126
type = "pd-ssd"
@@ -148,8 +138,6 @@ resource "google_compute_region_disk" "secondary" {
148138
}
149139
150140
resource "google_compute_disk_async_replication" "replication" {
151-
provider = google-beta
152-
153141
primary_disk = google_compute_region_disk.primary.id
154142
155143
secondary_disk {

google-beta/resource_compute_disk_generated_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestAccComputeDisk_diskAsyncExample(t *testing.T) {
7979

8080
VcrTest(t, resource.TestCase{
8181
PreCheck: func() { acctest.AccTestPreCheck(t) },
82-
ProtoV5ProviderFactories: ProtoV5ProviderBetaFactories(t),
82+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
8383
CheckDestroy: testAccCheckComputeDiskDestroyProducer(t),
8484
Steps: []resource.TestStep{
8585
{
@@ -98,8 +98,6 @@ func TestAccComputeDisk_diskAsyncExample(t *testing.T) {
9898
func testAccComputeDisk_diskAsyncExample(context map[string]interface{}) string {
9999
return acctest.Nprintf(`
100100
resource "google_compute_disk" "primary" {
101-
provider = google-beta
102-
103101
name = "tf-test-async-test-disk%{random_suffix}"
104102
type = "pd-ssd"
105103
zone = "us-central1-a"
@@ -108,8 +106,6 @@ resource "google_compute_disk" "primary" {
108106
}
109107
110108
resource "google_compute_disk" "secondary" {
111-
provider = google-beta
112-
113109
name = "tf-test-async-secondary-test-disk%{random_suffix}"
114110
type = "pd-ssd"
115111
zone = "us-east1-c"

google-beta/resource_compute_region_disk_generated_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestAccComputeRegionDisk_regionDiskAsyncExample(t *testing.T) {
9292

9393
VcrTest(t, resource.TestCase{
9494
PreCheck: func() { acctest.AccTestPreCheck(t) },
95-
ProtoV5ProviderFactories: ProtoV5ProviderBetaFactories(t),
95+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
9696
CheckDestroy: testAccCheckComputeRegionDiskDestroyProducer(t),
9797
Steps: []resource.TestStep{
9898
{
@@ -111,8 +111,6 @@ func TestAccComputeRegionDisk_regionDiskAsyncExample(t *testing.T) {
111111
func testAccComputeRegionDisk_regionDiskAsyncExample(context map[string]interface{}) string {
112112
return acctest.Nprintf(`
113113
resource "google_compute_region_disk" "primary" {
114-
provider = google-beta
115-
116114
name = "tf-test-primary-region-disk%{random_suffix}"
117115
type = "pd-ssd"
118116
region = "us-central1"
@@ -122,8 +120,6 @@ resource "google_compute_region_disk" "primary" {
122120
}
123121
124122
resource "google_compute_region_disk" "secondary" {
125-
provider = google-beta
126-
127123
name = "tf-test-secondary-region-disk%{random_suffix}"
128124
type = "pd-ssd"
129125
region = "us-east1"

google-beta/resource_compute_resource_policy_generated_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func TestAccComputeResourcePolicy_resourcePolicyConsistencyGroupExample(t *testi
311311

312312
VcrTest(t, resource.TestCase{
313313
PreCheck: func() { acctest.AccTestPreCheck(t) },
314-
ProtoV5ProviderFactories: ProtoV5ProviderBetaFactories(t),
314+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
315315
CheckDestroy: testAccCheckComputeResourcePolicyDestroyProducer(t),
316316
Steps: []resource.TestStep{
317317
{
@@ -330,8 +330,6 @@ func TestAccComputeResourcePolicy_resourcePolicyConsistencyGroupExample(t *testi
330330
func testAccComputeResourcePolicy_resourcePolicyConsistencyGroupExample(context map[string]interface{}) string {
331331
return acctest.Nprintf(`
332332
resource "google_compute_resource_policy" "cgroup" {
333-
provider = google-beta
334-
335333
name = "tf-test-gce-policy%{random_suffix}"
336334
region = "europe-west1"
337335
disk_consistency_group_policy {

website/docs/r/compute_disk.html.markdown

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ resource "google_compute_disk" "default" {
7777

7878
```hcl
7979
resource "google_compute_disk" "primary" {
80-
provider = google-beta
81-
8280
name = "async-test-disk"
8381
type = "pd-ssd"
8482
zone = "us-central1-a"
@@ -87,8 +85,6 @@ resource "google_compute_disk" "primary" {
8785
}
8886
8987
resource "google_compute_disk" "secondary" {
90-
provider = google-beta
91-
9288
name = "async-secondary-test-disk"
9389
type = "pd-ssd"
9490
zone = "us-east1-c"
@@ -243,7 +239,7 @@ The following arguments are supported:
243239
allows for an update of Throughput every 4 hours. To update your hyperdisk more frequently, you'll need to manually delete and recreate it
244240

245241
* `async_primary_disk` -
246-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
242+
(Optional)
247243
A nested object resource
248244
Structure is [documented below](#nested_async_primary_disk).
249245

website/docs/r/compute_disk_async_replication.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: |-
88

99
Starts and stops asynchronous persistent disk replication. For more information
1010
see [the official documentation](https://cloud.google.com/compute/docs/disks/async-pd/about)
11-
and the [API](https://cloud.google.com/compute/docs/reference/rest/beta/disks).
11+
and the [API](https://cloud.google.com/compute/docs/reference/rest/v1/disks).
1212

1313
## Example Usage
1414

website/docs/r/compute_region_disk.html.markdown

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ resource "google_compute_snapshot" "snapdisk" {
9090

9191
```hcl
9292
resource "google_compute_region_disk" "primary" {
93-
provider = google-beta
94-
9593
name = "primary-region-disk"
9694
type = "pd-ssd"
9795
region = "us-central1"
@@ -101,8 +99,6 @@ resource "google_compute_region_disk" "primary" {
10199
}
102100
103101
resource "google_compute_region_disk" "secondary" {
104-
provider = google-beta
105-
106102
name = "secondary-region-disk"
107103
type = "pd-ssd"
108104
region = "us-east1"
@@ -219,7 +215,7 @@ The following arguments are supported:
219215
* regions/{region}/disks/{disk}
220216

221217
* `async_primary_disk` -
222-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
218+
(Optional)
223219
A nested object resource
224220
Structure is [documented below](#nested_async_primary_disk).
225221

website/docs/r/compute_resource_policy.html.markdown

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ resource "google_compute_resource_policy" "hourly" {
185185

186186
```hcl
187187
resource "google_compute_resource_policy" "cgroup" {
188-
provider = google-beta
189-
190188
name = "gce-policy"
191189
region = "europe-west1"
192190
disk_consistency_group_policy {
@@ -234,7 +232,7 @@ The following arguments are supported:
234232
Structure is [documented below](#nested_instance_schedule_policy).
235233

236234
* `disk_consistency_group_policy` -
237-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
235+
(Optional)
238236
Replication consistency group for asynchronous disk replication.
239237
Structure is [documented below](#nested_disk_consistency_group_policy).
240238

0 commit comments

Comments
 (0)