Skip to content

Commit 331b2c1

Browse files
authored
Upgrade baton-sdk. Upgrade github actions. Fix goreleaser. (#52)
* Upgrade baton-sdk to v0.2.61. * Upgrade github actions. Fix goreleaser.
1 parent 1be473b commit 331b2c1

Some content is hidden

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

101 files changed

+10293
-2808
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Install Go
8-
uses: actions/setup-go@v4
8+
uses: actions/setup-go@v5
99
with:
10-
go-version: 1.21.x
10+
go-version: 1.22.x
1111
- name: Checkout code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Run linters
1414
uses: golangci/golangci-lint-action@v3
1515
with:
@@ -18,17 +18,17 @@ jobs:
1818
go-test:
1919
strategy:
2020
matrix:
21-
go-version: [1.21.x]
21+
go-version: [1.22.x]
2222
platform: [ubuntu-latest]
2323
runs-on: ${{ matrix.platform }}
2424
steps:
2525
- name: Install Go
2626
if: success()
27-
uses: actions/setup-go@v4
27+
uses: actions/setup-go@v5
2828
with:
2929
go-version: ${{ matrix.go-version }}
3030
- name: Checkout code
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
- name: go tests
3333
run: go test -v -covermode=count -json ./... > test.json
3434
- name: annotate go tests
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
4444
- name: Setup
4545
uses: bufbuild/buf-setup-action@v1
4646
with:

.github/workflows/main.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Install Go
11-
uses: actions/setup-go@v4
11+
uses: actions/setup-go@v5
1212
with:
1313
go-version: 1.22.x
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Run linters
1717
uses: golangci/golangci-lint-action@v3
1818
with:
@@ -27,11 +27,11 @@ jobs:
2727
steps:
2828
- name: Install Go
2929
if: success()
30-
uses: actions/setup-go@v4
30+
uses: actions/setup-go@v5
3131
with:
3232
go-version: ${{ matrix.go-version }}
3333
- name: Checkout code
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535
- name: go tests
3636
run: go test -v -covermode=count -json ./... > test.json
3737
- name: annotate go tests

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: macos-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Set up Go
17-
uses: actions/setup-go@v4
17+
uses: actions/setup-go@v5
1818
with:
1919
go-version: 1.22.x
2020
- name: Set up Gon
@@ -37,11 +37,11 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@v2
40+
uses: actions/checkout@v4
4141
with:
4242
fetch-depth: 0
4343
- name: Set up Go
44-
uses: actions/setup-go@v4
44+
uses: actions/setup-go@v5
4545
with:
4646
go-version: 1.22.x
4747
- name: Docker Login

.gon-arm64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"source": ["./dist/macos-arm64_darwin_arm64/baton"],
2+
"source": ["./dist/macos-arm64_darwin_arm64_v8.0/baton"],
33
"bundle_id": "com.conductorone.baton",
44
"apple_id": {
55
"username" : "[email protected]"

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ builds:
4545
hooks:
4646
post:
4747
- gon .gon-arm64.json
48-
- mv dist/baton-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64/baton
48+
- mv dist/baton-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64_v8.0/baton
4949
archives:
5050
- id: linux-archive
5151
builds:

go.mod

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/conductorone/baton
22

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.23.4
46

57
require (
6-
github.com/conductorone/baton-sdk v0.2.41
8+
github.com/conductorone/baton-sdk v0.2.61
79
github.com/envoyproxy/protoc-gen-validate v1.1.0
810
github.com/gin-gonic/contrib v0.0.0-20240508051311-c1c6bf0061b0
911
github.com/gin-gonic/gin v1.10.0
@@ -20,7 +22,6 @@ require (
2022
atomicgo.dev/cursor v0.2.0 // indirect
2123
atomicgo.dev/keyboard v0.2.9 // indirect
2224
atomicgo.dev/schedule v0.1.0 // indirect
23-
github.com/allegro/bigcache/v3 v3.1.0 // indirect
2425
github.com/aws/aws-sdk-go-v2 v1.32.2 // indirect
2526
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
2627
github.com/aws/aws-sdk-go-v2/config v1.27.43 // indirect
@@ -46,9 +47,11 @@ require (
4647
github.com/cloudwego/base64x v0.1.4 // indirect
4748
github.com/cloudwego/iasm v0.2.0 // indirect
4849
github.com/containerd/console v1.0.4 // indirect
50+
github.com/dolthub/maphash v0.1.0 // indirect
4951
github.com/doug-martin/goqu/v9 v9.19.0 // indirect
5052
github.com/dustin/go-humanize v1.0.1 // indirect
5153
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
54+
github.com/gammazero/deque v0.2.1 // indirect
5255
github.com/gin-contrib/sse v0.1.0 // indirect
5356
github.com/glebarez/go-sqlite v1.22.0 // indirect
5457
github.com/go-playground/locales v0.14.1 // indirect
@@ -66,6 +69,7 @@ require (
6669
github.com/lithammer/fuzzysearch v1.1.8 // indirect
6770
github.com/mattn/go-isatty v0.0.20 // indirect
6871
github.com/mattn/go-runewidth v0.0.16 // indirect
72+
github.com/maypok86/otter v1.2.4 // indirect
6973
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7074
github.com/modern-go/reflect2 v1.0.2 // indirect
7175
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect

go.sum

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ github.com/MarvinJWendt/testza v0.3.0/go.mod h1:eFcL4I0idjtIx8P9C6KkAuLgATNKpX4/
1919
github.com/MarvinJWendt/testza v0.4.2/go.mod h1:mSdhXiKH8sg/gQehJ63bINcCKp7RtYewEjXsvsVUPbE=
2020
github.com/MarvinJWendt/testza v0.5.2 h1:53KDo64C1z/h/d/stCYCPY69bt/OSwjq5KpFNwi+zB4=
2121
github.com/MarvinJWendt/testza v0.5.2/go.mod h1:xu53QFE5sCdjtMCKk8YMQ2MnymimEctc4n3EjyIYvEY=
22-
github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk=
23-
github.com/allegro/bigcache/v3 v3.1.0/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I=
2422
github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
2523
github.com/aws/aws-sdk-go-v2 v1.32.2 h1:AkNLZEyYMLnx/Q/mSKkcMqwNFXMAvFto9bNsHqcTduI=
2624
github.com/aws/aws-sdk-go-v2 v1.32.2/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
@@ -75,8 +73,8 @@ github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJ
7573
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
7674
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
7775
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
78-
github.com/conductorone/baton-sdk v0.2.41 h1:JvEDbiLozo6GaikyUycKTPKkpqhIDFlMD/122oDlrDg=
79-
github.com/conductorone/baton-sdk v0.2.41/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc=
76+
github.com/conductorone/baton-sdk v0.2.61 h1:WtpCQK+bstIqc3s35Sl86SMFauRUN2ubrWt0ReE1xjo=
77+
github.com/conductorone/baton-sdk v0.2.61/go.mod h1:s8Cj7lufoHVNz4cFM6etem0yjJgorl42jMhHrfM2sFA=
8078
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
8179
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
8280
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
@@ -86,6 +84,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
8684
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
8785
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8886
github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
87+
github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ=
88+
github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
8989
github.com/doug-martin/goqu/v9 v9.19.0 h1:PD7t1X3tRcUiSdc5TEyOFKujZA5gs3VSA7wxSvBx7qo=
9090
github.com/doug-martin/goqu/v9 v9.19.0/go.mod h1:nf0Wc2/hV3gYK9LiyqIrzBEVGlI8qW3GuDCEobC4wBQ=
9191
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -98,6 +98,8 @@ github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6
9898
github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
9999
github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
100100
github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
101+
github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0=
102+
github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU=
101103
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
102104
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
103105
github.com/gin-gonic/contrib v0.0.0-20240508051311-c1c6bf0061b0 h1:EUFmvQ8ffefnSAmaUZd9HZYZSw9w/bFjp3FiNaJ5WmE=
@@ -176,8 +178,11 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
176178
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
177179
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
178180
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
179-
github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
180181
github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
182+
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
183+
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
184+
github.com/maypok86/otter v1.2.4 h1:HhW1Pq6VdJkmWwcZZq19BlEQkHtI8xgsQzBVXJU0nfc=
185+
github.com/maypok86/otter v1.2.4/go.mod h1:mKLfoI7v1HOmQMwFgX4QkRk23mX6ge3RDvjdHOWG4R4=
181186
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
182187
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
183188
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

vendor/github.com/allegro/bigcache/v3/.codecov.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

vendor/github.com/allegro/bigcache/v3/.gitignore

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)