Skip to content

Commit e8468e0

Browse files
authored
feat: require go 1.18 (#1262)
1 parent 60455ae commit e8468e0

File tree

4 files changed

+51
-13
lines changed

4 files changed

+51
-13
lines changed

.github/workflows/coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Go
2323
uses: actions/setup-go@v3
2424
with:
25-
go-version: "1.17"
25+
go-version: "1.18"
2626

2727
- name: Checkout base branch
2828
uses: actions/checkout@v3

.github/workflows/lint.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
# limitations under the License.
1414

1515
name: lint
16-
on:
16+
on:
1717
pull_request:
1818
pull_request_target:
1919
types: [labeled]
2020

2121
jobs:
22-
lint:
22+
lint:
2323
if: "${{ github.event.action != 'labeled' || github.event.label.name == 'tests: run' }}"
2424
name: run lint
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Setup Go
2828
uses: actions/setup-go@v3
2929
with:
30-
go-version: '1.16'
30+
go-version: '1.18'
3131
- name: Install goimports
32-
run: go get golang.org/x/tools/cmd/goimports
32+
run: go install golang.org/x/tools/cmd/goimports@latest
3333
- name: Checkout code
3434
uses: actions/checkout@v3
3535
with:

go.mod

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/cloudsql-proxy/v2
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
cloud.google.com/go/cloudsqlconn v0.4.1-0.20220701163030-bda891776d5d
@@ -18,10 +18,54 @@ require (
1818
github.com/spf13/cobra v1.2.1
1919
go.opencensus.io v0.23.0
2020
go.uber.org/zap v1.21.0
21-
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
2221
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e
2322
golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
2423
golang.org/x/sys v0.0.0-20220624220833-87e55d714810
2524
golang.org/x/time v0.0.0-20220609170525-579cf78fd858
2625
google.golang.org/api v0.87.0
2726
)
27+
28+
require (
29+
cloud.google.com/go/monitoring v1.1.0 // indirect
30+
cloud.google.com/go/trace v1.0.0 // indirect
31+
github.com/aws/aws-sdk-go v1.43.31 // indirect
32+
github.com/beorn7/perks v1.0.1 // indirect
33+
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
34+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
35+
github.com/go-kit/log v0.2.0 // indirect
36+
github.com/go-logfmt/logfmt v0.5.1 // indirect
37+
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
38+
github.com/golang-sql/sqlexp v0.1.0 // indirect
39+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
40+
github.com/golang/protobuf v1.5.2 // indirect
41+
github.com/google/uuid v1.3.0 // indirect
42+
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
43+
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
44+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
45+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
46+
github.com/jackc/pgconn v1.12.1 // indirect
47+
github.com/jackc/pgio v1.0.0 // indirect
48+
github.com/jackc/pgpassfile v1.0.0 // indirect
49+
github.com/jackc/pgproto3/v2 v2.3.0 // indirect
50+
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
51+
github.com/jackc/pgtype v1.11.0 // indirect
52+
github.com/jmespath/go-jmespath v0.4.0 // indirect
53+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
54+
github.com/prometheus/client_golang v1.12.1 // indirect
55+
github.com/prometheus/client_model v0.2.0 // indirect
56+
github.com/prometheus/common v0.34.0 // indirect
57+
github.com/prometheus/procfs v0.7.3 // indirect
58+
github.com/prometheus/prometheus v0.35.0 // indirect
59+
github.com/prometheus/statsd_exporter v0.21.0 // indirect
60+
github.com/spf13/pflag v1.0.5 // indirect
61+
go.uber.org/atomic v1.9.0 // indirect
62+
go.uber.org/multierr v1.6.0 // indirect
63+
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
64+
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
65+
golang.org/x/text v0.3.7 // indirect
66+
google.golang.org/appengine v1.6.7 // indirect
67+
google.golang.org/genproto v0.0.0-20220630174209-ad1d48641aa7 // indirect
68+
google.golang.org/grpc v1.47.0 // indirect
69+
google.golang.org/protobuf v1.28.0 // indirect
70+
gopkg.in/yaml.v2 v2.4.0 // indirect
71+
)

go.sum

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnd
186186
github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
187187
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
188188
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
189-
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
190189
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
191190
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
192191
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -329,7 +328,6 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
329328
github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
330329
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
331330
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
332-
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
333331
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
334332
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
335333
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
@@ -651,7 +649,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
651649
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
652650
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
653651
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
654-
github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc=
655652
github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok=
656653
github.com/hanwen/go-fuse/v2 v2.1.0 h1:+32ffteETaLYClUj0a3aHjZ1hOPxxaNEHiZiujuDaek=
657654
github.com/hanwen/go-fuse/v2 v2.1.0/go.mod h1:oRyA5eK+pvJyv5otpO/DgccS8y/RvYMaO00GgRLGryc=
@@ -710,7 +707,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
710707
github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
711708
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
712709
github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
713-
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
714710
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
715711
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
716712
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -732,7 +728,6 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
732728
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
733729
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
734730
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
735-
github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
736731
github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
737732
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
738733
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
@@ -1037,7 +1032,6 @@ github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/
10371032
github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8=
10381033
github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ=
10391034
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
1040-
github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4=
10411035
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
10421036
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
10431037
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

0 commit comments

Comments
 (0)