Skip to content

Commit

Permalink
fix: do not set omitempty to CP groupmembership members
Browse files Browse the repository at this point in the history
  • Loading branch information
pmalek committed Oct 31, 2024
1 parent 971395b commit 012f47e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .speakeasy/gen.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ id: b81e5def-5b1e-4753-ae7c-0efccc2e6f61
management:
docChecksum: e9093ae35a5e8939c715167d4836f51a
docVersion: 0.0.1
speakeasyVersion: 1.423.1
speakeasyVersion: 1.423.2
generationVersion: 2.442.11
releaseVersion: 0.1.2
configChecksum: b0611f2b9c20392d6a306eeeecc39da2
releaseVersion: 0.1.3
configChecksum: e81b9d70428b9cbd1dfcfc8a34eea1c4
features:
go:
additionalDependencies: 0.1.0
Expand Down
2 changes: 1 addition & 1 deletion .speakeasy/gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ generation:
auth:
oAuth2ClientCredentialsEnabled: false
go:
version: 0.1.2
version: 0.1.3
additionalDependencies: {}
allowUnknownFieldsInWeakUnions: false
clientServerStatusCodesAsErrors: true
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ OPENAPI_FILE = openapi.yaml
SPEAKEASY_DIR = .speakeasy
KUBEBUILDER_GENERATE_CODE_MARKER = +kubebuilder:object:generate=true


# TODO: this works around the fact that speakeasy does not support fields that
# do not have "omitempty" set and are not required.
# Related slack thread: https://kongstrong.slack.com/archives/C05MLAA216D/p1730369303065339
.PHONY: _generate.omitempty
_generate.omitempty:
$(SED) -i 's#Members \[\]Members `json:"members,omitempty"`#Members \[\]Members `json:"members"`#g' \
models/components/groupmembership.go

.PHONY: generate.deepcopy
generate.deepcopy: controller-gen
$(SED) -i 's#\(type CreateControlPlaneRequest struct\)#// $(KUBEBUILDER_GENERATE_CODE_MARKER)\n\1#g' \
Expand Down Expand Up @@ -96,4 +105,5 @@ generate.deepcopy: controller-gen
generate.sdk:
$(MAKE) generate.deepcopy
speakeasy generate sdk --lang go --out . --schema ./$(OPENAPI_FILE)
$(MAKE) _generate.omitempty
go mod tidy
2 changes: 1 addition & 1 deletion models/components/groupmembership.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func (o *Members) GetID() *string {

// GroupMembership - Request body for upserting a list of child control planes to a control plane group membership.
type GroupMembership struct {
Members []Members `json:"members,omitempty"`
Members []Members `json:"members"`
}

func (o *GroupMembership) GetMembers() []Members {
Expand Down
4 changes: 2 additions & 2 deletions sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ func New(opts ...SDKOption) *SDK {
sdkConfiguration: sdkConfiguration{
Language: "go",
OpenAPIDocVersion: "0.0.1",
SDKVersion: "0.1.2",
SDKVersion: "0.1.3",
GenVersion: "2.442.11",
UserAgent: "speakeasy-sdk/go 0.1.2 2.442.11 0.0.1 github.com/Kong/sdk-konnect-go",
UserAgent: "speakeasy-sdk/go 0.1.3 2.442.11 0.0.1 github.com/Kong/sdk-konnect-go",
Hooks: hooks.New(),
},
}
Expand Down

0 comments on commit 012f47e

Please sign in to comment.