From d843eaf542c44f139e9b0375a237e83b5e636f66 Mon Sep 17 00:00:00 2001 From: Logan Saso Date: Thu, 1 Feb 2024 14:14:58 -0800 Subject: [PATCH 1/2] Update baton SDK --- go.mod | 4 ++-- go.sum | 4 ++-- .../conductorone/baton-sdk/pkg/cli/cli.go | 15 +++++++++++++-- .../pkg/connectorbuilder/connectorbuilder.go | 4 ++++ vendor/modules.txt | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index fd8af0a..ec5b773 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,12 @@ module github.com/conductorone/baton-google-workspace go 1.20 require ( - github.com/conductorone/baton-sdk v0.1.16 + github.com/conductorone/baton-sdk v0.1.18 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/spf13/cobra v1.8.0 go.uber.org/zap v1.26.0 golang.org/x/oauth2 v0.16.0 google.golang.org/api v0.156.0 - google.golang.org/protobuf v1.32.0 ) require ( @@ -93,6 +92,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect google.golang.org/grpc v1.60.1 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 026586c..4b46113 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,8 @@ github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/conductorone/baton-sdk v0.1.16 h1:Pc+c/aNV6B6TDk31qowTXwaeLpvV0HjKXyvQmUlP33U= -github.com/conductorone/baton-sdk v0.1.16/go.mod h1:nh4xiJxOi2pBPCcsIfH8Xp0Xc5Q1BgmnXmGhrn3Spss= +github.com/conductorone/baton-sdk v0.1.18 h1:DVQMgrL8OBgHuOhObt2HuYPnKNn0TNyPCJTdNPlC7aU= +github.com/conductorone/baton-sdk v0.1.18/go.mod h1:nh4xiJxOi2pBPCcsIfH8Xp0Xc5Q1BgmnXmGhrn3Spss= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/cli/cli.go b/vendor/github.com/conductorone/baton-sdk/pkg/cli/cli.go index fb4f326..5b0eb8a 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/cli/cli.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/cli/cli.go @@ -12,6 +12,7 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" "github.com/conductorone/baton-sdk/internal/connector" v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2" @@ -288,7 +289,18 @@ func NewCmd[T any, PtrT *T]( return fmt.Errorf("connector does not support capabilities") } - outBytes, err := protojson.Marshal(md.Metadata.Capabilities) + protoMarshaller := protojson.MarshalOptions{ + Multiline: true, + Indent: " ", + } + + a := &anypb.Any{} + err = anypb.MarshalFrom(a, md.Metadata.Capabilities, proto.MarshalOptions{Deterministic: true}) + if err != nil { + return err + } + + outBytes, err := protoMarshaller.Marshal(a) if err != nil { return err } @@ -332,7 +344,6 @@ func NewCmd[T any, PtrT *T]( cmd.PersistentFlags().String("revoke-grant", "", "The grant to revoke ($BATON_REVOKE_GRANT)") cmd.PersistentFlags().Bool("event-feed", false, "Read feed events to stdout ($BATON_EVENT_FEED)") cmd.MarkFlagsRequiredTogether("grant-entitlement", "grant-principal", "grant-principal-type") - cmd.PersistentFlags().String("revoke-grant", "", "The id of the grant to revoke ($BATON_REVOKE_GRANT)") cmd.PersistentFlags().String("create-account-login", "", "The login of the account to create ($BATON_CREATE_ACCOUNT_LOGIN)") cmd.PersistentFlags().String("create-account-email", "", "The email of the account to create ($BATON_CREATE_ACCOUNT_EMAIL)") diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/connectorbuilder/connectorbuilder.go b/vendor/github.com/conductorone/baton-sdk/pkg/connectorbuilder/connectorbuilder.go index c6decaa..b17586b 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/connectorbuilder/connectorbuilder.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/connectorbuilder/connectorbuilder.go @@ -3,6 +3,7 @@ package connectorbuilder import ( "context" "fmt" + "sort" "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap" "go.uber.org/zap" @@ -265,6 +266,9 @@ func getCapabilities(ctx context.Context, b *builderImpl) *v2.ConnectorCapabilit } resourceTypeCapabilities = append(resourceTypeCapabilities, resourceTypeCapability) } + sort.Slice(resourceTypeCapabilities, func(i, j int) bool { + return resourceTypeCapabilities[i].ResourceType.GetId() < resourceTypeCapabilities[j].ResourceType.GetId() + }) return &v2.ConnectorCapabilities{ResourceTypeCapabilities: resourceTypeCapabilities} } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2b68b27..9ee1902 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -135,7 +135,7 @@ github.com/aws/smithy-go/waiter # github.com/benbjohnson/clock v1.3.5 ## explicit; go 1.15 github.com/benbjohnson/clock -# github.com/conductorone/baton-sdk v0.1.16 +# github.com/conductorone/baton-sdk v0.1.18 ## explicit; go 1.20 github.com/conductorone/baton-sdk/internal/connector github.com/conductorone/baton-sdk/pb/c1/c1z/v1 From a086e83487756faf2dd3cf9b1fa2c08b84946937 Mon Sep 17 00:00:00 2001 From: Logan Saso Date: Thu, 1 Feb 2024 14:16:27 -0800 Subject: [PATCH 2/2] Ran go mod tidy --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ec5b773..8e648e2 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( go.uber.org/zap v1.26.0 golang.org/x/oauth2 v0.16.0 google.golang.org/api v0.156.0 + google.golang.org/protobuf v1.32.0 ) require ( @@ -92,7 +93,6 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect google.golang.org/grpc v1.60.1 // indirect - google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect