Skip to content

Commit

Permalink
Upgrade DCL version to 1.57.0 (#9466) (#16536)
Browse files Browse the repository at this point in the history 
[upstream:985932c80092092cac3c4d8c8d645eed3cf7828d]

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
@modular-magician
modular-magician committed Nov 14, 2023
1 parent 9e293c4 commit 951dd43
Show file tree
Hide file tree
Showing 5 changed files with 478 additions and 28 deletions.
6 changes: 6 additions & 0 deletions .changelog/9466.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:enhancement
gkehub: added support for `membership_location` to `google_gke_hub_feature_membership`
```
```release-note:deprecation
gkehub: deprecated `config_management.binauthz` in `google_gke_hub_feature_membership`
```
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ go 1.19

require (
cloud.google.com/go/bigtable v1.19.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.56.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.57.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
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,3 +429,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.56.0 h1:R8zbp/2oVfPbMF1u6RTkf5s+J4hA6sWAEo8E7xsrbpY=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.56.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.57.0 h1:Rz/Jlnt195m9B8CJPQejuTbXaPCoB1w1QYQjD4oKHMk=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.57.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
69 changes: 42 additions & 27 deletions google/services/gkehub/resource_gke_hub_feature_membership.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ func ResourceGkeHubFeatureMembership() *schema.Resource {
Elem: GkeHubFeatureMembershipConfigmanagementSchema(),
},

"membership_location": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Description: "The location of the membership",
},

"mesh": {
Type: schema.TypeList,
Optional: true,
Expand All @@ -108,8 +115,9 @@ func GkeHubFeatureMembershipConfigmanagementSchema() *schema.Resource {
Schema: map[string]*schema.Schema{
"binauthz": {
Type: schema.TypeList,
Computed: true,
Optional: true,
Description: "Binauthz configuration for the cluster.",
Description: "**DEPRECATED** Binauthz configuration for the cluster. This field will be ignored and should not be set.",
MaxItems: 1,
Elem: GkeHubFeatureMembershipConfigmanagementBinauthzSchema(),
},
Expand Down Expand Up @@ -417,12 +425,13 @@ func resourceGkeHubFeatureMembershipCreate(d *schema.ResourceData, meta interfac
}

obj := &gkehub.FeatureMembership{
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
MembershipLocation: dcl.String(d.Get("membership_location").(string)),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
}
lockName, err := tpgresource.ReplaceVarsForId(d, config, "{{project}}/{{location}}/{{feature}}")
if err != nil {
Expand Down Expand Up @@ -476,12 +485,13 @@ func resourceGkeHubFeatureMembershipRead(d *schema.ResourceData, meta interface{
}

obj := &gkehub.FeatureMembership{
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
MembershipLocation: dcl.String(d.Get("membership_location").(string)),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
}

userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
Expand Down Expand Up @@ -518,6 +528,9 @@ func resourceGkeHubFeatureMembershipRead(d *schema.ResourceData, meta interface{
if err = d.Set("configmanagement", flattenGkeHubFeatureMembershipConfigmanagement(res.Configmanagement)); err != nil {
return fmt.Errorf("error setting configmanagement in state: %s", err)
}
if err = d.Set("membership_location", res.MembershipLocation); err != nil {
return fmt.Errorf("error setting membership_location in state: %s", err)
}
if err = d.Set("mesh", flattenGkeHubFeatureMembershipMesh(res.Mesh)); err != nil {
return fmt.Errorf("error setting mesh in state: %s", err)
}
Expand All @@ -535,12 +548,13 @@ func resourceGkeHubFeatureMembershipUpdate(d *schema.ResourceData, meta interfac
}

obj := &gkehub.FeatureMembership{
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
MembershipLocation: dcl.String(d.Get("membership_location").(string)),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
}
lockName, err := tpgresource.ReplaceVarsForId(d, config, "{{project}}/{{location}}/{{feature}}")
if err != nil {
Expand Down Expand Up @@ -590,12 +604,13 @@ func resourceGkeHubFeatureMembershipDelete(d *schema.ResourceData, meta interfac
}

obj := &gkehub.FeatureMembership{
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
Feature: dcl.String(d.Get("feature").(string)),
Location: dcl.String(d.Get("location").(string)),
Membership: dcl.String(d.Get("membership").(string)),
Configmanagement: expandGkeHubFeatureMembershipConfigmanagement(d.Get("configmanagement")),
MembershipLocation: dcl.String(d.Get("membership_location").(string)),
Mesh: expandGkeHubFeatureMembershipMesh(d.Get("mesh")),
Project: dcl.String(project),
}
lockName, err := tpgresource.ReplaceVarsForId(d, config, "{{project}}/{{location}}/{{feature}}")
if err != nil {
Expand Down Expand Up @@ -686,11 +701,11 @@ func flattenGkeHubFeatureMembershipConfigmanagement(obj *gkehub.FeatureMembershi

func expandGkeHubFeatureMembershipConfigmanagementBinauthz(o interface{}) *gkehub.FeatureMembershipConfigmanagementBinauthz {
if o == nil {
return gkehub.EmptyFeatureMembershipConfigmanagementBinauthz
return nil
}
objArr := o.([]interface{})
if len(objArr) == 0 || objArr[0] == nil {
return gkehub.EmptyFeatureMembershipConfigmanagementBinauthz
return nil
}
obj := objArr[0].(map[string]interface{})
return &gkehub.FeatureMembershipConfigmanagementBinauthz{
Expand Down
Loading

0 comments on commit 951dd43

Please sign in to comment.