Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enabling empty value send for fleet default member config in google_gke_hub_feature #2418

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Enabling empty value send for fleet default member config in google_gke_hub_feature #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/hashicorp/hcl/v2 v2.19.1
github.com/hashicorp/terraform-json v0.21.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240618192838-9d2620d19e10
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240619100122-8478b6a91197
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ github.com/hashicorp/terraform-plugin-mux v0.15.0 h1:+/+lDx0WUsIOpkAmdwBIoFU8UP9
github.com/hashicorp/terraform-plugin-mux v0.15.0/go.mod h1:9ezplb1Dyq394zQ+ldB0nvy/qbNAz3mMoHHseMTMaKo=
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8=
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240618192838-9d2620d19e10 h1:hGpkeIxgXmVyLM5pPYtKhaCZtmFqmYv0E5zFyD/Oggg=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240618192838-9d2620d19e10/go.mod h1:qGTuIbb/eUvNzz6mdjRCOMedFoejBXIavNnhS3TAMbU=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240619100122-8478b6a91197 h1:gTB+mA5O7zSlhTnphea5NSlHzjfKdqi39/mDggFFA5g=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240619100122-8478b6a91197/go.mod h1:qGTuIbb/eUvNzz6mdjRCOMedFoejBXIavNnhS3TAMbU=
github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
Expand Down
2 changes: 1 addition & 1 deletion tfplan2cai/converters/google/resources/services/gkehub2/gkehub2_feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func GetGKEHub2FeatureApiObject(d tpgresource.TerraformResourceData, config *tra
fleetDefaultMemberConfigProp, err := expandGKEHub2FeatureFleetDefaultMemberConfig(d.Get("fleet_default_member_config"), d, config)
if err != nil {
return nil, err
} else if v, ok := d.GetOkExists("fleet_default_member_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(fleetDefaultMemberConfigProp)) && (ok || !reflect.DeepEqual(v, fleetDefaultMemberConfigProp)) {
} else if v, ok := d.GetOkExists("fleet_default_member_config"); ok || !reflect.DeepEqual(v, fleetDefaultMemberConfigProp) {
obj["fleetDefaultMemberConfig"] = fleetDefaultMemberConfigProp
}
labelsProp, err := expandGKEHub2FeatureEffectiveLabels(d.Get("effective_labels"), d, config)
Expand Down
3 changes: 2 additions & 1 deletion tfplan2cai/testdata/templates/example_gke_hub_feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
"discovery_name": "Feature",
"parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
"data": {
"fleetDefaultMemberConfig": null,
"labels": {
"foo": "bar"
}
}
},
"ancestors": ["organizations/{{.OrgID}}"]
}
]
]