Skip to content

Commit 2c7c8c6

Browse files
authored
Merge pull request #120 from ConductorOne/ggreer/upgrade-baton-sdk
Upgrade baton-sdk to v0.3.24.
2 parents 8bf418f + 945d021 commit 2c7c8c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+4979
-523
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.4
55
toolchain go1.24.1
66

77
require (
8-
github.com/conductorone/baton-sdk v0.3.9
8+
github.com/conductorone/baton-sdk v0.3.24
99
github.com/deckarep/golang-set/v2 v2.7.0
1010
github.com/ennyjfrick/ruleguard-logfatal v0.0.2
1111
github.com/go-ldap/ldap/v3 v3.4.8
@@ -76,6 +76,7 @@ require (
7676
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
7777
go.opentelemetry.io/otel/trace v1.35.0 // indirect
7878
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
79+
golang.org/x/term v0.30.0 // indirect
7980
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
8081
google.golang.org/protobuf v1.36.5 // indirect
8182
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
7070
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
7171
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
7272
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
73-
github.com/conductorone/baton-sdk v0.3.9 h1:D0YiYtRkpRByYsctlREqNG9pb5QAU5DW7sBlccAd3tI=
74-
github.com/conductorone/baton-sdk v0.3.9/go.mod h1:lWZHgu025Rsgs5jvBrhilGti0zWF2+YfaFY/bWOS/g0=
73+
github.com/conductorone/baton-sdk v0.3.24 h1:O4ruXt7LKZdaph/pOC5zOp/ddCd4I3idpa5BLFq/3NE=
74+
github.com/conductorone/baton-sdk v0.3.24/go.mod h1:L55WO3ERMx1mfpjDgwK3jWNRGRF2E76WrQHmW6ev8VY=
7575
github.com/conductorone/dpop v0.2.3 h1:s91U3845GHQ6P6FWrdNr2SEOy1ES/jcFs1JtKSl2S+o=
7676
github.com/conductorone/dpop v0.2.3/go.mod h1:gyo8TtzB9SCFCsjsICH4IaLZ7y64CcrDXMOPBwfq/3s=
7777
github.com/conductorone/dpop/integrations/dpop_grpc v0.2.3 h1:kLMCNIh0Mo2vbvvkCmJ3ixsPbXEJ6HPcW53Ku9yje3s=

pkg/config/config.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ var ConfigRelations = []field.SchemaFieldRelationship{
6262
field.FieldsAtLeastOneUsed(domainField, urlField),
6363
}
6464

65-
var Configuration = field.NewConfiguration(ConfigurationFields, ConfigRelations...)
65+
var Configuration = field.NewConfiguration(ConfigurationFields,
66+
field.WithConnectorDisplayName("LDAP"),
67+
field.WithConstraints(ConfigRelations...),
68+
)
6669

6770
func New(ctx context.Context, v *viper.Viper) (*Config, error) {
6871
l := ctxzap.Extract(ctx)

vendor/github.com/conductorone/baton-sdk/pb/c1/config/v1/config.pb.go

Lines changed: 36 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pb/c1/config/v1/config.pb.validate.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pb/c1/connector/v2/annotation_external_ticket.pb.go

Lines changed: 67 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pb/c1/connector/v2/annotation_external_ticket.pb.validate.go

Lines changed: 106 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)