Skip to content

Commit 035a703

Browse files
Removed the automatic field from the google_secret_manager_secret resource (#8859) (#1441)
Signed-off-by: Modular Magician <[email protected]>
1 parent befca29 commit 035a703

File tree

3 files changed

+8
-27
lines changed

3 files changed

+8
-27
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/hashicorp/hcl/v2 v2.14.1
1212
github.com/hashicorp/terraform-json v0.14.0
1313
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
14-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20230914205834-278f0608a40c
14+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20230915155512-16d2d271ada5
1515
github.com/pkg/errors v0.9.1
1616
github.com/stretchr/testify v1.8.3
1717
github.com/zclconf/go-cty v1.11.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ github.com/hashicorp/terraform-plugin-log v0.7.0/go.mod h1:p4R1jWBXRTvL4odmEkFfD
194194
github.com/hashicorp/terraform-plugin-mux v0.8.0 h1:WCTP66mZ+iIaIrCNJnjPEYnVjawTshnDJu12BcXK1EI=
195195
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 h1:FtCLTiTcykdsURXPt/ku7fYXm3y19nbzbZcUxHx9RbI=
196196
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0/go.mod h1:80wf5oad1tW+oLnbXS4UTYmDCrl7BuN1Q+IA91X1a4Y=
197-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20230914205834-278f0608a40c h1:BCK8k08F2mG9qlfHe6MPOClnvgql1N3RWr9e1hzw5Hs=
198-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20230914205834-278f0608a40c/go.mod h1:RxBPRjnujJagg+J19VwCpLmxvye1hHj1/3Z1SksAwv8=
197+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20230915155512-16d2d271ada5 h1:OlEnz4KXgLM18ZCX3yN8XhodxrzSl3IoT7kUMpSpBzg=
198+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20230915155512-16d2d271ada5/go.mod h1:RxBPRjnujJagg+J19VwCpLmxvye1hHj1/3Z1SksAwv8=
199199
github.com/hashicorp/terraform-registry-address v0.1.0 h1:W6JkV9wbum+m516rCl5/NjKxCyTVaaUBbzYcMzBDO3U=
200200
github.com/hashicorp/terraform-registry-address v0.1.0/go.mod h1:EnyO2jYO6j29DTHbJcm00E5nQTFeTtyZH3H5ycydQ5A=
201201
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=

tfplan2cai/converters/google/resources/services/secretmanager/secretmanager_secret.go

+5-24
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,11 @@ func expandSecretManagerSecretReplication(v interface{}, d tpgresource.Terraform
148148
original := raw.(map[string]interface{})
149149
transformed := make(map[string]interface{})
150150

151-
if _, ok := d.GetOk("replication.0.automatic"); ok {
152-
transformedAutomatic, err := expandSecretManagerSecretReplicationAutomatic(original["automatic"], d, config)
153-
if err != nil {
154-
return nil, err
155-
} else if val := reflect.ValueOf(transformedAutomatic); val.IsValid() && !tpgresource.IsEmptyValue(val) {
156-
transformed["automatic"] = transformedAutomatic
157-
}
158-
}
159-
160-
if _, ok := d.GetOk("replication.0.auto"); ok {
161-
transformedAuto, err := expandSecretManagerSecretReplicationAuto(original["auto"], d, config)
162-
if err != nil {
163-
return nil, err
164-
} else {
165-
transformed["automatic"] = transformedAuto
166-
}
151+
transformedAuto, err := expandSecretManagerSecretReplicationAuto(original["auto"], d, config)
152+
if err != nil {
153+
return nil, err
154+
} else {
155+
transformed["automatic"] = transformedAuto
167156
}
168157

169158
transformedUserManaged, err := expandSecretManagerSecretReplicationUserManaged(original["user_managed"], d, config)
@@ -176,14 +165,6 @@ func expandSecretManagerSecretReplication(v interface{}, d tpgresource.Terraform
176165
return transformed, nil
177166
}
178167

179-
func expandSecretManagerSecretReplicationAutomatic(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
180-
if v == nil || !v.(bool) {
181-
return nil, nil
182-
}
183-
184-
return struct{}{}, nil
185-
}
186-
187168
func expandSecretManagerSecretReplicationAuto(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
188169
l := v.([]interface{})
189170
if len(l) == 0 {

0 commit comments

Comments
 (0)