diff --git a/go.mod b/go.mod index 663cbd248..f1a3eec80 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 6b5453d04..d92274d66 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/tfplan2cai/converters/google/resources/services/gkehub2/gkehub2_feature.go b/tfplan2cai/converters/google/resources/services/gkehub2/gkehub2_feature.go index 5b414b850..fd48c2014 100644 --- a/tfplan2cai/converters/google/resources/services/gkehub2/gkehub2_feature.go +++ b/tfplan2cai/converters/google/resources/services/gkehub2/gkehub2_feature.go @@ -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) diff --git a/tfplan2cai/testdata/templates/example_gke_hub_feature.json b/tfplan2cai/testdata/templates/example_gke_hub_feature.json index 39a22f1c5..fc13dafd9 100644 --- a/tfplan2cai/testdata/templates/example_gke_hub_feature.json +++ b/tfplan2cai/testdata/templates/example_gke_hub_feature.json @@ -9,6 +9,7 @@ "discovery_name": "Feature", "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}", "data": { + "fleetDefaultMemberConfig": null, "labels": { "foo": "bar" } @@ -16,4 +17,4 @@ }, "ancestors": ["organizations/{{.OrgID}}"] } -] \ No newline at end of file +]