Upgrade DCL 1.50.0 (#8743) (#15604)

* Upgrade DCL 1.50.0 * Add gkehub GA override * Promote tests to ga * Fix tests Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 23, 2023 · 9a2b54f · 9a2b54f
1 parent ad74136
commit 9a2b54f
Show file tree

Hide file tree

Showing 9 changed files with 2,189 additions and 5 deletions.
diff --git a/.changelog/8743.txt b/.changelog/8743.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkehub: promoted the `google_gke_hub_feature_membership` resource to GA
+```
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ go 1.19
 
 require (
 	cloud.google.com/go/bigtable v1.19.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.49.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dnaeon/go-vcr v1.0.1

diff --git a/go.sum b/go.sum
@@ -15,10 +15,8 @@ cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5
 cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI=
 cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.48.0 h1:+1lMwM8ZN8IGqYnSn2qh3Kb0fBBf9SwB+7yPBtcpNsM=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.48.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.49.0 h1:XvQtlNIEx3wMIXa+eymDIqYO5gvjYoMsi3XF2fblKmM=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.49.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0 h1:tsuB2FrGmDXIPUdhRD6YdUuvIzAly6+RYpyRkKWwk9E=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.50.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=

diff --git a/google/fwmodels/provider_model.go b/google/fwmodels/provider_model.go
@@ -145,6 +145,8 @@ type ProviderModel struct {
 	FirebaserulesCustomEndpoint        types.String `tfsdk:"firebaserules_custom_endpoint"`
 	OrgPolicyCustomEndpoint            types.String `tfsdk:"org_policy_custom_endpoint"`
 	RecaptchaEnterpriseCustomEndpoint  types.String `tfsdk:"recaptcha_enterprise_custom_endpoint"`
+
+	GkehubFeatureCustomEndpoint types.String `tfsdk:"gkehub_feature_custom_endpoint"`
 }
 
 type ProviderBatching struct {

diff --git a/google/provider/provider_dcl_resources.go b/google/provider/provider_dcl_resources.go
@@ -33,6 +33,7 @@ import (
 	"github.com/hashicorp/terraform-provider-google/google/services/dataproc"
 	"github.com/hashicorp/terraform-provider-google/google/services/eventarc"
 	"github.com/hashicorp/terraform-provider-google/google/services/firebaserules"
+	"github.com/hashicorp/terraform-provider-google/google/services/gkehub"
 	"github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity"
 	"github.com/hashicorp/terraform-provider-google/google/services/orgpolicy"
 	"github.com/hashicorp/terraform-provider-google/google/services/privateca"
@@ -71,6 +72,7 @@ var dclResources = map[string]*schema.Resource{
 	"google_eventarc_trigger":                                   eventarc.ResourceEventarcTrigger(),
 	"google_firebaserules_release":                              firebaserules.ResourceFirebaserulesRelease(),
 	"google_firebaserules_ruleset":                              firebaserules.ResourceFirebaserulesRuleset(),
+	"google_gke_hub_feature_membership":                         gkehub.ResourceGkeHubFeatureMembership(),
 	"google_network_connectivity_hub":                           networkconnectivity.ResourceNetworkConnectivityHub(),
 	"google_network_connectivity_spoke":                         networkconnectivity.ResourceNetworkConnectivitySpoke(),
 	"google_org_policy_policy":                                  orgpolicy.ResourceOrgPolicyPolicy(),