diff --git a/go.mod b/go.mod index c86cc18..cf64700 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,8 @@ go 1.22.0 toolchain go1.22.3 require ( - github.com/conductorone/baton-sdk v0.2.41 + github.com/conductorone/baton-sdk v0.2.42 + github.com/deckarep/golang-set/v2 v2.6.0 github.com/go-ldap/ldap/v3 v3.4.8 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/jackc/puddle/v2 v2.2.2 @@ -13,7 +14,6 @@ require ( github.com/testcontainers/testcontainers-go/modules/openldap v0.33.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c - google.golang.org/protobuf v1.35.1 ) require ( @@ -27,7 +27,6 @@ require ( github.com/containerd/platforms v0.2.1 // indirect github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/deckarep/golang-set/v2 v2.6.0 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/docker v27.1.1+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect @@ -53,6 +52,7 @@ require ( go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect go.opentelemetry.io/otel/trace v1.31.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect ) require ( diff --git a/go.sum b/go.sum index 2b51f6f..d548755 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY 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.2.41 h1:JvEDbiLozo6GaikyUycKTPKkpqhIDFlMD/122oDlrDg= -github.com/conductorone/baton-sdk v0.2.41/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc= +github.com/conductorone/baton-sdk v0.2.42 h1:xgtQgLfO/FvLTvQFAenssG7TQbLEXED4y0AJZXHzG1Q= +github.com/conductorone/baton-sdk v0.2.42/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc= github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao= github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go b/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go index 7309ce1..ed4e6dc 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go @@ -1,3 +1,3 @@ package sdk -const Version = "v0.2.40" +const Version = "v0.2.41" diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/types/ticket/custom_fields.go b/vendor/github.com/conductorone/baton-sdk/pkg/types/ticket/custom_fields.go index 6a54a82..fd3d6b9 100644 --- a/vendor/github.com/conductorone/baton-sdk/pkg/types/ticket/custom_fields.go +++ b/vendor/github.com/conductorone/baton-sdk/pkg/types/ticket/custom_fields.go @@ -276,7 +276,7 @@ func GetCustomFieldValue(field *v2.TicketCustomField) (interface{}, error) { case *v2.TicketCustomField_PickMultipleObjectValues: objVals := v.PickMultipleObjectValues.GetValues() if len(objVals) == 0 { - return objVals, nil + return nil, nil } return objVals, nil @@ -337,7 +337,7 @@ func GetDefaultCustomFieldValue(field *v2.TicketCustomField) (interface{}, error case *v2.TicketCustomField_PickMultipleObjectValues: objVals := v.PickMultipleObjectValues.GetDefaultValues() if len(objVals) == 0 { - return objVals, nil + return nil, nil } return objVals, nil diff --git a/vendor/modules.txt b/vendor/modules.txt index c98753e..77cf439 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -166,7 +166,7 @@ github.com/benbjohnson/clock # github.com/cenkalti/backoff/v4 v4.2.1 ## explicit; go 1.18 github.com/cenkalti/backoff/v4 -# github.com/conductorone/baton-sdk v0.2.41 +# github.com/conductorone/baton-sdk v0.2.42 ## explicit; go 1.21 github.com/conductorone/baton-sdk/internal/connector github.com/conductorone/baton-sdk/pb/c1/c1z/v1