Skip to content

Commit bcc3910

Browse files
Add the Resourcemanager Capability Service to the google provider. (#15148) (#10740)
[upstream:82fa9898c730de27197c0807b23885a5b67243f1] Signed-off-by: Modular Magician <[email protected]>
1 parent f758b7d commit bcc3910

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

.changelog/15148.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resourcemanager: promoted `google_resource_manager_capability` to ga
3+
```

google-beta/services/resourcemanager3/resource_resource_manager_capability_generated_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAccResourceManager3Capability_resourceManagerCapabilityExample(t *testi
3636

3737
acctest.VcrTest(t, resource.TestCase{
3838
PreCheck: func() { acctest.AccTestPreCheck(t) },
39-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
39+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
4040
ExternalProviders: map[string]resource.ExternalProvider{
4141
"time": {},
4242
},
@@ -57,7 +57,6 @@ func TestAccResourceManager3Capability_resourceManagerCapabilityExample(t *testi
5757
func testAccResourceManager3Capability_resourceManagerCapabilityExample(context map[string]interface{}) string {
5858
return acctest.Nprintf(`
5959
resource "google_folder" "folder" {
60-
provider = google-beta
6160
display_name = "tf-test-my-folder%{random_suffix}"
6261
parent = "organizations/%{org_id}"
6362
deletion_protection = false
@@ -67,7 +66,6 @@ resource "time_sleep" "wait_60s" {
6766
create_duration = "60s"
6867
}
6968
resource "google_resource_manager_capability" "capability" {
70-
provider = google-beta
7169
value = true
7270
parent = "${google_folder.folder.name}"
7371
capability_name = "app-management"

google-beta/services/resourcemanager3/resource_resource_manager_capability_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// This code is generated by Magic Modules using the following:
1010
//
11-
// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/resourcemanager3/resource_resource_manager_capability_test.go.tmpl
11+
// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/resourcemanager3/resource_resource_manager_capability_test.go
1212
//
1313
// DO NOT EDIT this file directly. Any changes made to this file will be
1414
// overwritten during the next generation cycle.
@@ -37,7 +37,7 @@ func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t *
3737

3838
acctest.VcrTest(t, resource.TestCase{
3939
PreCheck: func() { acctest.AccTestPreCheck(t) },
40-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
40+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
4141
ExternalProviders: map[string]resource.ExternalProvider{
4242
"time": {},
4343
},
@@ -68,7 +68,6 @@ func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t *
6868
func testAccResourceManagerCapability_resourceManagerCapabilityExample_basic(context map[string]interface{}) string {
6969
return acctest.Nprintf(`
7070
resource "google_folder" "folder" {
71-
provider = google-beta
7271
display_name = "my-folder%{random_suffix}"
7372
parent = "organizations/%{org_id}"
7473
deletion_protection = false
@@ -78,11 +77,10 @@ resource "time_sleep" "wait_60s" {
7877
create_duration = "60s"
7978
}
8079
resource "google_resource_manager_capability" "capability" {
81-
provider = google-beta
8280
value = true
8381
parent = "${google_folder.folder.name}"
8482
capability_name = "app-management"
85-
depends_on = [time_sleep.wait_60s]
83+
depends_on = [time_sleep.wait_60s, google_folder.folder]
8684
}
8785
`, context)
8886
}

website/docs/r/resource_manager_capability.html.markdown

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ description: |-
2323

2424
An app-enabled folder is a folder within the Google Cloud resource hierarchy that has been configured for application management. This folder lets you define and manage App Hub applications. These applications are functional groupings of services and workloads that span multiple projects within that folder and its descendant projects.
2525

26-
~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
27-
See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
2826

2927
To get more information about Capability, see:
3028

@@ -37,7 +35,6 @@ To get more information about Capability, see:
3735

3836
```hcl
3937
resource "google_folder" "folder" {
40-
provider = google-beta
4138
display_name = "my-folder"
4239
parent = "organizations/123456789"
4340
deletion_protection = false
@@ -47,7 +44,6 @@ resource "time_sleep" "wait_60s" {
4744
create_duration = "60s"
4845
}
4946
resource "google_resource_manager_capability" "capability" {
50-
provider = google-beta
5147
value = true
5248
parent = "${google_folder.folder.name}"
5349
capability_name = "app-management"

0 commit comments

Comments
 (0)