From fff10ccd60818e0c84172dae2435333615ce4695 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Mon, 16 Oct 2023 12:56:36 +0100 Subject: [PATCH] build: go v1.21.1 --- .github/workflows/checks-macos.yml | 6 +- .golangci.yml | 8 +- devbox.json | 4 +- devbox.lock | 304 +++++++++++++++++++++++---- go.mod | 2 +- go.sum | 30 +++ hack/flakes/golangci-lint/flake.lock | 44 ++++ hack/flakes/golangci-lint/flake.nix | 64 ++++++ images/manifest_test.go | 2 +- make/go.mk | 2 +- 10 files changed, 423 insertions(+), 43 deletions(-) create mode 100644 hack/flakes/golangci-lint/flake.lock create mode 100644 hack/flakes/golangci-lint/flake.nix diff --git a/.github/workflows/checks-macos.yml b/.github/workflows/checks-macos.yml index 9b8cd72c..9e7bf2d3 100644 --- a/.github/workflows/checks-macos.yml +++ b/.github/workflows/checks-macos.yml @@ -24,6 +24,8 @@ jobs: steps: - name: Check out code uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Install devbox uses: jetpack-io/devbox-install-action@v0.7.0 @@ -33,7 +35,9 @@ jobs: NIX_USER_COUNT: 4 - name: Build - run: devbox run -- make SKIP_UPX=false build-snapshot + run: | + devbox run -- \ + make GORELEASER_FLAGS=$'--config=<(gojq --yaml-input --yaml-output \'del(.builds[0].goarch) | del(.builds[0].goos) | .builds[0].targets|=(["darwin_amd64_v1"])\' .goreleaser.yml) --skip=validate,publish' release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.golangci.yml b/.golangci.yml index 9f48b580..84505cd5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -13,8 +13,10 @@ linters: - errcheck - errchkjson - errname + - gocheckcompilerdirectives - gochecknoinits - gci + - ginkgolinter - goconst - gocritic - gocyclo @@ -25,18 +27,23 @@ linters: - govet - ineffassign - lll + - loggercheck + - mirror - misspell - nolintlint - prealloc + - reassign - staticcheck - stylecheck - tenv + - testableexamples - thelper - tparallel - typecheck - unconvert - unparam - unused + - usestdlibvars - whitespace linters-settings: @@ -66,7 +73,6 @@ linters-settings: - performance - style gofumpt: - lang-version: "1.17" extra-rules: true lll: line-length: 120 diff --git a/devbox.json b/devbox.json index e975a3b3..5576ccbc 100644 --- a/devbox.json +++ b/devbox.json @@ -1,6 +1,5 @@ { "packages": [ - "go@1.20.5", "bash@latest", "coreutils@latest", "crane@latest", @@ -11,8 +10,9 @@ "gnused@latest", "gnugrep@latest", "gnumake@latest", + "go@latest", "gojq@latest", - "golangci-lint@latest", + "path:./hack/flakes/golangci-lint", "golines@latest", "goreleaser@latest", "gotestsum@latest", diff --git a/devbox.lock b/devbox.lock index bb673188..2090db65 100644 --- a/devbox.lock +++ b/devbox.lock @@ -5,79 +5,241 @@ "last_modified": "2023-05-07T06:59:10Z", "resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#bash", "source": "devbox-search", - "version": "5.2-p15" + "version": "5.2-p15", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/zqx1fik7mcyg1037s015kfbw2zq0qhqn-bash-5.2-p15" + }, + "aarch64-linux": { + "store_path": "/nix/store/4qp96hwq3wqkqhv99m76g2rp8sdjcl4v-bash-5.2-p15" + }, + "x86_64-darwin": { + "store_path": "/nix/store/3ln9yvs9pg78qvabh89y0a4m1hqzyl1h-bash-5.2-p15" + }, + "x86_64-linux": { + "store_path": "/nix/store/xdqlrixlspkks50m9b0mpvag65m3pf2w-bash-5.2-p15" + } + } }, "coreutils@latest": { "last_modified": "2023-06-29T16:20:38Z", "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#coreutils", "source": "devbox-search", - "version": "9.3" + "version": "9.3", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/g9pvwpwpgkhzlq0kv4bbllclm18kv0gj-coreutils-9.3" + }, + "aarch64-linux": { + "store_path": "/nix/store/zlh7zakv2fn97fb4q2y6abzsdp6jflfd-coreutils-9.3" + }, + "x86_64-darwin": { + "store_path": "/nix/store/4fs17w7rfwy27iskp2ia0109dxv4zijs-coreutils-9.3" + }, + "x86_64-linux": { + "store_path": "/nix/store/y9gr7abwxvzcpg5g73vhnx1fpssr5frr-coreutils-9.3" + } + } }, "crane@latest": { - "last_modified": "2023-06-29T16:20:38Z", - "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#crane", + "last_modified": "2023-09-27T18:02:17Z", + "resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#crane", "source": "devbox-search", - "version": "0.15.2" + "version": "0.16.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/ljqsw7zaw6awivbc7am5dn1ywadyxcz4-go-containerregistry-0.16.1-crane" + }, + "aarch64-linux": { + "store_path": "/nix/store/3d5af95ic7pbpqx8xn8pjla3fjj1b2b6-go-containerregistry-0.16.1-crane" + }, + "x86_64-darwin": { + "store_path": "/nix/store/g3dd8lx41naj9vxh1vq8kiml10c6b468-go-containerregistry-0.16.1-crane" + }, + "x86_64-linux": { + "store_path": "/nix/store/ms0pmkb7v45lrv7qvhw7kqzmmxgp3vgr-go-containerregistry-0.16.1-crane" + } + } }, "findutils@latest": { "last_modified": "2023-05-07T06:59:10Z", "resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#findutils", "source": "devbox-search", - "version": "4.9.0" + "version": "4.9.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/cnjxsppdzfbwvmkdrkpps6j75a2xqgks-findutils-4.9.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/4awdw9m07w2xjjqi1an8sdr8lpdj0hpz-findutils-4.9.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/074vyicgmjl4qmally9ai9n2k2vsn8c5-findutils-4.9.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/b6izr8wh0p7dyvh3cyg14wq2rn8d31ik-findutils-4.9.0" + } + } }, "ginkgo@latest": { - "last_modified": "2023-06-29T16:20:38Z", - "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#ginkgo", + "last_modified": "2023-10-11T07:26:37Z", + "resolved": "github:NixOS/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54#ginkgo", "source": "devbox-search", - "version": "2.11.0" + "version": "2.13.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/gf15ldjxsvhn49qlf0j2craj5da96477-ginkgo-2.13.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/2yiqr36a98v5ivg61zjlhwcjalycdd7g-ginkgo-2.13.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/2mf5fydqrnm57qqjdcijbd9mwzq3i9dx-ginkgo-2.13.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/a00n0i3k346d2iqcrqkicvl5pshgcvsn-ginkgo-2.13.0" + } + } }, "git@latest": { - "last_modified": "2023-06-29T16:20:38Z", - "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#git", + "last_modified": "2023-10-11T07:26:37Z", + "resolved": "github:NixOS/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54#git", "source": "devbox-search", - "version": "2.41.0" + "version": "2.42.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/kwpgj2rpza5i43jmvxx2d6rya5ay92pc-git-2.42.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/l1572f7d81n8wmqdf899kk3kmpdb0amf-git-2.42.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/r7la50prsws136rj6ynj0vp3pwws0yly-git-2.42.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/7smkn8cidx17la9ny5vfvghrwfxwbrny-git-2.42.0" + } + } }, "gnugrep@latest": { "last_modified": "2023-06-29T16:20:38Z", "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#gnugrep", "source": "devbox-search", - "version": "3.11" + "version": "3.11", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/xrqvjyn24z6ljnh9583c13iarks1faa3-gnugrep-3.11" + }, + "aarch64-linux": { + "store_path": "/nix/store/zvkc34w59kp2wq7qab26bz4ks0pdplcz-gnugrep-3.11" + }, + "x86_64-darwin": { + "store_path": "/nix/store/kh19pwxzymzqarf9dilwg1xbp30q56v7-gnugrep-3.11" + }, + "x86_64-linux": { + "store_path": "/nix/store/xafzciap7acqhfx84dvqkp18bg4lrai3-gnugrep-3.11" + } + } }, "gnumake@latest": { "last_modified": "2023-05-07T06:59:10Z", "resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#gnumake", "source": "devbox-search", - "version": "4.4.1" + "version": "4.4.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/221p2yp3dlb6dxr93iidq4gpx9i25n81-gnumake-4.4.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/7j6z1qfnwbl6ixa7gwki112hp1rk7f55-gnumake-4.4.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/gy3qhhljpwjhmn6s4l2hnwh1nwg0p779-gnumake-4.4.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/5rdxplg3cczslq4banvk3449ry5k9hx7-gnumake-4.4.1" + } + } }, "gnused@latest": { "last_modified": "2023-05-07T06:59:10Z", "resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#gnused", "source": "devbox-search", - "version": "4.9" + "version": "4.9", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/c9606i14wkrcjavx5kvhaghxfpgy204k-gnused-4.9" + }, + "aarch64-linux": { + "store_path": "/nix/store/374qyiy32hajk5yni0d9kq7i69iw1r47-gnused-4.9" + }, + "x86_64-darwin": { + "store_path": "/nix/store/kdar14idjk11f6n0v6vl1lddwyz6hqcw-gnused-4.9" + }, + "x86_64-linux": { + "store_path": "/nix/store/x23by79p38ll0js1alifmf3y56vqfs49-gnused-4.9" + } + } }, - "go@1.20.5": { - "last_modified": "2023-06-30T04:44:22Z", - "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#go", + "go@latest": { + "last_modified": "2023-09-27T18:02:17Z", + "resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#go_1_21", "source": "devbox-search", - "version": "1.20.5" + "version": "1.21.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/s1xk6hrfn0kw8ycvqbx4vv4gr00k6qpl-go-1.21.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/id3ygqxp1hvbh7dyjlwngx53fvcpqg84-go-1.21.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/yn0g820ayb963s0i4nnw9pf72l49kkg0-go-1.21.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/pvvv2lmx9m8b2n0447mljrl5xmla8r3h-go-1.21.1" + } + } }, "gojq@latest": { "last_modified": "2023-06-29T16:20:38Z", "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#gojq", "source": "devbox-search", - "version": "0.12.13" - }, - "golangci-lint@latest": { - "last_modified": "2023-06-29T16:20:38Z", - "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#golangci-lint", - "source": "devbox-search", - "version": "1.53.3" + "version": "0.12.13", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/map8vmw85f5r36bj4sb9wpj00ajmdbap-gojq-0.12.13" + }, + "aarch64-linux": { + "store_path": "/nix/store/rx6rphn7sahbkdqbh37g10y1867pm3k0-gojq-0.12.13" + }, + "x86_64-darwin": { + "store_path": "/nix/store/v0zsm8x3p7fiyflp5gj65cyw30sgwwkp-gojq-0.12.13" + }, + "x86_64-linux": { + "store_path": "/nix/store/lfa5m3wrcjg11dqzrv801cbirbzhi8s2-gojq-0.12.13" + } + } }, "golines@latest": { "last_modified": "2023-05-07T06:59:10Z", "resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#golines", "source": "devbox-search", - "version": "0.11.0" + "version": "0.11.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/ya0wd27v0ngiks5jfiq6rqakp5vwpzva-golines-0.11.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/jbss514is7d3hl1d120rw54xj3l6z21y-golines-0.11.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/m3cq3hmy95wcblznk6bb7yh5wyvpn4xx-golines-0.11.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/7ndrkza65dr8zmqq7w28qjaaf5whyz0h-golines-0.11.0" + } + } }, "goreleaser@latest": { "last_modified": "2023-10-01T23:11:39Z", @@ -103,31 +265,101 @@ "last_modified": "2023-07-23T03:35:12Z", "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#gotestsum", "source": "devbox-search", - "version": "1.10.1" + "version": "1.10.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/n79kzj43m6xn9x41jqgk4fhp01h9fiq4-gotestsum-1.10.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/766qhww31isndzg2zx3lwifnqrsmjhnr-gotestsum-1.10.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/kfrqdxgy43flcf233bm28dffjnps7jdx-gotestsum-1.10.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/wf7jpsb2ppsng0pdqv36adv41r10ypkd-gotestsum-1.10.1" + } + } }, "kubernetes-helm@latest": { - "last_modified": "2023-07-23T03:35:12Z", - "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#kubernetes-helm", + "last_modified": "2023-10-15T14:24:03Z", + "resolved": "github:NixOS/nixpkgs/12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d#kubernetes-helm", "source": "devbox-search", - "version": "3.12.2" + "version": "3.13.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/hif1qvhyfhdii58z7ivrdzppfp52ds6y-kubernetes-helm-3.13.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/vwqi5ns5wriygp0g0lc51rwyrwarqv62-kubernetes-helm-3.13.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/pl5hhiarm38spahpg8jk2dplbcrnfjc7-kubernetes-helm-3.13.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/gdkvyq5rliilq8cahxc14rvfcjkcpwm5-kubernetes-helm-3.13.1" + } + } }, "pre-commit@latest": { "last_modified": "2023-06-29T16:20:38Z", "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#pre-commit", "source": "devbox-search", - "version": "3.3.3" + "version": "3.3.3", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/7nzdf4rf58wrwrzmj13y060h02avsj31-pre-commit-3.3.3" + }, + "aarch64-linux": { + "store_path": "/nix/store/jgj3fxxbl0ngrhnx0b1j439sbnpqrx4y-pre-commit-3.3.3" + }, + "x86_64-darwin": { + "store_path": "/nix/store/4b2d2l0wgzr8zf15imb2na69gcb82x2y-pre-commit-3.3.3" + }, + "x86_64-linux": { + "store_path": "/nix/store/47kf6an6cdf5467vmjnc83d74gj6cb1s-pre-commit-3.3.3" + } + } }, "shfmt@latest": { "last_modified": "2023-06-29T16:20:38Z", "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#shfmt", "source": "devbox-search", - "version": "3.7.0" + "version": "3.7.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/0iiqg1w0j50y8ny36ax9c8wmy1r5bx9c-shfmt-3.7.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/ybcmc2a9ics28sd7j7rl41hld1al243j-shfmt-3.7.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/g6hb3ddihyxqww9i2fgndsdzilc9x725-shfmt-3.7.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/m3accnxhbcsh2i9yf04din5brm2ylj40-shfmt-3.7.0" + } + } }, "upx@latest": { - "last_modified": "2023-05-07T06:59:10Z", - "resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#upx", + "last_modified": "2023-09-27T18:02:17Z", + "resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#upx", "source": "devbox-search", - "version": "4.0.2" + "version": "4.1.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/ikinay856hs3859fznlgwfpddyr9x4vd-upx-4.1.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/bq0ph6zndc6b99ms6xdqs7smxwi7h92d-upx-4.1.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/n53b9qf3b977ag2zrlyq7ai26qc8wj06-upx-4.1.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/89c1i9vrs0l5nqyr9hfcbwyd5cwfpqr2-upx-4.1.0" + } + } } } } diff --git a/go.mod b/go.mod index d951cde9..c1066cea 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/mesosphere/mindthegap -go 1.20 +go 1.21 require ( github.com/aws/aws-sdk-go-v2 v1.21.2 diff --git a/go.sum b/go.sum index b9c42f2a..baeb64af 100644 --- a/go.sum +++ b/go.sum @@ -194,6 +194,7 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -211,6 +212,7 @@ github.com/Microsoft/hcsshim v0.12.0-rc.0 h1:wX/F5huJxH9APBkhKSEAqaiZsuBvbbDnyBR github.com/Microsoft/hcsshim v0.12.0-rc.0/go.mod h1:rvOnw3YlfoNnEp45wReUngvsXbwRW+AFQ10GVjG1kMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= @@ -218,6 +220,7 @@ github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -256,9 +259,13 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -282,9 +289,11 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/containerd v1.7.6 h1:oNAVsnhPoy4BTPQivLgTzI9Oleml9l/+eYIDYXRCYo8= github.com/containerd/containerd v1.7.6/go.mod h1:SY6lrkkuJT40BVNO37tlYTSnKJnP5AXBc0fhx0q+TJ4= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= +github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= github.com/containers/image/v5 v5.28.0 h1:H4cWbdI88UA/mDb6SxMo3IxpmS1BSs/Kifvhwt9g048= @@ -295,6 +304,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHH github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -350,7 +360,9 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI= +github.com/foxcpp/go-mockdns v1.0.0/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= @@ -382,8 +394,11 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU= +github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs= github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0= +github.com/gobuffalo/packd v1.0.1/go.mod h1:PP2POP3p3RXGz7Jh6eYEf93S7vA2za6xM7QT85L4+VY= github.com/gobuffalo/packr/v2 v2.8.3 h1:xE1yzvnO56cUC0sTpKR3DIbxZgB54AftTFMhB2XEWlY= +github.com/gobuffalo/packr/v2 v2.8.3/go.mod h1:0SahksCVcx4IMnigTjiFuyldmTrdTctXsOdiU5KwbKc= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -462,6 +477,7 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -562,6 +578,7 @@ github.com/jwalton/gchalk v1.3.0/go.mod h1:ytRlj60R9f7r53IAElbpq4lVuPOPNg2J4tJcC github.com/jwalton/go-supportscolor v1.1.0 h1:HsXFJdMPjRUAx8cIW6g30hVSFYaxh9yRQwEWgkAR7lQ= github.com/jwalton/go-supportscolor v1.1.0/go.mod h1:hFVUAZV2cWg+WFFC4v8pT2X/S2qUUBYMioBD9AINXGs= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= +github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -578,6 +595,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= 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= @@ -594,8 +612,11 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= +github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY= +github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= +github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -608,6 +629,7 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= +github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= @@ -634,6 +656,7 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= +github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -673,6 +696,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= +github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= @@ -699,6 +723,7 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rubenv/sql-migrate v1.5.2 h1:bMDqOnrJVV/6JQgQ/MxOpU+AdO8uzYYA/TxFUBzFtS0= github.com/rubenv/sql-migrate v1.5.2/go.mod h1:H38GW8Vqf8F0Su5XignRyaRcbXbJunSWxs+kmzlg0Is= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -738,6 +763,7 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/thediveo/enumflag/v2 v2.0.4 h1:CPez2ZDJMkJ0iPiueJ6/vwsFeFy+w5kIJNFwxKPSUGo= github.com/thediveo/enumflag/v2 v2.0.4/go.mod h1:K5VGebAdhHGZyVprL7WEnEJ3CA16YzWhDH2ERwddA0I= github.com/thediveo/success v1.0.1 h1:NVwUOwKUwaN8szjkJ+vsiM2L3sNBFscldoDJ2g2tAPg= +github.com/thediveo/success v1.0.1/go.mod h1:AZ8oUArgbIsCuDEWrzWNQHdKnPbDOLQsWOFj9ynwLt0= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -763,8 +789,11 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1337,6 +1366,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= +gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= helm.sh/helm/v3 v3.13.1 h1:DG+XLGzBJeZvMLlMbm6bPDLV1dGaVW9eZsDoUd1/LM0= helm.sh/helm/v3 v3.13.1/go.mod h1:TdQRMiq46CSWcc68Hb0uVhvAWusaN90YwAV54cz6JzU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/hack/flakes/golangci-lint/flake.lock b/hack/flakes/golangci-lint/flake.lock new file mode 100644 index 00000000..6a4693ca --- /dev/null +++ b/hack/flakes/golangci-lint/flake.lock @@ -0,0 +1,44 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1693663421, + "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e56990880811a451abd32515698c712788be5720", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "utils": "utils" + } + }, + "utils": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "v1.0.0", + "repo": "flake-utils", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/hack/flakes/golangci-lint/flake.nix b/hack/flakes/golangci-lint/flake.nix new file mode 100644 index 00000000..ef3c28a8 --- /dev/null +++ b/hack/flakes/golangci-lint/flake.nix @@ -0,0 +1,64 @@ +# Copyright 2023 D2iQ, Inc. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +{ + description = "Fast linters Runner for Go"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + utils.url = "github:numtide/flake-utils/v1.0.0"; + }; + + outputs = + { self + , nixpkgs + , utils + , + }: + let + appReleaseVersion = "1.54.2"; + appReleaseBinaries = { + "x86_64-linux" = { + fileName = "golangci-lint-${appReleaseVersion}-linux-amd64.tar.gz"; + sha256 = "17c9ca05253efe833d47f38caf670aad2202b5e6515879a99873fabd4c7452b3"; + }; + "x86_64-darwin" = { + fileName = "golangci-lint-${appReleaseVersion}-darwin-amd64.tar.gz"; + sha256 = "925c4097eae9e035b0b052a66d0a149f861e2ab611a4e677c7ffd2d4e05b9b89"; + }; + "aarch64-darwin" = { + fileName = "golangci-lint-${appReleaseVersion}-darwin-arm64.tar.gz"; + sha256 = "7b33fb1be2f26b7e3d1f3c10ce9b2b5ce6d13bb1d8468a4b2ba794f05b4445e1"; + }; + }; + supportedSystems = builtins.attrNames appReleaseBinaries; + in + utils.lib.eachSystem supportedSystems (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + appReleaseBinary = appReleaseBinaries.${system}; + in + rec { + packages.golangci-lint = pkgs.stdenv.mkDerivation { + pname = "golangci-lint"; + version = appReleaseVersion; + + src = pkgs.fetchurl { + url = "https://github.com/golangci/golangci-lint/releases/download/v${appReleaseVersion}/${appReleaseBinary.fileName}"; + sha256 = appReleaseBinary.sha256; + }; + + sourceRoot = "."; + + installPhase = '' + install -m755 -D */golangci-lint $out/bin/golangci-lint + ''; + }; + packages.default = packages.golangci-lint; + + apps.golangci-lint = utils.lib.mkApp { + drv = packages.golangci-lint; + }; + apps.default = apps.golangci-lint; + }); +} diff --git a/images/manifest_test.go b/images/manifest_test.go index a6fdf833..3d6ca8dd 100644 --- a/images/manifest_test.go +++ b/images/manifest_test.go @@ -417,7 +417,7 @@ func TestManifestListForImage_RemoteImage(t *testing.T) { mux := http.NewServeMux() mux.Handle("/v2/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(200) + w.WriteHeader(http.StatusOK) })) mux.Handle( "/v2/mesosphere/kube-apiserver/manifests/v1.24.4_fips.0", diff --git a/make/go.mk b/make/go.mk index 93ce3ae7..efbc34d0 100644 --- a/make/go.mk +++ b/make/go.mk @@ -79,7 +79,7 @@ E2E_FLAKE_ATTEMPTS ?= 1 e2e-test: ## Runs e2e tests $(info $(M) running e2e tests$(if $(E2E_LABEL), labelled "$(E2E_LABEL)")$(if $(E2E_FOCUS), matching "$(E2E_FOCUS)")) ifndef E2E_SKIP_BUILD - $(MAKE) GORELEASER_FLAGS=$$'--config=<(env GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) gojq --yaml-input --yaml-output \'del(.builds[0].goarch) | del(.builds[0].goos) | .builds[0].targets|=(["linux_amd64","linux_arm64",env.GOOS+"_"+env.GOARCH] | unique | map(. | sub("_amd64";"_amd64_v1")))\' .goreleaser.yml) --clean --skip=validate,publish' release + $(MAKE) GORELEASER_FLAGS=$$'--config=<(env GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) gojq --yaml-input --yaml-output \'del(.builds[0].goarch) | del(.builds[0].goos) | .builds[0].targets|=(["linux_amd64","linux_arm64",env.GOOS+"_"+env.GOARCH] | unique | map(. | sub("_amd64";"_amd64_v1")))\' .goreleaser.yml) --skip=validate,publish' release endif ginkgo run \ --r \