Skip to content

Commit d412484

Browse files
authored
Show new partial sync data. (#63)
* Show new partial sync data. * Upgrade buf version.
1 parent 4233783 commit d412484

Some content is hidden

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

43 files changed

+2437
-1324
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
- name: Setup
4545
uses: bufbuild/buf-setup-action@v1
4646
with:
47-
version: '1.29.0'
47+
version: '1.50.0'
48+
github_token: ${{ secrets.GITHUB_TOKEN }}
4849
- name: Lint
4950
uses: bufbuild/buf-lint-action@v1
5051
- name: Breaking change detection against `main`

.github/workflows/main.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v2
46+
uses: actions/checkout@v4
4747
- name: Setup
4848
uses: bufbuild/buf-setup-action@v1
4949
with:
50-
version: '1.29.0'
50+
version: '1.50.0'
51+
github_token: ${{ secrets.GITHUB_TOKEN }}
5152
- name: Lint
5253
uses: bufbuild/buf-lint-action@v1
5354
- name: Breaking change detection against `main`

buf.gen.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
version: v1
1+
version: v2
22
plugins:
3-
- remote: buf.build/protocolbuffers/plugins/go:v1.28.0-1
3+
- remote: buf.build/protocolbuffers/go:v1.36.4
44
out: pb
55
opt: paths=source_relative
6-
- remote: buf.build/grpc/plugins/go:v1.2.0-1
6+
- remote: buf.build/grpc/go:v1.5.1
77
out: pb
88
opt:
99
- paths=source_relative
1010
- require_unimplemented_servers=false
11-
- remote: buf.build/jirkad/plugins/protoc-gen-validate:v0.6.7
11+
- remote: buf.build/bufbuild/validate-go:v1.2.1
1212
out: pb
13-
opt:
14-
- lang=go
15-
- paths=source_relative
16-
13+
opt: paths=source_relative

cmd/baton/syncs.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ func runSyncList(cmd *cobra.Command, args []string) error {
6767
endTime = timestamppb.New(*sr.EndedAt)
6868
}
6969
syncRuns = append(syncRuns, &v1.SyncOutput{
70-
Id: sr.ID,
71-
StartedAt: startTime,
72-
EndedAt: endTime,
73-
SyncToken: sr.SyncToken,
70+
Id: sr.ID,
71+
StartedAt: startTime,
72+
EndedAt: endTime,
73+
SyncToken: sr.SyncToken,
74+
SyncType: string(sr.Type),
75+
ParentSyncId: sr.ParentSyncID,
7476
})
7577
}
7678

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/conductorone/baton
33
go 1.23.6
44

55
require (
6-
github.com/conductorone/baton-sdk v0.2.94
6+
github.com/conductorone/baton-sdk v0.3.0
77
github.com/envoyproxy/protoc-gen-validate v1.2.1
88
github.com/gin-gonic/contrib v0.0.0-20250113154928-93b827325fec
99
github.com/gin-gonic/gin v1.10.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCy
7272
github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
7373
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
7474
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
75-
github.com/conductorone/baton-sdk v0.2.94 h1:tF8z+Dnu2Q6ro67gYS0JabIi1MIihypo0+RjlWgI5jI=
76-
github.com/conductorone/baton-sdk v0.2.94/go.mod h1:nUgHSAf9P0lfamti5NlOSpeh1t99UNzMjIwf0I7n4/g=
75+
github.com/conductorone/baton-sdk v0.3.0 h1:vUQMR01ivMQ3xBmLmCIg7GY5nbrPUnaBOWZntLx85+s=
76+
github.com/conductorone/baton-sdk v0.3.0/go.mod h1:nUgHSAf9P0lfamti5NlOSpeh1t99UNzMjIwf0I7n4/g=
7777
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
7878
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
7979
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=

0 commit comments

Comments
 (0)