From 926e30f40b375e8681921180c8e035e4bd2c8072 Mon Sep 17 00:00:00 2001 From: mstanbCO Date: Tue, 13 Jan 2026 10:39:25 -0800 Subject: [PATCH 1/3] temp fix for unmarshel issue --- .../pkg/models/shared/escalation.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/escalation.go b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/escalation.go index b5c39599..eec0ab04 100644 --- a/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/escalation.go +++ b/vendor/github.com/conductorone/conductorone-sdk-go/pkg/models/shared/escalation.go @@ -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: @@ -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 From 6ab89fee0de1c939539b68ead6195e7d93ba8288 Mon Sep 17 00:00:00 2001 From: mstanbCO Date: Tue, 13 Jan 2026 10:54:48 -0800 Subject: [PATCH 2/3] Adds a temp fix to the go-sdk --- go.mod | 2 +- go.sum | 2 ++ vendor/modules.txt | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index bd38f72e..5d90cab7 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 0102ada0..27096f59 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ github.com/conductorone/baton-sdk v0.3.17 h1:aJNr4T2xr7rDa4P2nwKEHjJngI5JcNgfBZZ 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= diff --git a/vendor/modules.txt b/vendor/modules.txt index ad61b7fd..c2f146fa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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 @@ -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 From 5f7cdd38322816d8a1a6801b59819fc5ab5e4ace Mon Sep 17 00:00:00 2001 From: mstanbCO Date: Tue, 13 Jan 2026 11:04:07 -0800 Subject: [PATCH 3/3] vendor and tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 27096f59..e210013f 100644 --- a/go.sum +++ b/go.sum @@ -30,8 +30,6 @@ 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=