Skip to content

Commit 1447331

Browse files
Remove usage of resource_definition (#9553) (#16656)
* Remove usage of resource_definition * Update mmv1/products/identityplatform/ProjectDefaultConfig.yaml --------- [upstream:30d3f116bb169f721ac0b58e772d07c5bce289f0] Signed-off-by: Modular Magician <[email protected]>
1 parent f5fd695 commit 1447331

5 files changed

+18
-16
lines changed

.changelog/9553.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/services/identityplatform/resource_identity_platform_project_default_config.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ func ResourceIdentityPlatformProjectDefaultConfig() *schema.Resource {
5252
tpgresource.DefaultProviderProject,
5353
),
5454

55-
DeprecationMessage: "Deprecated. Use the `google_identity_platform_config` resource instead. " +
56-
"It contains a more comprehensive list of fields, and was created before " +
57-
"`google_identity_platform_project_default_config` was added.",
55+
DeprecationMessage: "`google_identity_platform_config` is deprecated and will be removed in the next major release of the provider. Use the `google_identity_platform_config` resource instead. It contains a more comprehensive list of fields, and was created before `google_identity_platform_project_default_config` was added.",
5856

5957
Schema: map[string]*schema.Schema{
6058
"sign_in": {

google/services/secretmanager/resource_secret_manager_secret_version.go

+12-13
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,11 @@ import (
3434
"google.golang.org/api/googleapi"
3535
)
3636

37-
func resourceSecretManagerSecretVersionUpdate(d *schema.ResourceData, meta interface{}) error {
38-
config := meta.(*transport_tpg.Config)
39-
40-
_, err := expandSecretManagerSecretVersionEnabled(d.Get("enabled"), d, config)
41-
if err != nil {
42-
return err
43-
}
44-
45-
return resourceSecretManagerSecretVersionRead(d, meta)
46-
}
47-
4837
func ResourceSecretManagerSecretVersion() *schema.Resource {
4938
return &schema.Resource{
5039
Create: resourceSecretManagerSecretVersionCreate,
5140
Read: resourceSecretManagerSecretVersionRead,
41+
Update: resourceSecretManagerSecretVersionUpdate,
5242
Delete: resourceSecretManagerSecretVersionDelete,
5343

5444
Importer: &schema.ResourceImporter{
@@ -57,11 +47,10 @@ func ResourceSecretManagerSecretVersion() *schema.Resource {
5747

5848
Timeouts: &schema.ResourceTimeout{
5949
Create: schema.DefaultTimeout(20 * time.Minute),
50+
Update: schema.DefaultTimeout(20 * time.Minute),
6051
Delete: schema.DefaultTimeout(20 * time.Minute),
6152
},
6253

63-
Update: resourceSecretManagerSecretVersionUpdate,
64-
6554
Schema: map[string]*schema.Schema{
6655
"secret_data": {
6756
Type: schema.TypeString,
@@ -294,6 +283,16 @@ func resourceSecretManagerSecretVersionRead(d *schema.ResourceData, meta interfa
294283
return nil
295284
}
296285

286+
func resourceSecretManagerSecretVersionUpdate(d *schema.ResourceData, meta interface{}) error {
287+
config := meta.(*transport_tpg.Config)
288+
_, err := expandSecretManagerSecretVersionEnabled(d.Get("enabled"), d, config)
289+
if err != nil {
290+
return err
291+
}
292+
293+
return resourceSecretManagerSecretVersionRead(d, meta)
294+
}
295+
297296
func resourceSecretManagerSecretVersionDelete(d *schema.ResourceData, meta interface{}) error {
298297
config := meta.(*transport_tpg.Config)
299298
userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)

website/docs/r/identity_platform_project_default_config.html.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |-
1818
---
1919

2020
# google\_identity\_platform\_project\_default\_config
21+
~> **Warning:** `google_identity_platform_config` is deprecated and will be removed in the next major release of the provider. Use the `google_identity_platform_config` resource instead. It contains a more comprehensive list of fields, and was created before `google_identity_platform_project_default_config` was added.
2122

2223
There is no persistent data associated with this resource.
2324

website/docs/r/secret_manager_secret_version.html.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ This resource provides the following
197197
[Timeouts](https://developer.hashicorp.com/terraform/plugin/sdkv2/resources/retries-and-customizable-timeouts) configuration options:
198198

199199
- `create` - Default is 20 minutes.
200+
- `update` - Default is 20 minutes.
200201
- `delete` - Default is 20 minutes.
201202

202203
## Import

0 commit comments

Comments
 (0)