From 15a8beb2564fe1a3580b1c7bb12096f34ef792dd Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Sun, 21 Apr 2024 09:13:08 +0200 Subject: [PATCH] Upgrade go to 1.22 and housekeeping (#641) * group dependabot updates Signed-off-by: cpanato * upgrade to go1.22 Signed-off-by: cpanato * fix lints Signed-off-by: cpanato * update alpine and helm Signed-off-by: cpanato * go mod tidy Signed-off-by: cpanato * update goreleaser deprecated flags and config Signed-off-by: cpanato * update dockerfile Signed-off-by: cpanato --------- Signed-off-by: cpanato --- .github/dependabot.yml | 45 +++++++++++++++++++++++++++------------ .github/workflows/ci.yaml | 2 +- .golangci.yml | 1 + .goreleaser.yml | 3 +-- Dockerfile | 17 ++++++--------- build.sh | 2 +- go.mod | 2 +- go.sum | 9 ++++++++ pkg/chart/chart.go | 4 ++-- 9 files changed, 53 insertions(+), 32 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f12648c..04664fe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,16 +1,33 @@ +--- version: 2 updates: -- package-ecosystem: gomod - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 -- package-ecosystem: "docker" - directory: "/" - schedule: - interval: weekly + - package-ecosystem: gomod + directory: "/" + schedule: + interval: weekly + open-pull-requests-limit: 10 + groups: + gomod: + update-types: + - "patch" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: weekly + open-pull-requests-limit: 10 + groups: + actions: + update-types: + - "patch" + - "minor" + + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: weekly + groups: + docker: + update-types: + - "patch" + - "minor" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 78060b4..5d499ca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -111,4 +111,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v3 with: - version: v1.55 + version: v1.57 diff --git a/.golangci.yml b/.golangci.yml index 58d6926..701deff 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,3 +1,4 @@ +--- linters: enable: - asciicheck diff --git a/.goreleaser.yml b/.goreleaser.yml index b358d18..c5d37aa 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -33,8 +33,7 @@ builds: -X github.com/helm/chart-testing/v3/ct/cmd.BuildDate={{ .Date }} archives: - - rlcp: true - format_overrides: + - format_overrides: - goos: windows format: zip files: diff --git a/Dockerfile b/Dockerfile index 1f7fde7..e8ec3ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 RUN apk --no-cache add \ bash \ @@ -8,29 +8,24 @@ RUN apk --no-cache add \ openssh-client \ py3-pip \ py3-wheel \ - python3 && \ - pip install --upgrade pip==23.3.2 - -# Install a YAML Linter -ARG yamllint_version=1.33.0 -LABEL yamllint-version=$yamllint_version -RUN pip install "yamllint==$yamllint_version" + python3 \ + yamllint=1.33.0-r0 # Install Yamale YAML schema validator ARG yamale_version=4.0.4 LABEL yamale-version=$yamale_version -RUN pip install "yamale==$yamale_version" +RUN pip install --break-system-packages "yamale==$yamale_version" ARG TARGETPLATFORM # Install kubectl -ARG kubectl_version=v1.28.5 +ARG kubectl_version=v1.30.0 LABEL kubectl-version=$kubectl_version RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$kubectl_version/bin/$TARGETPLATFORM/kubectl" && \ chmod +x kubectl && \ mv kubectl /usr/local/bin/ # Install Helm -ARG helm_version=v3.13.3 +ARG helm_version=v3.14.4 LABEL helm-version=$helm_version RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \ && if [ ${targetArch} = "amd64" ]; then \ diff --git a/build.sh b/build.sh index 9e31e37..499255d 100755 --- a/build.sh +++ b/build.sh @@ -67,7 +67,7 @@ main() { fi if [[ -z "$release" ]]; then - goreleaser_args+=(--snapshot --skip-sign) + goreleaser_args+=(--snapshot --skip=sign) fi pushd "$SCRIPT_DIR" > /dev/null diff --git a/go.mod b/go.mod index eb366df..24542c4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/helm/chart-testing/v3 -go 1.20 +go 1.22 require ( github.com/MakeNowJust/heredoc v1.0.0 diff --git a/go.sum b/go.sum index 1fcd79e..6992ee6 100644 --- a/go.sum +++ b/go.sum @@ -9,10 +9,13 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= +github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -20,6 +23,7 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M= @@ -30,13 +34,17 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= 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.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -49,6 +57,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go index ebc67b4..4e2f3e1 100644 --- a/pkg/chart/chart.go +++ b/pkg/chart/chart.go @@ -901,7 +901,7 @@ func (t *Testing) ValidateMaintainers(chart *Chart) error { func (t *Testing) PrintEventsPodDetailsAndLogs(namespace string, selector string) { util.PrintDelimiterLineToWriter(os.Stdout, "=") - t.printDetails(namespace, "Events of namespace", ".", func(item string) error { + t.printDetails(namespace, "Events of namespace", ".", func(_ string) error { return t.kubectl.GetEvents(namespace) }, namespace) @@ -920,7 +920,7 @@ func (t *Testing) PrintEventsPodDetailsAndLogs(namespace string, selector string } for _, pod := range pods { - t.printDetails(pod, "Description of pod", "~", func(item string) error { + t.printDetails(pod, "Description of pod", "~", func(_ string) error { return t.kubectl.DescribePod(namespace, pod) }, pod)