Skip to content

Commit d732744

Browse files
fix(stencil): upgrade modules (2025-02-14) (#350)
* build(deps): upgrade github.com/go-git/go-git/v5 from v5.12.0 to v5.13.2 * build(deps): upgrade google.golang.org/protobuf from v1.35.1 to v1.36.5 * build(deps): upgrade github.com/getoutreach/gobox from v1.102.0 to v1.103.1 --------- Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com> Co-authored-by: Mark Lee <[email protected]>
1 parent 1a026d0 commit d732744

19 files changed

+1013
-937
lines changed

.circleci/config.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# syntax, such as anchors, will be fixed automatically.
33
version: 2.1
44
orbs:
5-
shared: getoutreach/shared@dev:2.28.2-rc.2
5+
shared: getoutreach/shared@2.29.0
66
queue: eddiewebb/[email protected]
77
## <<Stencil::Block(CircleCIExtraOrbs)>>
88

@@ -22,6 +22,7 @@ contexts: &contexts
2222
- ghaccesstoken
2323
- docker-registry
2424
- npm-credentials
25+
- box
2526
- vault-dev
2627
- confluence
2728
- circleci-credentials
@@ -45,6 +46,10 @@ test: &test
4546
release_branches: &release_branches
4647
- "main"
4748

49+
## <<Stencil::Block(circleAnchorExtra)>>
50+
51+
## <</Stencil::Block>>
52+
4853
jobs:
4954
{}
5055
## <<Stencil::Block(circleJobs)>>

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ updates:
1010
- dependency-name: github.com/getoutreach/gobox
1111
- dependency-name: github.com/getoutreach/stencil-golang/pkg
1212
- dependency-name: github.com/urfave/cli/v2
13+
- dependency-name: github.com/getoutreach/mint
1314
- dependency-name: github.com/getoutreach/services
1415
- dependency-name: github.com/getoutreach/datastores/v2
15-
- dependency-name: github.com/getoutreach/mint
1616
- dependency-name: github.com/getoutreach/httpx
1717

1818
# Ignore semantic-release, this code is only executed in CI.

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# you are reducing compatibility guarantees.
55
## <<Stencil::Block(toolverOverride)>>
66
## <</Stencil::Block>>
7-
golang 1.22.6
87
protoc 21.5
98
nodejs 20.16.0
109
terraform 1.5.7
10+
golang 1.23.4
1111
# Note: Versions in this block do not override the default versions above
1212
# but sometimes you have to declare additional versions of the same tool
1313
# while leaving the 'default' version intact for the infra.

.vscode/launch.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
// Maps the go module cache on the host to the persistent volume used by devspaces.
3939
// These should be the respective values of `go env GOMODCACHE`.
4040
{
41-
"from": "${env:HOME}/.asdf/installs/golang/1.22.6/packages/pkg/mod",
42-
"to": "/home/dev/.asdf/installs/golang/1.22.6/packages/pkg/mod"
41+
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/packages/pkg/mod",
42+
"to": "/home/dev/.asdf/installs/golang/1.23.4/packages/pkg/mod"
4343
},
4444
{
4545
// Maps the standard library location on the host to the location in the devspace.
4646
// This enables debugging standard library code.
47-
"from": "${env:HOME}/.asdf/installs/golang/1.22.6/go/src",
48-
"to": "/home/dev/.asdf/installs/golang/1.22.6/go/src"
47+
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/go/src",
48+
"to": "/home/dev/.asdf/installs/golang/1.23.4/go/src"
4949
}
5050
]
5151
},

.vscode/settings.json

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"go.alternateTools": {
1313
"golangci-lint": "${workspaceFolder}/.bootstrap/shell/vscode/golang-linters.sh"
1414
},
15+
// This is disabled because it causes version mismatches between the
16+
// tools used/installed by asdf / stencil, and the ones updated by VSCode.
17+
// In particular, this is a problem with newer versions of golangci-lint
18+
// incompatible with older versions of Go.
19+
"go.toolsManagement.autoUpdate": false,
1520
"go.buildTags": "or_dev",
1621
"go.testTags": "or_test,or_int,or_e2e",
1722
"files.trimTrailingWhitespace": true,

cmd/localizer/localizer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Outreach Corporation. All Rights Reserved.
1+
// Copyright 2025 Outreach Corporation. All Rights Reserved.
22

33
// Description: This file is the entrypoint for the localizer CLI
44
// command for localizer.

cortex.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ info:
4545
repo: https://github.com/getoutreach/localizer
4646
framework: stencil
4747
language: Golang
48-
stencil_version: v1.40.0-rc.1
49-
golang_version: 1.22.6
48+
stencil_version: v1.40.1-rc.2
49+
golang_version: 1.23.4
5050
cli: true
5151
service: false
5252
product: Outreach

go.mod

+49-50
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module github.com/getoutreach/localizer
22

3-
go 1.22
3+
go 1.23.0
44

5-
toolchain go1.22.6
5+
toolchain go1.23.4
66

77
require (
88
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
99
github.com/benbjohnson/clock v1.3.5
10-
github.com/davecgh/go-spew v1.1.1
10+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1111
github.com/function61/gokit v0.0.0-20230712092143-d63a51667e64
1212
github.com/google/go-cmp v0.6.0
1313
github.com/google/gofuzz v1.2.0 // indirect
1414
github.com/metal-stack/go-ipam v1.13.0
1515
github.com/pkg/errors v0.9.1
1616
github.com/sirupsen/logrus v1.9.3
17-
github.com/urfave/cli/v2 v2.27.2
18-
golang.org/x/crypto v0.31.0
17+
github.com/urfave/cli/v2 v2.27.4
18+
golang.org/x/crypto v0.33.0
1919
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
2020
google.golang.org/grpc v1.63.2
21-
google.golang.org/protobuf v1.35.1
21+
google.golang.org/protobuf v1.36.5
2222

2323
// kubernetes deps
2424
k8s.io/api v0.25.12
@@ -30,130 +30,129 @@ require (
3030
require (
3131
github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca
3232
github.com/fatih/color v1.18.0
33-
github.com/getoutreach/gobox v1.90.2
33+
github.com/getoutreach/gobox v1.103.1
3434
)
3535

3636
require (
3737
cloud.google.com/go/compute/metadata v0.3.0 // indirect
38-
dario.cat/mergo v1.0.0 // indirect
38+
dario.cat/mergo v1.0.1 // indirect
3939
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
4040
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
4141
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
4242
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
4343
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4444
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
45-
github.com/Microsoft/go-winio v0.6.1 // indirect
46-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
45+
github.com/Microsoft/go-winio v0.6.2 // indirect
46+
github.com/ProtonMail/go-crypto v1.1.5 // indirect
4747
github.com/PuerkitoBio/purell v1.1.1 // indirect
4848
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
49-
github.com/alecthomas/chroma/v2 v2.8.0 // indirect
49+
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
5050
github.com/avast/retry-go/v4 v4.5.1 // indirect
5151
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
5252
github.com/aymerick/douceur v0.2.0 // indirect
5353
github.com/beorn7/perks v1.0.1 // indirect
54-
github.com/briandowns/spinner v1.23.0 // indirect
54+
github.com/briandowns/spinner v1.23.1 // indirect
5555
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
56-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
57-
github.com/charmbracelet/glamour v0.7.0 // indirect
56+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
57+
github.com/charmbracelet/glamour v0.8.0 // indirect
58+
github.com/charmbracelet/lipgloss v0.13.0 // indirect
59+
github.com/charmbracelet/x/ansi v0.1.4 // indirect
5860
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
59-
github.com/cloudflare/circl v1.3.7 // indirect
61+
github.com/cloudflare/circl v1.6.0 // indirect
6062
github.com/coreos/go-semver v0.3.1 // indirect
6163
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6264
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
63-
github.com/creack/pty v1.1.21 // indirect
64-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
65+
github.com/creack/pty v1.1.23 // indirect
66+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
6567
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
66-
github.com/dlclark/regexp2 v1.4.0 // indirect
68+
github.com/dlclark/regexp2 v1.11.0 // indirect
6769
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
6870
github.com/emirpasic/gods v1.18.1 // indirect
6971
github.com/felixge/httpsnoop v1.0.4 // indirect
7072
github.com/fynelabs/selfupdate v0.2.0 // indirect
7173
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
72-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
73-
github.com/go-git/go-git/v5 v5.12.0 // indirect
74-
github.com/go-logr/logr v1.4.1 // indirect
74+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
75+
github.com/go-git/go-git/v5 v5.13.2 // indirect
76+
github.com/go-logr/logr v1.4.2 // indirect
7577
github.com/go-logr/stdr v1.2.2 // indirect
7678
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7779
github.com/go-openapi/jsonreference v0.19.5 // indirect
7880
github.com/go-openapi/swag v0.19.14 // indirect
7981
github.com/gogo/protobuf v1.3.2 // indirect
80-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
82+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
8183
github.com/golang/protobuf v1.5.4 // indirect
8284
github.com/golang/snappy v0.0.4 // indirect
8385
github.com/google/gnostic v0.5.7-v3refs // indirect
8486
github.com/google/go-github/v62 v62.0.0 // indirect
8587
github.com/google/go-querystring v1.1.0 // indirect
8688
github.com/google/uuid v1.6.0 // indirect
87-
github.com/gorilla/css v1.0.0 // indirect
89+
github.com/gorilla/css v1.0.1 // indirect
8890
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
89-
github.com/honeycombio/beeline-go v1.16.0 // indirect
91+
github.com/honeycombio/beeline-go v1.17.0 // indirect
9092
github.com/imdario/mergo v0.3.15 // indirect
9193
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
9294
github.com/jmoiron/sqlx v1.3.5 // indirect
9395
github.com/josharian/intern v1.0.0 // indirect
9496
github.com/json-iterator/go v1.1.12 // indirect
9597
github.com/kevinburke/ssh_config v1.2.0 // indirect
96-
github.com/klauspost/compress v1.17.4 // indirect
98+
github.com/klauspost/compress v1.17.9 // indirect
9799
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
98100
github.com/mailru/easyjson v0.7.7 // indirect
99101
github.com/manifoldco/promptui v0.9.0 // indirect
100102
github.com/mattn/go-colorable v0.1.13 // indirect
101103
github.com/mattn/go-isatty v0.0.20 // indirect
102104
github.com/mattn/go-runewidth v0.0.15 // indirect
103-
github.com/microcosm-cc/bluemonday v1.0.25 // indirect
105+
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
104106
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
105107
github.com/moby/spdystream v0.2.0 // indirect
106108
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
107109
github.com/modern-go/reflect2 v1.0.2 // indirect
108110
github.com/montanaflynn/stats v0.7.1 // indirect
109111
github.com/muesli/reflow v0.3.0 // indirect
110-
github.com/muesli/termenv v0.15.2 // indirect
112+
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a // indirect
111113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
112-
github.com/olekukonko/tablewriter v0.0.5 // indirect
113-
github.com/pjbgf/sha1cd v0.3.0 // indirect
114-
github.com/prometheus/client_golang v1.19.1 // indirect
114+
github.com/pjbgf/sha1cd v0.3.2 // indirect
115+
github.com/prometheus/client_golang v1.20.2 // indirect
115116
github.com/prometheus/client_model v0.6.1 // indirect
116-
github.com/prometheus/common v0.48.0 // indirect
117-
github.com/prometheus/procfs v0.12.0 // indirect
117+
github.com/prometheus/common v0.55.0 // indirect
118+
github.com/prometheus/procfs v0.15.1 // indirect
118119
github.com/redis/go-redis/v9 v9.4.0 // indirect
119120
github.com/rivo/uniseg v0.4.7 // indirect
120121
github.com/russross/blackfriday/v2 v2.1.0 // indirect
121-
github.com/schollz/progressbar/v3 v3.14.2 // indirect
122+
github.com/schollz/progressbar/v3 v3.14.6 // indirect
122123
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
123-
github.com/skeema/knownhosts v1.2.2 // indirect
124+
github.com/skeema/knownhosts v1.3.1 // indirect
124125
github.com/spf13/pflag v1.0.5 // indirect
125126
github.com/ulikunitz/xz v0.5.12 // indirect
126127
github.com/xanzy/ssh-agent v0.3.3 // indirect
127128
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
128129
github.com/xdg-go/scram v1.1.2 // indirect
129130
github.com/xdg-go/stringprep v1.0.4 // indirect
130-
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
131+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
131132
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
132-
github.com/yuin/goldmark v1.5.4 // indirect
133-
github.com/yuin/goldmark-emoji v1.0.2 // indirect
133+
github.com/yuin/goldmark v1.7.4 // indirect
134+
github.com/yuin/goldmark-emoji v1.0.3 // indirect
134135
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
135136
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
136137
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
137138
go.mongodb.org/mongo-driver v1.13.1 // indirect
138139
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
139-
go.opentelemetry.io/otel v1.26.0 // indirect
140+
go.opentelemetry.io/otel v1.29.0 // indirect
140141
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
141142
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
142-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
143-
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
144-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
143+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
144+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
145+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
145146
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
146147
go.uber.org/multierr v1.11.0 // indirect
147148
go.uber.org/zap v1.26.0 // indirect
148149
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
149-
golang.org/x/mod v0.17.0 // indirect
150-
golang.org/x/net v0.25.0 // indirect
151-
golang.org/x/oauth2 v0.20.0 // indirect
152-
golang.org/x/sync v0.10.0 // indirect
153-
golang.org/x/sys v0.28.0 // indirect
154-
golang.org/x/term v0.27.0 // indirect
155-
golang.org/x/text v0.21.0 // indirect
156-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
150+
golang.org/x/net v0.35.0 // indirect
151+
golang.org/x/oauth2 v0.22.0 // indirect
152+
golang.org/x/sync v0.11.0 // indirect
153+
golang.org/x/sys v0.30.0 // indirect
154+
golang.org/x/term v0.29.0 // indirect
155+
golang.org/x/text v0.22.0 // indirect
157156
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
158157
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
159158
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -165,7 +164,7 @@ require (
165164
)
166165

167166
require (
168-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
167+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
169168
github.com/bombsimon/logrusr/v2 v2.0.1
170169
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
171170
github.com/lib/pq v1.10.9 // indirect

0 commit comments

Comments
 (0)