From 79384c35ab42715144388b7d3e0b0290fb93a962 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 22:53:18 +0000 Subject: [PATCH] build(deps): bump megalinter/megalinter from 5 to 6.11.0 (#1370) * build(deps): bump megalinter/megalinter from 5 to 6.11.0 Bumps [megalinter/megalinter](https://github.com/megalinter/megalinter) from 5 to 6.11.0. - [Release notes](https://github.com/megalinter/megalinter/releases) - [Changelog](https://github.com/oxsecurity/megalinter/blob/main/CHANGELOG.md) - [Commits](https://github.com/megalinter/megalinter/compare/v5...v6.11.0) --- updated-dependencies: - dependency-name: megalinter/megalinter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * chore: updates to support new megalinter Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Casey Lee Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .github/actions/choco/Dockerfile | 2 +- .github/workflows/checks.yml | 2 +- .gitleaksignore | 1 + .mega-linter.yml | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 .gitleaksignore diff --git a/.github/actions/choco/Dockerfile b/.github/actions/choco/Dockerfile index acfaa369..d301f0aa 100644 --- a/.github/actions/choco/Dockerfile +++ b/.github/actions/choco/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.16 ARG CHOCOVERSION=1.1.0 diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 6d92fb80..5b7c155a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -22,7 +22,7 @@ jobs: - uses: golangci/golangci-lint-action@v3.2.0 with: version: v1.47.2 - - uses: megalinter/megalinter/flavors/go@v5 + - uses: megalinter/megalinter/flavors/go@v6.11.0 env: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitleaksignore b/.gitleaksignore new file mode 100644 index 00000000..5254908a --- /dev/null +++ b/.gitleaksignore @@ -0,0 +1 @@ +b910a42edfab7a02b08a52ecef203fd419725642:pkg/container/testdata/docker-pull-options/config.json:generic-api-key:4 diff --git a/.mega-linter.yml b/.mega-linter.yml index d1d492dd..c6330894 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -12,6 +12,8 @@ DISABLE_LINTERS: - YAML_YAMLLINT - MARKDOWN_MARKDOWN_TABLE_FORMATTER - MARKDOWN_MARKDOWN_LINK_CHECK + - REPOSITORY_CHECKOV + - REPOSITORY_TRIVY FILTER_REGEX_EXCLUDE: (.*testdata/*|install.sh) MARKDOWN_MARKDOWNLINT_CONFIG_FILE: .markdownlint.yml PARALLEL: false diff --git a/go.mod b/go.mod index 280e0272..bd0c56d5 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/xanzy/ssh-agent v0.3.1 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect - golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect + golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index 3cf11d48..6026237d 100644 --- a/go.sum +++ b/go.sum @@ -855,8 +855,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220403103023-749bd193bc2b h1:vI32FkLJNAWtGD4BwkThwEy6XS7ZLLMHkSkYfF8M0W0= -golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=