From 790fb3399abdd23a7fc9dffc757843319cedf581 Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 11:20:06 +0000 Subject: [PATCH 1/2] :seedling: Update Builder Image group | datasource | package | from | to | | ----------- | ------------------------ | ------- | ------- | | github-tags | adrienverge/yamllint | v1.33.0 | v1.35.1 | | docker | docker.io/aquasec/trivy | 0.49.0 | 0.51.3 | | docker | docker.io/library/alpine | 3.19.1 | 3.20.0 | | github-tags | golangci/golangci-lint | v1.55.2 | v1.58.2 | | github-tags | lycheeverse/lychee | v0.14.2 | v0.15.1 | --- .builder-image-version.txt | 2 +- .github/workflows/builder-image.yml | 2 +- .github/workflows/pr-lint.yml | 2 +- images/builder/Dockerfile | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 0ea3a944..0c62199f 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -0.2.0 +0.2.1 diff --git a/.github/workflows/builder-image.yml b/.github/workflows/builder-image.yml index 2c3e9c1b..56ee5155 100644 --- a/.github/workflows/builder-image.yml +++ b/.github/workflows/builder-image.yml @@ -32,4 +32,4 @@ jobs: file: ./images/builder/Dockerfile context: ./images/builder push: true - tags: ghcr.io/sovereigncloudstack/csctl-builder:0.2.0 + tags: ghcr.io/sovereigncloudstack/csctl-builder:0.2.1 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index cf9dedfe..442245cf 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -19,7 +19,7 @@ jobs: if: github.event_name != 'pull_request_target' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/csctl-builder:0.2.0 + image: ghcr.io/sovereigncloudstack/csctl-builder:0.2.1 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index d9f23202..ac9e1c19 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -17,9 +17,9 @@ # If you make changes to this Dockerfile run `make builder-image-push`. # Install Lychee -FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as lychee +FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as lychee # update: datasource=github-tags depName=lycheeverse/lychee versioning=semver -ENV LYCHEE_VERSION="v0.14.2" +ENV LYCHEE_VERSION="v0.15.1" # hadolint ignore=DL3018 RUN apk add --no-cache curl && \ curl -L -o /tmp/lychee-${LYCHEE_VERSION}.tgz https://github.com/lycheeverse/lychee/releases/download/${LYCHEE_VERSION}/lychee-${LYCHEE_VERSION}-x86_64-unknown-linux-gnu.tar.gz && \ @@ -28,9 +28,9 @@ RUN apk add --no-cache curl && \ rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz # Install Golang CI Lint -FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci +FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v1.55.2" +ENV GOLANGCI_VERSION="v1.58.2" WORKDIR / # hadolint ignore=DL3018,DL4006 RUN apk add --no-cache curl && \ @@ -40,7 +40,7 @@ RUN apk add --no-cache curl && \ FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint # Install Trivy -FROM docker.io/aquasec/trivy:0.49.0@sha256:c71420cd77f136e8e900f71d272fb89075f6011019bdcb4b5f7c8e4212f9025e as trivy +FROM docker.io/aquasec/trivy:0.51.3@sha256:9e99f83e58db3f9338ded0bb25179e1d5849a1cbf2e90074a0c4a274f1d151e5 as trivy ############################ # csctl Build Image Base # @@ -50,7 +50,7 @@ FROM docker.io/library/golang:1.21.6-bullseye@sha256:a8712f27d9ac742e7bded8f81f7 # update: datasource=repology depName=debian_11/skopeo versioning=loose ENV SKOPEO_VERSION="1.2.2+dfsg1-1+b6" # update: datasource=github-tags depName=adrienverge/yamllint versioning=semver -ENV YAMLLINT_VERSION="v1.33.0" +ENV YAMLLINT_VERSION="v1.35.1" # update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver ENV YAMLFIXER_VERSION="0.9.15" From a13d40a1493ff02093309d8acec650430f78a34e Mon Sep 17 00:00:00 2001 From: kranurag7 Date: Sat, 25 May 2024 10:13:49 +0530 Subject: [PATCH 2/2] fix lint warnings Signed-off-by: kranurag7 --- .golangci.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 443d2024..2094c52f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -85,10 +85,7 @@ linters-settings: allow-unused: false allow-leading-space: false require-specific: true - staticcheck: - go: "1.21" stylecheck: - go: "1.21" checks: ["all", "-ST1006"] dot-import-whitelist: - "github.com/onsi/gomega" @@ -242,9 +239,6 @@ linters-settings: # Suggest the use of rpc.DefaultXXPath. # Default: false default-rpc-path: true - # Suggest the use of os.DevNull. - # Default: false - os-dev-null: true # Suggest the use of sql.LevelXX.String(). # Default: false sql-isolation-level: true @@ -254,9 +248,6 @@ linters-settings: # Suggest the use of constant.Kind.String(). # Default: false constant-kind: true - # Suggest the use of syslog.Priority. - # Default: false - syslog-priority: true wrapcheck: ignoreSigs: - status.Error( @@ -276,6 +267,9 @@ issues: # because we want to help reviewers to focus on reviewing the most relevant # changes in PRs and avoid nitpicking. exclude-use-default: false + skip-dirs: + - vendor$ + - test/vendor$ exclude-rules: - linters: - wrapcheck @@ -285,6 +279,3 @@ run: go: "1.21" allow-parallel-runners: true modules-download-mode: vendor - skip-dirs: - - vendor$ - - test/vendor$