diff --git a/build/Dockerfile b/build/Dockerfile index 8dda0903e..aa24fdad9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.20 +ARG GO_VERSION=1.22 FROM golang:$GO_VERSION diff --git a/docker-compose.yml b/docker-compose.yml index 9d4ed04e8..e2d1d6f64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: golang: - image: golang:1.20.13-bullseye + image: golang:1.22.3-bullseye volumes: - .:/go/src/github.com/newrelic/nri-flex working_dir: /go/src/github.com/newrelic/nri-flex diff --git a/go.mod b/go.mod index 87208971f..b6b95ca4e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/newrelic/nri-flex -go 1.20 +go 1.22.3 require ( github.com/Knetic/govaluate v3.0.0+incompatible @@ -27,7 +27,7 @@ require ( github.com/sirupsen/logrus v1.9.0 github.com/spf13/afero v1.9.5 github.com/stretchr/testify v1.8.4 - github.com/vertica/vertica-sql-go v1.3.3 + github.com/vertica/vertica-sql-go v1.3.2 go.uber.org/ratelimit v0.2.0 golang.org/x/crypto v0.17.0 golang.org/x/net v0.19.0 diff --git a/go.sum b/go.sum index 45746913d..0d4ed00e6 100644 --- a/go.sum +++ b/go.sum @@ -332,8 +332,6 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/vertica/vertica-sql-go v1.3.2 h1:QclPnkuozQyNl6lbrTdeuFSx2/lcSRZc1XL8zWNSjdA= github.com/vertica/vertica-sql-go v1.3.2/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4= -github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw= -github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/scripts/docker-compose-build.yml b/scripts/docker-compose-build.yml index 0a45031b7..9f3cfc8c5 100644 --- a/scripts/docker-compose-build.yml +++ b/scripts/docker-compose-build.yml @@ -1,7 +1,7 @@ version: "3" services: golang: - image: golang:1.20.13-bullseye + image: golang:1.22.3-bullseye volumes: - ../:/go/src/github.com/newrelic/nri-flex working_dir: /go/src/github.com/newrelic/nri-flex diff --git a/tools/go.mod b/tools/go.mod index d69f95382..605a6f02d 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,11 +1,12 @@ module github.com/newrelic/nri-flex/tools -go 1.20 +go 1.22.3 require ( github.com/AlekSi/gocov-xml v1.1.0 - github.com/axw/gocov v1.0.0 + github.com/axw/gocov v1.1.0 github.com/jandelgado/gcov2lcov v1.0.4 github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481 - gopkg.in/yaml.v2 v2.2.8 // indirect ) + +require gopkg.in/yaml.v2 v2.2.8 // indirect diff --git a/tools/go.sum b/tools/go.sum index 5db3046f7..dbfefbefa 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1,7 +1,9 @@ github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737 h1:JZHBkt0GhM+ARQykshqpI49yaWCHQbJonH3XpDTwMZQ= github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737/go.mod h1:w1KSuh2JgIL3nyRiZijboSUwbbxOrTzWwyWVFUHtXBQ= +github.com/AlekSi/gocov-xml v1.1.0/go.mod h1:g1dRVOCHjKkMtlPfW6BokJ/qxoeZ1uPNAK7A/ii3CUo= github.com/axw/gocov v1.0.0 h1:YsqYR66hUmilVr23tu8USgnJIJvnwh3n7j5zRn7x4LU= github.com/axw/gocov v1.0.0/go.mod h1:LvQpEYiwwIb2nYkXY2fDWhg9/AsYqkhmrCshjlUJECE= +github.com/axw/gocov v1.1.0/go.mod h1:H9G4tivgdN3pYSSVrTFBr6kGDCmAkgbJhtxFzAvgcdw= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/jandelgado/gcov2lcov v1.0.4 h1:ADwQPyNsxguqzznIbfQTENwY9FU88JdXEvpdHR9c48A= @@ -13,6 +15,7 @@ github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -26,3 +29,4 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=