Skip to content

GO sdk unmarshel fix #129

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

Merged
robert-chiniquy merged 3 commits into from
Jan 13, 2026
Merged

GO sdk unmarshel fix #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
926e30f
temp fix for unmarshel issue
mstanbCO Jan 13, 2026
6ab89fe
Adds a temp fix to the go-sdk
mstanbCO Jan 13, 2026
5f7cdd3
vendor and tidy
mstanbCO Jan 13, 2026
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 (

require (
github.com/conductorone/baton-sdk v0.3.17
github.com/conductorone/conductorone-sdk-go v1.27.1
github.com/conductorone/conductorone-sdk-go v1.27.2-0.20260113184555-c2a4cbf81d4c
github.com/pterm/pterm v0.12.81
github.com/toqueteos/webbrowser v1.2.0
github.com/xhit/go-str2duration/v2 v2.1.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 @@ -30,8 +30,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/conductorone/baton-sdk v0.3.17 h1:aJNr4T2xr7rDa4P2nwKEHjJngI5JcNgfBZZ9aeeliHc=
github.com/conductorone/baton-sdk v0.3.17/go.mod h1:lWZHgu025Rsgs5jvBrhilGti0zWF2+YfaFY/bWOS/g0=
github.com/conductorone/conductorone-sdk-go v1.27.1 h1:qKiUR4uFDlNJmpNlJd4dDJsl7sFxfmaAO1p8xGDrTSg=
github.com/conductorone/conductorone-sdk-go v1.27.1/go.mod h1:XfnxsPIsLn6s01PD46kU9tEUUljTRik7aviJIwB7D0k=
github.com/conductorone/conductorone-sdk-go v1.27.2-0.20260113184555-c2a4cbf81d4c h1:ogMr+Lssoks5dRSSVTpctWzKwdu69ZpvGd3ZkMif1cg=
github.com/conductorone/conductorone-sdk-go v1.27.2-0.20260113184555-c2a4cbf81d4c/go.mod h1:XfnxsPIsLn6s01PD46kU9tEUUljTRik7aviJIwB7D0k=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc=
github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
Expand Down
13 changes: 13 additions & 0 deletions vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/escalation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package shared

import "github.com/conductorone/conductorone-sdk-go/pkg/utils"

// The Escalation message.
//
// This message contains a oneof named escalation_policy. Only a single field of the following list may be set at a time:
Expand All @@ -24,6 +26,17 @@ type Escalation struct {
Expiration *int64 `integer:"string" json:"expiration,omitempty"`
}

func (e Escalation) MarshalJSON() ([]byte, error) {
return utils.MarshalJSON(e, "", false)
}

func (e *Escalation) UnmarshalJSON(data []byte) error {
if err := utils.UnmarshalJSON(data, e, "", false, nil); err != nil {
return err
}
return nil
}

func (e *Escalation) GetCancelTicket() *CancelTicket {
if e == nil {
return nil
Expand Down
4 changes: 1 addition & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ github.com/conductorone/baton-sdk/pb/c1/config/v1
github.com/conductorone/baton-sdk/pb/c1/connector/v2
github.com/conductorone/baton-sdk/pkg/crypto/providers
github.com/conductorone/baton-sdk/pkg/crypto/providers/jwk
# github.com/conductorone/conductorone-sdk-go v1.27.1
# github.com/conductorone/conductorone-sdk-go v1.27.2-0.20260113184555-c2a4cbf81d4c
## explicit; go 1.21
github.com/conductorone/conductorone-sdk-go
github.com/conductorone/conductorone-sdk-go/internal/config
Expand All @@ -45,8 +45,6 @@ github.com/containerd/console
# github.com/envoyproxy/protoc-gen-validate v1.2.1
## explicit; go 1.21.1
github.com/envoyproxy/protoc-gen-validate/validate
# github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731
## explicit; go 1.16
# github.com/fsnotify/fsnotify v1.9.0
## explicit; go 1.17
github.com/fsnotify/fsnotify
Expand Down
Loading