Skip to content

Commit 56da793

Browse files
author
Edvin N
authored
Upgrade to go 1.18 (#49)
* upgrade to 1.18 and upgrade dependcies * upgrade CI versions and Dockerfile
1 parent e6079e7 commit 56da793

File tree

6 files changed

+402
-56
lines changed

6 files changed

+402
-56
lines changed

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
restore-keys: |
2121
${{ runner.os }}-go-
2222
- name: Setup Go
23-
uses: actions/setup-go@v2
23+
uses: actions/setup-go@v3
2424
with:
25-
go-version: 1.16.x
25+
go-version: 1.18.x
2626
- name: Setup Kubernetes
2727
uses: engineerd/setup-kind@v0.5.0
2828
with:

.github/workflows/go.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Setup go
15-
uses: actions/setup-go@v1
15+
uses: actions/setup-go@v3
1616
with:
17-
go-version: 1.16
17+
go-version: 1.18
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v2.5.2
2020
with:
21-
version: v1.39
21+
version: v1.46.2
2222
test:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v2
2626
- name: Setup go
27-
uses: actions/setup-go@v1
27+
uses: actions/setup-go@v3
2828
with:
29-
go-version: 1.16
29+
go-version: 1.18
3030
- run: make test

.golangci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ linters-settings:
4343
locale: US
4444

4545
unused:
46-
go: "1.16"
46+
go: "1.18"
4747

4848
unparam:
4949
check-exported: true
@@ -52,8 +52,8 @@ linters-settings:
5252
check-shadowing: false
5353

5454
gosimple:
55-
go: "1.16"
56-
checks: [ "all" ]
55+
go: "1.18"
56+
checks: ["all"]
5757

5858
errorlint:
5959
errorf: true
@@ -119,7 +119,7 @@ linters-settings:
119119
sizeThreshold: 32
120120
skipTestFuncs: true
121121
ruleguard:
122-
rules: ''
122+
rules: ""
123123
truncateCmp:
124124
skipArchDependent: true
125125
underef:
@@ -161,8 +161,8 @@ linters-settings:
161161
require-specific: true
162162

163163
staticcheck:
164-
go: "1.16"
165-
checks: [ "all" ]
164+
go: "1.18"
165+
checks: ["all"]
166166

167167
thelper:
168168
test:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17 as builder
1+
FROM golang:1.18 as builder
22
RUN mkdir /build
33
ADD . /build/
44
WORKDIR /build

go.mod

Lines changed: 55 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,85 @@
11
module github.com/xenitab/git-auth-proxy
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/bradleyfalzon/ghinstallation/v2 v2.0.3
7-
github.com/cristalhq/aconfig v0.16.6
8-
github.com/go-logr/logr v0.4.0
9-
github.com/go-logr/zapr v0.4.0
10-
github.com/go-playground/validator/v10 v10.9.0
6+
github.com/bradleyfalzon/ghinstallation/v2 v2.0.4
7+
github.com/cristalhq/aconfig v0.17.0
8+
github.com/go-logr/logr v1.2.3
9+
github.com/go-logr/zapr v1.2.3
10+
github.com/go-playground/validator/v10 v10.11.0
1111
github.com/gorilla/mux v1.8.0
12-
github.com/imdario/mergo v0.3.10 // indirect
12+
github.com/imdario/mergo v0.3.13 // indirect
1313
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
14-
github.com/prometheus/client_golang v1.11.0
15-
github.com/slok/go-http-metrics v0.9.0
16-
github.com/spf13/afero v1.6.0
14+
github.com/prometheus/client_golang v1.12.2
15+
github.com/slok/go-http-metrics v0.10.0
16+
github.com/spf13/afero v1.8.2
1717
github.com/stretchr/testify v1.7.0
18-
go.uber.org/zap v1.18.1
19-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
20-
k8s.io/api v0.22.2
21-
k8s.io/apimachinery v0.22.2
22-
k8s.io/client-go v0.22.2
18+
go.uber.org/zap v1.21.0
19+
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
20+
k8s.io/api v0.24.2
21+
k8s.io/apimachinery v0.24.2
22+
k8s.io/client-go v0.24.2
2323
)
2424

2525
require (
26+
github.com/PuerkitoBio/purell v1.1.1 // indirect
27+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2628
github.com/beorn7/perks v1.0.1 // indirect
27-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2830
github.com/davecgh/go-spew v1.1.1 // indirect
29-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
31+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
32+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
33+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
34+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
35+
github.com/go-openapi/jsonreference v0.20.0 // indirect
36+
github.com/go-openapi/swag v0.21.1 // indirect
3037
github.com/go-playground/locales v0.14.0 // indirect
3138
github.com/go-playground/universal-translator v0.18.0 // indirect
3239
github.com/gogo/protobuf v1.3.2 // indirect
33-
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
40+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
3441
github.com/golang/protobuf v1.5.2 // indirect
35-
github.com/google/go-cmp v0.5.6 // indirect
36-
github.com/google/go-github/v39 v39.0.0 // indirect
42+
github.com/google/gnostic v0.6.9 // indirect
43+
github.com/google/go-cmp v0.5.8 // indirect
44+
github.com/google/go-github/v39 v39.2.0 // indirect
45+
github.com/google/go-github/v41 v41.0.0 // indirect
3746
github.com/google/go-querystring v1.1.0 // indirect
38-
github.com/google/gofuzz v1.1.0 // indirect
47+
github.com/google/gofuzz v1.2.0 // indirect
3948
github.com/googleapis/gnostic v0.5.5 // indirect
40-
github.com/json-iterator/go v1.1.11 // indirect
49+
github.com/josharian/intern v1.0.0 // indirect
50+
github.com/json-iterator/go v1.1.12 // indirect
4151
github.com/leodido/go-urn v1.2.1 // indirect
52+
github.com/mailru/easyjson v0.7.7 // indirect
4253
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
43-
github.com/modern-go/reflect2 v1.0.1 // indirect
54+
github.com/modern-go/reflect2 v1.0.2 // indirect
55+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4456
github.com/onsi/ginkgo v1.14.1 // indirect
45-
github.com/onsi/gomega v1.10.2 // indirect
57+
github.com/onsi/gomega v1.19.0 // indirect
4658
github.com/pkg/errors v0.9.1 // indirect
4759
github.com/pmezard/go-difflib v1.0.0 // indirect
4860
github.com/prometheus/client_model v0.2.0 // indirect
49-
github.com/prometheus/common v0.26.0 // indirect
50-
github.com/prometheus/procfs v0.6.0 // indirect
61+
github.com/prometheus/common v0.35.0 // indirect
62+
github.com/prometheus/procfs v0.7.3 // indirect
5163
github.com/spf13/pflag v1.0.5 // indirect
5264
github.com/stretchr/objx v0.2.0 // indirect
53-
go.uber.org/atomic v1.7.0 // indirect
54-
go.uber.org/multierr v1.6.0 // indirect
55-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
56-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
57-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
58-
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
59-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
60-
golang.org/x/text v0.3.6 // indirect
61-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
65+
go.uber.org/atomic v1.9.0 // indirect
66+
go.uber.org/multierr v1.8.0 // indirect
67+
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
68+
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
69+
golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 // indirect
70+
golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
71+
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
72+
golang.org/x/text v0.3.7 // indirect
73+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
6274
google.golang.org/appengine v1.6.7 // indirect
63-
google.golang.org/protobuf v1.26.0 // indirect
75+
google.golang.org/protobuf v1.28.0 // indirect
6476
gopkg.in/inf.v0 v0.9.1 // indirect
6577
gopkg.in/yaml.v2 v2.4.0 // indirect
66-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
67-
k8s.io/klog/v2 v2.9.0 // indirect
68-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
69-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
70-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
71-
sigs.k8s.io/yaml v1.2.0 // indirect
78+
gopkg.in/yaml.v3 v3.0.1 // indirect
79+
k8s.io/klog/v2 v2.70.0 // indirect
80+
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
81+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
82+
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
83+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
84+
sigs.k8s.io/yaml v1.3.0 // indirect
7285
)

0 commit comments

Comments
 (0)