Skip to content

Commit cc58cba

Browse files
authored
chore: build with keyring opt-out tags; bump cli-common to v0.3.2 (#156)
Adopts the standard keyring opt-out build configuration (cli-common working-with-secrets.md §1.10): GOFLAGS in Makefile and CI, explicit flags in goreleaser builds. Excludes the 1Password backends (onepassword-sdk-go incl. the wazero WASM runtime, connect-sdk-go incl. the archived jaeger-client-go) and passage from the binary — 59 packages out of the import graph. cli-common v0.3.2 brings byteness/keyring v1.11.0, which ships the tags. Refs open-cli-collective/cli-common#57
1 parent d61bbc2 commit cc58cba

5 files changed

Lines changed: 25 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ concurrency:
1212
permissions:
1313
contents: read
1414

15+
# Standard keyring opt-out tags (cli-common working-with-secrets.md §1.10).
16+
env:
17+
GOFLAGS: -tags=keyring_no1password,keyring_nopassage
18+
1519
jobs:
1620
build-platform: # OS matrix — NOT a required check
1721
name: build (${{ matrix.os }})

.goreleaser.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ builds:
1717
- id: gro-darwin
1818
main: ./cmd/gro
1919
binary: gro
20+
# Standard keyring opt-out tags (cli-common working-with-secrets.md §1.10).
21+
flags:
22+
- -tags=keyring_no1password,keyring_nopassage
2023
env:
2124
- CGO_ENABLED=1
2225
goos:
@@ -52,6 +55,8 @@ builds:
5255
- id: gro-unix-win
5356
main: ./cmd/gro
5457
binary: gro
58+
flags:
59+
- -tags=keyring_no1password,keyring_nopassage
5560
env:
5661
- CGO_ENABLED=0
5762
goos:

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ LDFLAGS := -ldflags "-s -w \
99

1010
DIST_DIR = dist
1111

12+
# Standard keyring opt-out tags (cli-common working-with-secrets.md §1.10):
13+
# exclude the 1Password and passage backends credstore never exposes.
14+
export GOFLAGS := -tags=keyring_no1password,keyring_nopassage
15+
1216
.PHONY: all build test test-cover test-cover-check test-short lint fmt tidy deps verify check clean release checksums install uninstall
1317

1418
all: build

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ require (
77
github.com/charmbracelet/huh v0.8.0
88
github.com/charmbracelet/lipgloss v1.1.0
99
github.com/muesli/termenv v0.16.0
10-
github.com/open-cli-collective/cli-common v0.2.2
10+
github.com/open-cli-collective/cli-common v0.3.2
1111
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
1212
github.com/spf13/cobra v1.8.0
1313
github.com/yuin/goldmark v1.8.2
1414
golang.org/x/net v0.53.0
1515
golang.org/x/oauth2 v0.34.0
16-
golang.org/x/term v0.43.0
16+
golang.org/x/term v0.44.0
1717
google.golang.org/api v0.262.0
1818
gopkg.in/yaml.v3 v3.0.1
1919
)
@@ -27,7 +27,7 @@ require (
2727
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
2828
github.com/byteness/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
2929
github.com/byteness/go-libsecret v0.0.0-20260108215642-107379d3dee0 // indirect
30-
github.com/byteness/keyring v1.9.3 // indirect
30+
github.com/byteness/keyring v1.11.0 // indirect
3131
github.com/byteness/percent v0.2.2 // indirect
3232
github.com/catppuccin/go v0.3.0 // indirect
3333
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -81,7 +81,7 @@ require (
8181
go.uber.org/atomic v1.11.0 // indirect
8282
golang.org/x/crypto v0.51.0 // indirect
8383
golang.org/x/sync v0.20.0 // indirect
84-
golang.org/x/sys v0.44.0 // indirect
84+
golang.org/x/sys v0.46.0 // indirect
8585
golang.org/x/text v0.37.0 // indirect
8686
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120174246-409b4a993575 // indirect
8787
google.golang.org/grpc v1.78.0 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ github.com/byteness/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:HFl8GFmwK1
2222
github.com/byteness/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:9HlL8SWBRtCZE7sCNq+c3//H/oHywgSwtocmPTdOij8=
2323
github.com/byteness/go-libsecret v0.0.0-20260108215642-107379d3dee0 h1:j59wGsxaBk6aFBuuYofk2oznMGZYyzFovjDqavlJHM8=
2424
github.com/byteness/go-libsecret v0.0.0-20260108215642-107379d3dee0/go.mod h1:3FrDGTXj08zj6qtqlIvt0vS8eWNrrYpnXOEbcQgFmvM=
25-
github.com/byteness/keyring v1.9.3 h1:8ZnsYFdLiyAil2cIttxUVSRbNj5u+UG7AR7jH18tWkE=
26-
github.com/byteness/keyring v1.9.3/go.mod h1:fHz0D2UQARryadc45oHOmgo/v4F7JheVi2Mt/1GpH7Q=
25+
github.com/byteness/keyring v1.11.0 h1:RfMEASvS/pxc/Ulshv7h58f5gzU6TXQ5AuUsvbYdqec=
26+
github.com/byteness/keyring v1.11.0/go.mod h1:eTBEHu0izyjSx+ux8Rdpfrg/2bBco7ENlqEX7+fBP2c=
2727
github.com/byteness/percent v0.2.2 h1:vnIFh8WBR1xoC+U2etz0EMB1cgp+vsK6vynqTCeDziU=
2828
github.com/byteness/percent v0.2.2/go.mod h1:nwavge92FhIyfnldz4YWZD8uxPVvdh8NlzLRd1VYRDs=
2929
github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
@@ -128,8 +128,8 @@ github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3
128128
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
129129
github.com/noamcohen97/touchid-go v0.3.0 h1:fcXxVCizysD7KHRR6hrURt3nyNIs5JBGSbOIidD/3wo=
130130
github.com/noamcohen97/touchid-go v0.3.0/go.mod h1:X9MRNIBGEmPqwpDm1G3fQOAQX7fwBlhzUbnkDTxuta0=
131-
github.com/open-cli-collective/cli-common v0.2.2 h1:m5Uzvw5ya/Xljgn54wuCiVP4zXE9BZKikpQBqrXLCKg=
132-
github.com/open-cli-collective/cli-common v0.2.2/go.mod h1:nXAwJcuAo5+bMUD2soABKDwy2o27snBggS6/OTKQgvQ=
131+
github.com/open-cli-collective/cli-common v0.3.2 h1:jj3swzbzmZE9xALMOzTpCQXPylXDxuxWoSTT96G0Q84=
132+
github.com/open-cli-collective/cli-common v0.3.2/go.mod h1:3AzjCT0V8xgslHlGi1+rUkcV+Vf5wONGwISQkufLZLQ=
133133
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
134134
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
135135
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
@@ -197,10 +197,10 @@ golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
197197
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
198198
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
199199
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
200-
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
201-
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
202-
golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
203-
golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
200+
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
201+
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
202+
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
203+
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
204204
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
205205
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
206206
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=

0 commit comments

Comments
 (0)