diff --git a/ci/build.yml b/ci/build.yml index 611ccf8..421b76c 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -6,7 +6,7 @@ image_resource: type: docker-image source: repository: golang - tag: 1.23.2-bullseye + tag: 1.24.1-bullseye inputs: - name: dp-cli diff --git a/ci/lint.yml b/ci/lint.yml index e03b71f..7af0022 100644 --- a/ci/lint.yml +++ b/ci/lint.yml @@ -5,8 +5,8 @@ platform: linux image_resource: type: docker-image source: - repository: golangci/golangci-lint - tag: v1.57.1 + repository: golang + tag: 1.24.1-bullseye inputs: - name: dp-cli diff --git a/ci/scripts/lint.sh b/ci/scripts/lint.sh index 76fc420..4329a13 100755 --- a/ci/scripts/lint.sh +++ b/ci/scripts/lint.sh @@ -1,6 +1,7 @@ #!/bin/bash -eux +go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.6 + pushd dp-cli - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2 make lint popd diff --git a/ci/unit.yml b/ci/unit.yml index a63cc34..5ea8e7f 100644 --- a/ci/unit.yml +++ b/ci/unit.yml @@ -6,7 +6,7 @@ image_resource: type: docker-image source: repository: golang - tag: 1.23.2-bullseye + tag: 1.24.1-bullseye inputs: - name: dp-cli diff --git a/go.mod b/go.mod index 8e0aaa6..386238e 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,24 @@ module github.com/ONSdigital/dp-cli -go 1.23 +go 1.24 require ( github.com/ONSdigital/log.go/v2 v2.4.3 - github.com/aws/aws-sdk-go v1.55.5 + github.com/aws/aws-sdk-go v1.55.6 github.com/fatih/color v1.18.0 github.com/google/go-github/v66 v66.0.0 github.com/johnnadratowski/golang-neo4j-bolt-driver v0.0.0-20200323142034-807201386efa github.com/pkg/errors v0.9.1 github.com/smartystreets/goconvey v1.8.1 - github.com/spf13/cobra v1.8.1 - golang.org/x/oauth2 v0.23.0 + github.com/spf13/cobra v1.9.1 + golang.org/x/oauth2 v0.28.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/ONSdigital/dp-api-clients-go/v2 v2.263.0 // indirect - github.com/ONSdigital/dp-net/v2 v2.12.0 // indirect + github.com/ONSdigital/dp-net/v2 v2.22.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/google/go-querystring v1.1.0 // indirect @@ -27,14 +27,13 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/kr/text v0.2.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/smarty/assertions v1.16.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/otel v1.31.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect - golang.org/x/sys v0.29.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + github.com/spf13/pflag v1.0.6 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect + golang.org/x/sys v0.31.0 // indirect ) diff --git a/go.sum b/go.sum index 86238be..69cdf92 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,12 @@ -github.com/ONSdigital/dp-api-clients-go/v2 v2.262.1 h1:OxkMJqyWdJ39wJ1d8KQZP+uApI9NhYQ111lXp4t/o70= -github.com/ONSdigital/dp-api-clients-go/v2 v2.262.1/go.mod h1:+4jW6BFCJwldSIwNVcclrTVrFVlx0D3e3C3CzUMvsuA= github.com/ONSdigital/dp-api-clients-go/v2 v2.263.0 h1:vIAhsWAck+wRB8nGzyqQGQUxZvMHwGej/BTLYl2kR6k= github.com/ONSdigital/dp-api-clients-go/v2 v2.263.0/go.mod h1:CBojolwIGblIxhVOxO9u7T5YXd0i8usNufPhcvqwwLs= -github.com/ONSdigital/dp-net/v2 v2.12.0 h1:eV/kVVHXRZP0Ad9r42a9YcTce/zGezixWKFz8qmjrUs= -github.com/ONSdigital/dp-net/v2 v2.12.0/go.mod h1:QKnUJ0ih9Xii2MEPM25a01btDl3J+UTOOHbkSj93Sko= +github.com/ONSdigital/dp-net/v2 v2.22.0 h1:LY9C5x1+sfK9QyjNpB2G3TPvAtSuOFR9FRcXsR9twqs= +github.com/ONSdigital/dp-net/v2 v2.22.0/go.mod h1:F6yL3jjuVwBLVMFIKgHF3zhMRbmZysAxBiu+aIAi3Z0= github.com/ONSdigital/log.go/v2 v2.4.3 h1:zTW5ZV3+ytqypS7opcDkjBP+k45I+XoTuP/IPlm5oUg= github.com/ONSdigital/log.go/v2 v2.4.3/go.mod h1:2TiXCcEsIlDBH9f+4D0NybZPecobd++dphJv2GqVDb0= -github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= -github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= +github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -41,45 +38,45 @@ github.com/johnnadratowski/golang-neo4j-bolt-driver v0.0.0-20200323142034-807201 github.com/johnnadratowski/golang-neo4j-bolt-driver v0.0.0-20200323142034-807201386efa/go.mod h1:xwUw3ZE1/D9drQgpluhRs4peTMKm1tQEZ4p7DrpyqwE= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/smarty/assertions v1.16.0 h1:EvHNkdRA4QHMrn75NZSoUQ/mAUXAYWfatfB01yTCzfY= github.com/smarty/assertions v1.16.0/go.mod h1:duaaFdCS0K9dnoM50iyek/eYINOZ64gbh1Xlf6LG7AI= github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= -github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= -github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= -golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= -golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc= +golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/project_generation/content/templates/api/.golangci.yml.tmpl b/project_generation/content/templates/api/.golangci.yml.tmpl index 9f987e7..14ff5cc 100644 --- a/project_generation/content/templates/api/.golangci.yml.tmpl +++ b/project_generation/content/templates/api/.golangci.yml.tmpl @@ -1,7 +1,7 @@ # This file was inspired by the golangci-lint one: # https://github.com/golangci/golangci-lint/blob/master/.golangci.yml run: - # default concurrency is a available CPU number + # number of operating system threads that can execute golangci-lint simultaneously concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m diff --git a/project_generation/content/templates/base-app/.golangci.yml.tmpl b/project_generation/content/templates/base-app/.golangci.yml.tmpl index 0fd0683..45cefa8 100644 --- a/project_generation/content/templates/base-app/.golangci.yml.tmpl +++ b/project_generation/content/templates/base-app/.golangci.yml.tmpl @@ -1,7 +1,7 @@ # This file was inspired by the golangci-lint one: # https://github.com/golangci/golangci-lint/blob/master/.golangci.yml run: - # default concurrency is a available CPU number + # number of operating system threads that can execute golangci-lint simultaneously concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m diff --git a/project_generation/content/templates/base-app/ci/scripts/lint.sh.tmpl b/project_generation/content/templates/base-app/ci/scripts/lint.sh.tmpl index f4938ec..94365c9 100644 --- a/project_generation/content/templates/base-app/ci/scripts/lint.sh.tmpl +++ b/project_generation/content/templates/base-app/ci/scripts/lint.sh.tmpl @@ -1,6 +1,6 @@ #!/bin/bash -eux -go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 +go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.6 pushd {{.Name}} make lint diff --git a/project_generation/content/templates/controller/.golangci.yml.tmpl b/project_generation/content/templates/controller/.golangci.yml.tmpl index 5ae3ae3..c995da7 100644 --- a/project_generation/content/templates/controller/.golangci.yml.tmpl +++ b/project_generation/content/templates/controller/.golangci.yml.tmpl @@ -1,7 +1,7 @@ # This file was inspired by the golangci-lint one: # https://github.com/golangci/golangci-lint/blob/master/.golangci.yml run: - # default concurrency is a available CPU number + # number of operating system threads that can execute golangci-lint simultaneously concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m diff --git a/project_generation/content/templates/event/.golangci.yml.tmpl b/project_generation/content/templates/event/.golangci.yml.tmpl index 9a032d3..7e2c387 100644 --- a/project_generation/content/templates/event/.golangci.yml.tmpl +++ b/project_generation/content/templates/event/.golangci.yml.tmpl @@ -1,7 +1,7 @@ # This file was inspired by the golangci-lint one: # https://github.com/golangci/golangci-lint/blob/master/.golangci.yml run: - # default concurrency is a available CPU number + # number of operating system threads that can execute golangci-lint simultaneously concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m diff --git a/project_generation/content/templates/library/go/.golangci.yml.tmpl b/project_generation/content/templates/library/go/.golangci.yml.tmpl index 9a032d3..7e2c387 100644 --- a/project_generation/content/templates/library/go/.golangci.yml.tmpl +++ b/project_generation/content/templates/library/go/.golangci.yml.tmpl @@ -1,7 +1,7 @@ # This file was inspired by the golangci-lint one: # https://github.com/golangci/golangci-lint/blob/master/.golangci.yml run: - # default concurrency is a available CPU number + # number of operating system threads that can execute golangci-lint simultaneously concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m diff --git a/project_generation/content/templates/library/go/ci/scripts/lint.sh.tmpl b/project_generation/content/templates/library/go/ci/scripts/lint.sh.tmpl index f4938ec..94365c9 100644 --- a/project_generation/content/templates/library/go/ci/scripts/lint.sh.tmpl +++ b/project_generation/content/templates/library/go/ci/scripts/lint.sh.tmpl @@ -1,6 +1,6 @@ #!/bin/bash -eux -go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 +go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.6 pushd {{.Name}} make lint