From 2869b10035a6b133b905b16efeb5b1590e8b3f29 Mon Sep 17 00:00:00 2001 From: Gustavo Bazan Date: Tue, 19 Mar 2024 11:08:26 +0000 Subject: [PATCH 1/2] task: add go toolchain --- .github/workflows/code-health.yml | 2 +- .tool-versions | 1 - Makefile | 3 ++- go.mod | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 .tool-versions diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml index 08ac1cf7b0..4072e598fa 100644 --- a/.github/workflows/code-health.yml +++ b/.github/workflows/code-health.yml @@ -19,7 +19,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v4.0.0 with: - version: v1.56.1 + version: v1.56.2 unit-tests: env: COVERAGE: coverage.out diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 6bc74c5191..0000000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -golang 1.22.1 diff --git a/Makefile b/Makefile index 035611d50c..4367934fc8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html -GOLANGCI_VERSION=v1.56.1 +GOLANGCI_VERSION=v1.56.2 COVERAGE=coverage.out MCLI_GIT_SHA?=$(shell git rev-parse HEAD) @@ -28,6 +28,7 @@ export PATH := $(shell go env GOPATH)/bin:$(PATH) export PATH := ./bin:$(PATH) export TERM := linux-m export GO111MODULE := on +export GOTOOLCHAIN := local export ATLAS_E2E_BINARY .PHONY: pre-commit diff --git a/go.mod b/go.mod index b84f53b8ad..1166e842ed 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/mongodb/mongodb-atlas-cli/atlascli go 1.22 +toolchain go1.22.1 + require ( cloud.google.com/go/kms v1.15.8 github.com/AlecAivazis/survey/v2 v2.3.7 From 5dabfb3909bf9600bb9393468152987a5b879520 Mon Sep 17 00:00:00 2001 From: Gustavo Bazan Date: Tue, 19 Mar 2024 12:01:24 +0000 Subject: [PATCH 2/2] test --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1166e842ed..359e79ed33 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/briandowns/spinner v1.23.0 github.com/creack/pty v1.1.21 github.com/denisbrodbeck/machineid v1.0.1 - github.com/evergreen-ci/shrub v0.0.0-20231121224157-600e066f9de6 + github.com/evergreen-ci/shrub v0.0.0-20240215220116-3f233ddeff2a github.com/gemalto/kmip-go v0.0.10 github.com/go-test/deep v1.1.0 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -46,7 +46,7 @@ require ( go.mongodb.org/atlas-sdk/v20231115008 v20231115008.0.0 go.mongodb.org/mongo-driver v1.14.0 golang.org/x/crypto v0.21.0 - golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc + golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 golang.org/x/mod v0.16.0 golang.org/x/tools v0.19.0 google.golang.org/api v0.170.0 diff --git a/go.sum b/go.sum index 76ddcc8cfe..256dac0ffe 100644 --- a/go.sum +++ b/go.sum @@ -122,8 +122,8 @@ github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= -github.com/evergreen-ci/shrub v0.0.0-20231121224157-600e066f9de6 h1:LfvYiC/yIi91+6ykT8yaDfmzr67vcFUbQCbRg1ZbEj4= -github.com/evergreen-ci/shrub v0.0.0-20231121224157-600e066f9de6/go.mod h1:r6YQr77CR37LMhBdWcFrxqu5V+UhO+SYloHfd9vO1go= +github.com/evergreen-ci/shrub v0.0.0-20240215220116-3f233ddeff2a h1:Hsu++nuXl8MvWhcxjQyyZtdJDv85kVrDVxf0LcUoAmQ= +github.com/evergreen-ci/shrub v0.0.0-20240215220116-3f233ddeff2a/go.mod h1:r6YQr77CR37LMhBdWcFrxqu5V+UhO+SYloHfd9vO1go= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -426,8 +426,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 h1:6R2FC06FonbXQ8pK11/PDFY6N6LWlf9KlzibaCapmqc= +golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=