From a911be0f3e0af003036df433ab569edfc097bdb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 13:51:21 +0000 Subject: [PATCH] build(deps): Bump github.com/distribution/distribution/v3 from 3.0.0-20230519140516-983358f8e250 to 3.0.0-alpha.1 (#262) * build(deps): Bump github.com/distribution/distribution/v3 Bumps [github.com/distribution/distribution/v3](https://github.com/distribution/distribution) from 3.0.0-20230519140516-983358f8e250 to 3.0.0-alpha.1. - [Release notes](https://github.com/distribution/distribution/releases) - [Commits](https://github.com/distribution/distribution/commits/v3.0.0-alpha.1) --- updated-dependencies: - dependency-name: github.com/distribution/distribution/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fixup! build: Use "github.com/distribution/reference" --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson --- .golangci.yml | 1 - ...namiccredentialprovideconfig_validation.go | 2 +- devbox.lock | 338 +++++++++--------- go.mod | 24 +- go.sum | 103 ++++-- hack/flakes/flake.lock | 6 +- make/pre-commit.mk | 1 + .../dynamic/dynamic_test.go | 40 ++- .../staticcredentialprovider-v1-withpath.sh | 2 +- .../testdata/staticcredentialprovider-v1.sh | 2 +- .../staticcredentialprovider-v1alpha1.sh | 2 +- .../staticcredentialprovider-v1beta1.sh | 2 +- .../staticcredentialprovider-wildcard.sh | 2 +- pkg/credentialprovider/plugin/plugin.go | 23 +- pkg/credentialprovider/plugin/plugin_test.go | 10 +- .../static/static_credentials.go | 19 +- .../static/static_credentials_test.go | 12 +- pkg/urlglobber/globber.go | 2 +- test/e2e/docker/client.go | 3 +- .../suites/mirror/dynamic_credentials_test.go | 34 +- 20 files changed, 333 insertions(+), 295 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 21b01d9..d96cdfb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -31,7 +31,6 @@ linters: - misspell - nolintlint - prealloc - - revive - staticcheck - stylecheck - tagliatelle diff --git a/apis/config/v1alpha1/dynamiccredentialprovideconfig_validation.go b/apis/config/v1alpha1/dynamiccredentialprovideconfig_validation.go index 43ddd61..a4bc2a7 100644 --- a/apis/config/v1alpha1/dynamiccredentialprovideconfig_validation.go +++ b/apis/config/v1alpha1/dynamiccredentialprovideconfig_validation.go @@ -5,7 +5,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" - runtime "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" diff --git a/devbox.lock b/devbox.lock index 419cff1..9f99b69 100644 --- a/devbox.lock +++ b/devbox.lock @@ -2,542 +2,542 @@ "lockfile_version": "1", "packages": { "actionlint@latest": { - "last_modified": "2024-01-02T02:19:20Z", - "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#actionlint", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#actionlint", "source": "devbox-search", "version": "1.6.26", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/28326qalmc32r0cra7bxbh5ihjq9nsxp-actionlint-1.6.26" + "store_path": "/nix/store/v5pbjl060m2bclr7nk88vvfi6nk96p70-actionlint-1.6.26" }, "aarch64-linux": { - "store_path": "/nix/store/zkzdlbm0ksvsdwp8r3dk5xcmn91l6ws6-actionlint-1.6.26" + "store_path": "/nix/store/k7b945nar8dfdqlwnkq8wb3ygmgifyfj-actionlint-1.6.26" }, "x86_64-darwin": { - "store_path": "/nix/store/2i6aiwk70x8nw3wiknnps3rg3cjrcwxx-actionlint-1.6.26" + "store_path": "/nix/store/xj1j8pbc9ba2kc5ygbj1jgzik91khlc1-actionlint-1.6.26" }, "x86_64-linux": { - "store_path": "/nix/store/g1h07n8ppxh96j18gahmd47n79qnw3i8-actionlint-1.6.26" + "store_path": "/nix/store/snwsvryx3bl3kzfwp801axbixg5bng9g-actionlint-1.6.26" } } }, "bash@latest": { - "last_modified": "2024-01-02T02:19:20Z", - "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#bash", + "last_modified": "2024-02-03T02:01:25Z", + "resolved": "github:NixOS/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814#bash", "source": "devbox-search", "version": "5.2-p21", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/6nxav88iiz0g8m598xy643f8hhdz5kkx-bash-5.2-p21" + "store_path": "/nix/store/0wzb184kckhmggq1nlvy5xk6rykp0jl1-bash-5.2-p21" }, "aarch64-linux": { - "store_path": "/nix/store/l34lhs5k16k8pydj2rjq70pqxz86kd3f-bash-5.2-p21" + "store_path": "/nix/store/gzgl75pycp1yn0h1201v6bxw80xz0wn0-bash-5.2-p21" }, "x86_64-darwin": { - "store_path": "/nix/store/d2khhk4xpwpk9khvhp8n6r3k9si03ax1-bash-5.2-p21" + "store_path": "/nix/store/00khls1wnjwsx0z82f2rq5zr20rky3lg-bash-5.2-p21" }, "x86_64-linux": { - "store_path": "/nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21" + "store_path": "/nix/store/cjbyb45nxiqidj95c4k1mh65azn1x896-bash-5.2-p21" } } }, "chart-testing@latest": { - "last_modified": "2023-12-18T02:58:18Z", - "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#chart-testing", + "last_modified": "2024-02-05T02:15:44Z", + "resolved": "github:NixOS/nixpkgs/0a254180b4cad6be45aa46dce896bdb8db5d2930#chart-testing", "source": "devbox-search", "version": "3.10.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/xc7l8fa3lbd2qz3gv9xvayrqw4rv4653-chart-testing-3.10.1" + "store_path": "/nix/store/gp0rs816kihbginy04sg1j95gwry3i7d-chart-testing-3.10.1" }, "aarch64-linux": { - "store_path": "/nix/store/3fx818ja1w3gl75r9yzxbvs8bw2wyykr-chart-testing-3.10.1" + "store_path": "/nix/store/i76hvhpax0lf6jp55dzmw5crh466gfrf-chart-testing-3.10.1" }, "x86_64-darwin": { - "store_path": "/nix/store/m5didwx57ikg35jkl1w1kvjadp7fdj90-chart-testing-3.10.1" + "store_path": "/nix/store/80smx8p06iqylqm15q85by4imc5pqsg7-chart-testing-3.10.1" }, "x86_64-linux": { - "store_path": "/nix/store/7jxq4a7g514px4qz22pn4k87d1f6f7vc-chart-testing-3.10.1" + "store_path": "/nix/store/yv14jrzgrk4z9k4l314cv0d67hzz044q-chart-testing-3.10.1" } } }, "clusterctl@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#clusterctl", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#clusterctl", "source": "devbox-search", - "version": "1.6.0", + "version": "1.6.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/c3i7qh827z6i4cgbfn8nb551g5d0hdlm-clusterctl-1.6.0" + "store_path": "/nix/store/y8i6akbyv9v48sb3dqavz88x8yrabd67-clusterctl-1.6.1" }, "aarch64-linux": { - "store_path": "/nix/store/c0ra5d87xzrdgjwjdmc9n8r0z0998yz6-clusterctl-1.6.0" + "store_path": "/nix/store/md8ghpk6q53hyfx1y9g9lpk3rj4rhcyi-clusterctl-1.6.1" }, "x86_64-darwin": { - "store_path": "/nix/store/6bcdrk0dkw1k5cmhgvaijhm7ifqwjnys-clusterctl-1.6.0" + "store_path": "/nix/store/j3lrdlcjyys46xlk10lh4h90xwxay7f0-clusterctl-1.6.1" }, "x86_64-linux": { - "store_path": "/nix/store/z66px6ph446xnz53ypspvzjl2km15cqy-clusterctl-1.6.0" + "store_path": "/nix/store/i8lvp09870phndxi3kli659hqpqfnfhz-clusterctl-1.6.1" } } }, "coreutils@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#coreutils", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#coreutils", "source": "devbox-search", "version": "9.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/pzajj7gw0nazs3vzp6jld53q8ird5izr-coreutils-9.4" + "store_path": "/nix/store/05f94jq5l6kfs9s3gyzj28y1v4xf6hfm-coreutils-9.4" }, "aarch64-linux": { - "store_path": "/nix/store/9a1hkj2fnqf1683r66j850hlmfn550ka-coreutils-9.4" + "store_path": "/nix/store/p6cw7zp8h6s9rkbj4lf9dzb3bzpq5qpy-coreutils-9.4" }, "x86_64-darwin": { - "store_path": "/nix/store/dsvdw81x1nzb0c2lr5shywmwffl8dw1s-coreutils-9.4" + "store_path": "/nix/store/gf7r37m8v29i6r996y4brxh50fm85vjd-coreutils-9.4" }, "x86_64-linux": { - "store_path": "/nix/store/zx8aqgdy735qzk81glfwil6mbi6ddqb1-coreutils-9.4" + "store_path": "/nix/store/5idwbbv23b6vnqdicx97s3hsgrwwnj7j-coreutils-9.4" } } }, "crane@latest": { - "last_modified": "2023-12-18T02:58:18Z", - "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#crane", + "last_modified": "2024-01-31T06:48:05Z", + "resolved": "github:NixOS/nixpkgs/5ad9903c16126a7d949101687af0aa589b1d7d3d#crane", "source": "devbox-search", - "version": "0.17.0", + "version": "0.19.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/xgdfdydcplilly8qhi0wf9xbfxz3bwnw-go-containerregistry-0.17.0-crane" + "store_path": "/nix/store/435985j8kb546avmvafylq9d01bkh48i-go-containerregistry-0.19.0-crane" }, "aarch64-linux": { - "store_path": "/nix/store/53rvclag4d43mz2vbis469sxw6jzaj65-go-containerregistry-0.17.0-crane" + "store_path": "/nix/store/yrbsmhill1hmgymw6yg182gj5if1vyi8-go-containerregistry-0.19.0-crane" }, "x86_64-darwin": { - "store_path": "/nix/store/gnz9m1g3dswcm30z6ygfmakpg1rcgnyf-go-containerregistry-0.17.0-crane" + "store_path": "/nix/store/6av0bpnjciwjq7267aiqcydn2xrm1id9-go-containerregistry-0.19.0-crane" }, "x86_64-linux": { - "store_path": "/nix/store/2jxl4x9m7mfxan734mdvq5aws8k0ylx7-go-containerregistry-0.17.0-crane" + "store_path": "/nix/store/bg1xarwyrj69l6xfjdf5i0nkqv3wi3xv-go-containerregistry-0.19.0-crane" } } }, "findutils@latest": { - "last_modified": "2023-12-25T10:13:25Z", - "resolved": "github:NixOS/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870#findutils", + "last_modified": "2024-02-05T02:15:44Z", + "resolved": "github:NixOS/nixpkgs/0a254180b4cad6be45aa46dce896bdb8db5d2930#findutils", "source": "devbox-search", "version": "4.9.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/6x5inimwy8rlvf678yy080zccbw71alb-findutils-4.9.0" + "store_path": "/nix/store/c0k7n8dbl8afgjsa4ibr3x4fhhp0rvfs-findutils-4.9.0" }, "aarch64-linux": { - "store_path": "/nix/store/54la6gipxzwykx882fnfz3v3jgzri61h-findutils-4.9.0" + "store_path": "/nix/store/ngcvhc28fzn5m9ywf92zz9zvs1ds9a1l-findutils-4.9.0" }, "x86_64-darwin": { - "store_path": "/nix/store/dh1fgwya6795yv108p8dzjyzwl9m4lvj-findutils-4.9.0" + "store_path": "/nix/store/n5brpqbxdfvdn33s3xnl0mxrvdab9hpl-findutils-4.9.0" }, "x86_64-linux": { - "store_path": "/nix/store/sq0w0jchkjqbxl47h52kfwa33qp1adfh-findutils-4.9.0" + "store_path": "/nix/store/4ajik70nplhkb8ndn3gqh7v0b09hmvg9-findutils-4.9.0" } } }, "ginkgo@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#ginkgo", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#ginkgo", "source": "devbox-search", - "version": "2.13.2", + "version": "2.15.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/ixjxhvf5y619d4xxksamr26ygr0jq9mf-ginkgo-2.13.2" + "store_path": "/nix/store/9r7yfsr3qjfb8n0j6flwpkm8hcgj0s32-ginkgo-2.15.0" }, "aarch64-linux": { - "store_path": "/nix/store/24zilfcw58s5jrqqqmxngcnhml7r8cxs-ginkgo-2.13.2" + "store_path": "/nix/store/xl1x5phw1wi8hwx2v46g78s1njkhfd1k-ginkgo-2.15.0" }, "x86_64-darwin": { - "store_path": "/nix/store/2am54c4bvsj0lr4fk2mgn27f9h3gqriy-ginkgo-2.13.2" + "store_path": "/nix/store/a37p0h1mvcsy6wbvxxy3xm55z6ybqpnx-ginkgo-2.15.0" }, "x86_64-linux": { - "store_path": "/nix/store/4fxhb9322ryflmxbfqbkrs9yp91mhn4z-ginkgo-2.13.2" + "store_path": "/nix/store/by987kxzdcgr15wzndw2s6biwg30lqlg-ginkgo-2.15.0" } } }, "gnused@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gnused", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#gnused", "source": "devbox-search", "version": "4.9", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/9z9k8dwhhiryr7z2pz70zca0vwa15yqc-gnused-4.9" + "store_path": "/nix/store/v5mi2yzla9d240q8jfmrav754lqr3qha-gnused-4.9" }, "aarch64-linux": { - "store_path": "/nix/store/qjwzm1rv898mzi5d616w721bswpxmwmb-gnused-4.9" + "store_path": "/nix/store/padfr2k4a9jn3wfraa31c0y6pdcpqf7q-gnused-4.9" }, "x86_64-darwin": { - "store_path": "/nix/store/hjkvi2f3vnvm2b7yvnk5vya0fwn0cfb1-gnused-4.9" + "store_path": "/nix/store/456iirldpvv5mhxx9zxrbpgmwg997b6i-gnused-4.9" }, "x86_64-linux": { - "store_path": "/nix/store/7fqp73ncnbwr5bxxszqicf6r33d9yhkw-gnused-4.9" + "store_path": "/nix/store/9zial3lqry9f7rsw31r7vs5p1mnb7lan-gnused-4.9" } } }, "go@latest": { - "last_modified": "2024-01-02T02:19:20Z", - "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#go", + "last_modified": "2024-02-08T11:55:47Z", + "resolved": "github:NixOS/nixpkgs/c0b7a892fb042ede583bdaecbbdc804acb85eabe#go_1_22", "source": "devbox-search", - "version": "1.21.5", + "version": "1.22.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/b0rpa34hn6cgbkbn8sfr5dzv723ia3z2-go-1.21.5" + "store_path": "/nix/store/2022s0jnrn2iyxjaikfy51w5fvifp38b-go-1.22.0" }, "aarch64-linux": { - "store_path": "/nix/store/5jamaixw6ni5c05qqml6ld3j386v871k-go-1.21.5" + "store_path": "/nix/store/7wxzkvjv8qc2awhagpz0r8q9ay38q3wj-go-1.22.0" }, "x86_64-darwin": { - "store_path": "/nix/store/hyzs4fhjw7zmwra5scss7hapgw22rcm5-go-1.21.5" + "store_path": "/nix/store/fgkl3qk8p5hnd07b0dhzfky3ys5gxjmq-go-1.22.0" }, "x86_64-linux": { - "store_path": "/nix/store/6qd8p8gilzgplpk2ni3109m0k71r21s7-go-1.21.5" + "store_path": "/nix/store/88y9r33p3j8f7bc8sqiy9jdlk7yqfrlg-go-1.22.0" } } }, "gojq@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gojq", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#gojq", "source": "devbox-search", "version": "0.12.14", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/7bxqkndy4ym9d1ww5r111immwpg1mqgl-gojq-0.12.14" + "store_path": "/nix/store/r1rs9iawlngbsk3xkhc98iy0wli9ah7z-gojq-0.12.14" }, "aarch64-linux": { - "store_path": "/nix/store/bkahk5pwvx1dv11i20j9izscvl9bwhr3-gojq-0.12.14" + "store_path": "/nix/store/jvg88ly2lypdn5jg9556grbfizdisrd4-gojq-0.12.14" }, "x86_64-darwin": { - "store_path": "/nix/store/jh2j2ci199gfail9gb70iq8rfwkrkj0h-gojq-0.12.14" + "store_path": "/nix/store/hljg65f22yjwgylzgx2hmys4shdfx6p1-gojq-0.12.14" }, "x86_64-linux": { - "store_path": "/nix/store/lrz1gv6wi0skr1xhqif7w897r1p7wzxg-gojq-0.12.14" + "store_path": "/nix/store/3mllrsj7a340gpb9p9vbyx044bdkps6i-gojq-0.12.14" } } }, "golines@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#golines", + "last_modified": "2024-01-28T16:40:23Z", + "resolved": "github:NixOS/nixpkgs/902d74314fae5eb824bc7b597bd4d39640345557#golines", "source": "devbox-search", - "version": "0.11.0", + "version": "0.12.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/41xcjkrw4i9qkmqm8xz8wsn4ik78m531-golines-0.11.0" + "store_path": "/nix/store/29v1zg99bykicvii8k6x460vniwbyhds-golines-0.12.2" }, "aarch64-linux": { - "store_path": "/nix/store/21k39siayn1bkvbq510sijzkycqw9zbr-golines-0.11.0" + "store_path": "/nix/store/x5hf86jv3dmx0g41v0cskybcv5wpjp4y-golines-0.12.2" }, "x86_64-darwin": { - "store_path": "/nix/store/9wsan1jf1wbzgwl0mqysz15ab0axx36r-golines-0.11.0" + "store_path": "/nix/store/ffmcdgh0mlbh0z6iygjxgplrp8z4qf9d-golines-0.12.2" }, "x86_64-linux": { - "store_path": "/nix/store/5ca0qgzz2h9x57d96rvwq4jpqbr1c8lh-golines-0.11.0" + "store_path": "/nix/store/qrxxlmxldvxspj4sryydxkl6x06s64y5-golines-0.12.2" } } }, "google-cloud-sdk@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#google-cloud-sdk", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#google-cloud-sdk", "source": "devbox-search", "version": "452.0.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/wwdbirshqqhy9ysvdlwqwpshix1nz4g5-google-cloud-sdk-452.0.1" + "store_path": "/nix/store/wjqdip2hnmg964ragz7q01kb46ay8i89-google-cloud-sdk-452.0.1" }, "aarch64-linux": { - "store_path": "/nix/store/38y37i8cwfa64w07mg7j5mjqb8i2y1g0-google-cloud-sdk-452.0.1" + "store_path": "/nix/store/cq5v6as5a7mww6v70s1ahf3q0lh7dyqn-google-cloud-sdk-452.0.1" }, "x86_64-darwin": { - "store_path": "/nix/store/4n4k61ypksqv5plnp91zx3l746647zcv-google-cloud-sdk-452.0.1" + "store_path": "/nix/store/szmp4vp4a98hp550644br4hf1pbiwdz3-google-cloud-sdk-452.0.1" }, "x86_64-linux": { - "store_path": "/nix/store/fccay4qwfabv0ac20sm13m1axc9bydan-google-cloud-sdk-452.0.1" + "store_path": "/nix/store/l06k8fr3gcjx6y0sm8fbi5wx8a18fcyq-google-cloud-sdk-452.0.1" } } }, "goreleaser@latest": { - "last_modified": "2023-12-31T07:44:09Z", - "resolved": "github:NixOS/nixpkgs/d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7#goreleaser", + "last_modified": "2024-02-07T01:22:34Z", + "resolved": "github:NixOS/nixpkgs/f8e2ebd66d097614d51a56a755450d4ae1632df1#goreleaser", "source": "devbox-search", - "version": "1.23.0", + "version": "1.24.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/c01jhnwv2qrpc3rg25d945a7wbwq3p5c-goreleaser-1.23.0" + "store_path": "/nix/store/iiw00h0wdd46hcnr2b90b6nj2a730fwz-goreleaser-1.24.0" }, "aarch64-linux": { - "store_path": "/nix/store/d5dc8d16hj50kfa5ayljldcl19z2ms1h-goreleaser-1.23.0" + "store_path": "/nix/store/sy65pqihca3ybrr4bylhvandd01cjjd1-goreleaser-1.24.0" }, "x86_64-darwin": { - "store_path": "/nix/store/9rn8kwjar253yjcq172ixrwnfrajiirz-goreleaser-1.23.0" + "store_path": "/nix/store/blyg0qmg0fnm2bcnnnlxy1gi69ja5r5m-goreleaser-1.24.0" }, "x86_64-linux": { - "store_path": "/nix/store/dma584nd1gkx3ziss6nir1w9zmwf9ayp-goreleaser-1.23.0" + "store_path": "/nix/store/m3jc0h1gdk2psjdbm9a415lldw41bmcv-goreleaser-1.24.0" } } }, "gotestsum@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gotestsum", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#gotestsum", "source": "devbox-search", "version": "1.10.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/av8bq276q2qqps3kkk3x1g24x8gw2wmi-gotestsum-1.10.1" + "store_path": "/nix/store/v6xdsi7cjd4d4461vh1k857h1aa71v6c-gotestsum-1.10.1" }, "aarch64-linux": { - "store_path": "/nix/store/73fb0ld3qk4y7prfab2p81w3zcq4rbpn-gotestsum-1.10.1" + "store_path": "/nix/store/k158x6n69bwc4ziwsz3bhkk8qky2dyvi-gotestsum-1.10.1" }, "x86_64-darwin": { - "store_path": "/nix/store/mzz63zdk1azl6jfgnk5xq07hwbmp6iij-gotestsum-1.10.1" + "store_path": "/nix/store/a36zkipccd9rwpb0g4cdxksywn94s5sp-gotestsum-1.10.1" }, "x86_64-linux": { - "store_path": "/nix/store/8ffcj537lzh186j4spzi7gr6qgv32hmn-gotestsum-1.10.1" + "store_path": "/nix/store/72i26iim65y65qgq6q9vay9pgw9wfm03-gotestsum-1.10.1" } } }, "hadolint@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#hadolint", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#hadolint", "source": "devbox-search", "version": "2.12.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/1pik10xhdbqjylrghc1iqjm90g26frif-hadolint-2.12.0" + "store_path": "/nix/store/h6f19n6x19ycs8i6vf4jm8cmxx645249-hadolint-2.12.0" }, "aarch64-linux": { - "store_path": "/nix/store/1q06v41mpbzzwa40mqx59bbcqd44yyhz-hadolint-2.12.0" + "store_path": "/nix/store/mck0yhnazkvc5afd03z35p7dk6iyypg4-hadolint-2.12.0" }, "x86_64-darwin": { - "store_path": "/nix/store/3mg3i02gh6cwl29brcwrhvvv9clbvm5p-hadolint-2.12.0" + "store_path": "/nix/store/yr0pll7prrix0cvp1szm8s4x914x24w0-hadolint-2.12.0" }, "x86_64-linux": { - "store_path": "/nix/store/71j32iz5rszdkjn79d4l8s86rg3nyd3p-hadolint-2.12.0" + "store_path": "/nix/store/b3vdwrp8qbzw5x98pf68ip4rv6yd73fc-hadolint-2.12.0" } } }, "helm-docs@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#helm-docs", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#helm-docs", "source": "devbox-search", "version": "1.11.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/5nr53dpg1z8c1sx0y32nhacxm16phrmr-helm-docs-1.11.2" + "store_path": "/nix/store/m1jhm1ph9cc10vpqbcr5qm5rwcmpjlmp-helm-docs-1.11.2" }, "aarch64-linux": { - "store_path": "/nix/store/iy2647s516rc0pi7gn0vjdaacwlxibci-helm-docs-1.11.2" + "store_path": "/nix/store/bx9i0vlqki26z6ynjr4lxlvy0sqxw6pv-helm-docs-1.11.2" }, "x86_64-darwin": { - "store_path": "/nix/store/pxwzy0ii4wgj1lj26lfk2zn148k5vsk9-helm-docs-1.11.2" + "store_path": "/nix/store/hsh422xywkkq45r165v9vifl12i90v3l-helm-docs-1.11.2" }, "x86_64-linux": { - "store_path": "/nix/store/kl5hwrwbw5xz7zfd0llrdmbnbamggwa9-helm-docs-1.11.2" + "store_path": "/nix/store/di8jpz015k1pgbwwrl87mf041rjp14iw-helm-docs-1.11.2" } } }, "kubebuilder@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubebuilder", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#kubebuilder", "source": "devbox-search", "version": "3.13.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/94dfj1pj43fd4igszrspsr96h87g85kc-kubebuilder-3.13.0" + "store_path": "/nix/store/ld01g76i76ivmgsrr2gjdvp0ibzgjz7g-kubebuilder-3.13.0" }, "aarch64-linux": { - "store_path": "/nix/store/jysi7gyhw2qia39fy1dgyqrpxs372wwc-kubebuilder-3.13.0" + "store_path": "/nix/store/w4iw9cqcn0fqgrjz33jbs0fwlshxiik0-kubebuilder-3.13.0" }, "x86_64-darwin": { - "store_path": "/nix/store/rpfikfwvmjp081a8v6fgi998xbcgz3iw-kubebuilder-3.13.0" + "store_path": "/nix/store/0bg5nxc6gvadx0l3sqjiqhszwsgbz67b-kubebuilder-3.13.0" }, "x86_64-linux": { - "store_path": "/nix/store/2vis2xc91003qb8clxmmvfrl0lq5lypn-kubebuilder-3.13.0" + "store_path": "/nix/store/c3nj4xdyj9vdkk5acgyrbg44pf4xyprd-kubebuilder-3.13.0" } } }, "kubectl@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubectl", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#kubectl", "source": "devbox-search", "version": "1.28.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/n082kkafm88sckhn6dib17mr0izmgvgv-kubectl-1.28.4" + "store_path": "/nix/store/xhfs94kdg9v6p4gbnfn5xk4c862jhipl-kubectl-1.28.4" }, "aarch64-linux": { - "store_path": "/nix/store/ga2yx93m6hmdds1j42whq323jmdbr4ph-kubectl-1.28.4" + "store_path": "/nix/store/r9kj0y745xz6dygjrvrbwf3cqzcs9zay-kubectl-1.28.4" }, "x86_64-darwin": { - "store_path": "/nix/store/340l2mgfk0bw31ssdxagny5rbimqxk9z-kubectl-1.28.4" + "store_path": "/nix/store/8h8yj0mc216paxkpqp4aqf5yc2yklmv0-kubectl-1.28.4" }, "x86_64-linux": { - "store_path": "/nix/store/wmz6qf68wysh6k8iqpqsbjpmwrxvwjcr-kubectl-1.28.4" + "store_path": "/nix/store/dgbjz1q86g8kr7pxqrw81gjhnkkwh375-kubectl-1.28.4" } } }, "kubernetes-code-generator@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubernetes-code-generator", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#kubernetes-code-generator", "source": "devbox-search", "version": "0.25.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/08r60dx9vcc925rv8vgc7s0k00msl7nf-code-generator-0.25.4" + "store_path": "/nix/store/9nqbgd9pj8r411lp4596549bf3gjrmjk-code-generator-0.25.4" }, "aarch64-linux": { - "store_path": "/nix/store/cmlm43faanv42f2xgq6a5j9m1xar79wz-code-generator-0.25.4" + "store_path": "/nix/store/kdylmfnmgavf142qwyllr65cabc44v09-code-generator-0.25.4" }, "x86_64-darwin": { - "store_path": "/nix/store/2ndss5lqjv40dwy9rq7594r3azd3ygpj-code-generator-0.25.4" + "store_path": "/nix/store/xd38jp1m5758xvj25p6qv95bwx3maz71-code-generator-0.25.4" }, "x86_64-linux": { - "store_path": "/nix/store/9l38zjs0cb9kqrjqphpj1v3q5a6xrwcw-code-generator-0.25.4" + "store_path": "/nix/store/6dfgzljb2xf29cgpx2pb4wmlszm33c49-code-generator-0.25.4" } } }, "kubernetes-controller-tools@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubernetes-controller-tools", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#kubernetes-controller-tools", "source": "devbox-search", "version": "0.13.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/32mibfrldlbqkxims4crpvfk1bmarv2d-controller-tools-0.13.0" + "store_path": "/nix/store/q3pv6lm485ffbjia8hpy1x44hagnjr5h-controller-tools-0.13.0" }, "aarch64-linux": { - "store_path": "/nix/store/5kvj16qj8gnk4lgyi8sq79x10zx7c1ms-controller-tools-0.13.0" + "store_path": "/nix/store/jfpmxzxx45s716z6z8grm19wxiyizv33-controller-tools-0.13.0" }, "x86_64-darwin": { - "store_path": "/nix/store/b048lh1hhp4p5mybhxnfwarzwpgbnnid-controller-tools-0.13.0" + "store_path": "/nix/store/l3d5bdfx6xrrswdl9mvs067x8j4drzag-controller-tools-0.13.0" }, "x86_64-linux": { - "store_path": "/nix/store/wv1wjirfx5yp0xwr6fnhczsnp1wv9ypj-controller-tools-0.13.0" + "store_path": "/nix/store/igy1ls1srcqxj89mj2vxv0wb1fpqkcfa-controller-tools-0.13.0" } } }, "kubernetes-helm@latest": { - "last_modified": "2023-12-18T02:58:18Z", - "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#kubernetes-helm", + "last_modified": "2024-02-05T02:15:44Z", + "resolved": "github:NixOS/nixpkgs/0a254180b4cad6be45aa46dce896bdb8db5d2930#kubernetes-helm", "source": "devbox-search", - "version": "3.13.3", + "version": "3.14.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/xi03fpngzw36kbrqarxvsj63jjmf7rqi-kubernetes-helm-3.13.3" + "store_path": "/nix/store/yf7yqb2vj1lz3gak1ks3y49jc3s4lvrf-kubernetes-helm-3.14.0" }, "aarch64-linux": { - "store_path": "/nix/store/z6bvs0p0aw9gzn10zir418hqzw870pv9-kubernetes-helm-3.13.3" + "store_path": "/nix/store/l7792lmxgplsdmv4j3725p24cbg64r85-kubernetes-helm-3.14.0" }, "x86_64-darwin": { - "store_path": "/nix/store/h4px88vkjzzxjiyh0xrfi420piq7z3f7-kubernetes-helm-3.13.3" + "store_path": "/nix/store/d7mv4rrivbg149q7cdsp6nnlxnv00pw8-kubernetes-helm-3.14.0" }, "x86_64-linux": { - "store_path": "/nix/store/74ih2yj0whsy5737mhi39112s3akfdsj-kubernetes-helm-3.13.3" + "store_path": "/nix/store/4pmm72nvdd2i0cs67y0sbg7b1lk5f84d-kubernetes-helm-3.14.0" } } }, "pre-commit@latest": { - "last_modified": "2024-01-02T02:19:20Z", - "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#pre-commit", + "last_modified": "2024-01-28T16:40:23Z", + "resolved": "github:NixOS/nixpkgs/902d74314fae5eb824bc7b597bd4d39640345557#pre-commit", "source": "devbox-search", "version": "3.6.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/sk456nhh6xj6y88qkdb97qpssr1ck31c-pre-commit-3.6.0" + "store_path": "/nix/store/a20aq6qhs0zz7dj9131diyn8sc5bb9qd-pre-commit-3.6.0" }, "aarch64-linux": { - "store_path": "/nix/store/jl6qkmixqydw7bmrdxk49zyn8mdjqrar-pre-commit-3.6.0" + "store_path": "/nix/store/rvhjwfaky3vkclxk31ns0lhcynnjikyh-pre-commit-3.6.0" }, "x86_64-darwin": { - "store_path": "/nix/store/5a8p2s1nm9m0a9xqxwljxmgvhknz30p8-pre-commit-3.6.0" + "store_path": "/nix/store/05hqvj5z9jscc9lx2l8ma0yf258a6kls-pre-commit-3.6.0" }, "x86_64-linux": { - "store_path": "/nix/store/f1p24lcpbx448qhhxwnmvil6f8q6776w-pre-commit-3.6.0" + "store_path": "/nix/store/wzybq4394zfr3m5p0khs02i66x33cc8i-pre-commit-3.6.0" } } }, "shfmt@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#shfmt", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#shfmt", "source": "devbox-search", "version": "3.7.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/kgw4ys2z4hrblaxfrcar8ypq0mrv82gw-shfmt-3.7.0" + "store_path": "/nix/store/k0jjqapfikg60p6sqx62xrcqw6i5zl0s-shfmt-3.7.0" }, "aarch64-linux": { - "store_path": "/nix/store/xaa1mcpb6jx2220qkd8c1m86awz13qav-shfmt-3.7.0" + "store_path": "/nix/store/xx47ra9ng1lhfifal7wgjhbkcskjvyxw-shfmt-3.7.0" }, "x86_64-darwin": { - "store_path": "/nix/store/gbr94vv3n6q2xa8z2fjl6igd4a79k6x2-shfmt-3.7.0" + "store_path": "/nix/store/6gdfkrs3h691d07qfxn4gs17dlpq1rav-shfmt-3.7.0" }, "x86_64-linux": { - "store_path": "/nix/store/5fn1zb72dgyy689jpdwh27s979jv2l1g-shfmt-3.7.0" + "store_path": "/nix/store/plz665y0qqhiqc0ys3nwnvlq262ka24b-shfmt-3.7.0" } } }, "upx@latest": { - "last_modified": "2024-01-07T11:22:52Z", - "resolved": "github:NixOS/nixpkgs/24fe8bb4f552ad3926274d29e083b79d84707da6#upx", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#upx", "source": "devbox-search", "version": "4.2.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/v80hrk8l1rms4ncjf5qggjb7ixp761aa-upx-4.2.2" + "store_path": "/nix/store/pv1bi5h5sz120gmf6a8g0rbk4mpsyjlc-upx-4.2.2" }, "aarch64-linux": { - "store_path": "/nix/store/iw30xd6yv3234id8hiqkl0k0i5wvgh7z-upx-4.2.2" + "store_path": "/nix/store/xmzgc3hamya98h69w63r5g291yjy6k96-upx-4.2.2" }, "x86_64-darwin": { - "store_path": "/nix/store/6bh1qm9mihaayn1b4af49nx7g4n312rd-upx-4.2.2" + "store_path": "/nix/store/63c5bhzl5dzc1g128gw4qgllahkhdn7v-upx-4.2.2" }, "x86_64-linux": { - "store_path": "/nix/store/ds7igh21mlqzhis0dsj6cpb3vn80zx3r-upx-4.2.2" + "store_path": "/nix/store/7szd9lb7gdp2rzbfssq5j1xfxj230mcw-upx-4.2.2" } } }, "yamale@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#yamale", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#yamale", "source": "devbox-search", "version": "4.0.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/mzw94wrz08016zl4jqfr8shrb0rl8pnb-python3.11-yamale-4.0.4" + "store_path": "/nix/store/hz3694fjayn0sbj43vj5q6xhjqpn2pic-python3.11-yamale-4.0.4" }, "aarch64-linux": { - "store_path": "/nix/store/k25dkkb81s31vnilwjvkxrg299p6jcyr-python3.11-yamale-4.0.4" + "store_path": "/nix/store/g6bj3qdl0z64x0d7fggzm9ad0nz67108-python3.11-yamale-4.0.4" }, "x86_64-darwin": { - "store_path": "/nix/store/slqxs564zddsasak7015dik8c3q7vfb6-python3.11-yamale-4.0.4" + "store_path": "/nix/store/9ysxyz89mazqbvgb7n547fy30ywnwlxn-python3.11-yamale-4.0.4" }, "x86_64-linux": { - "store_path": "/nix/store/6ls72vnrqkz5srnb942x2cy1liga7106-python3.11-yamale-4.0.4" + "store_path": "/nix/store/ih0kz9sr5dbd78j6fffg2mc7sm4rhzzr-python3.11-yamale-4.0.4" } } }, "yamllint@latest": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#yamllint", + "last_modified": "2024-01-27T14:55:31Z", + "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#yamllint", "source": "devbox-search", "version": "1.33.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/inyipsq4qdzmai4791zl542dl9995l4w-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/8vmkh2ryjy2l3lqkbjm5y56bam2jf6fi-python3.11-yamllint-1.33.0" }, "aarch64-linux": { - "store_path": "/nix/store/2y28v3lrnv3m9zgxgksdzjxq3p8n6x4m-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/pm0rpibz6hrmp53z13xz6jnn3pbp5xxw-python3.11-yamllint-1.33.0" }, "x86_64-darwin": { - "store_path": "/nix/store/7f02h17wxc5agk4aqlmzg9had3k6w3kz-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/qlrfz1q3a46hyjqsy34nl2529g093fdy-python3.11-yamllint-1.33.0" }, "x86_64-linux": { - "store_path": "/nix/store/pab7c31znj2lk0w4iw07ay8r8pzfl6q1-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/hq2j2ddxvgrhsxzgic1c3s4rhifn81hg-python3.11-yamllint-1.33.0" } } } diff --git a/go.mod b/go.mod index 0faeb4c..c410586 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,7 @@ module github.com/mesosphere/dynamic-credential-provider go 1.21 require ( - github.com/distribution/distribution/v3 v3.0.0-20230519140516-983358f8e250 - github.com/docker/distribution v2.8.3+incompatible + github.com/distribution/reference v0.5.0 github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.5.0 github.com/foomo/htpasswd v0.0.0-20200116085101-e3a90e78da9c @@ -55,8 +54,9 @@ require ( github.com/containerd/log v0.1.0 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/distribution/reference v0.5.0 // indirect + github.com/distribution/distribution/v3 v3.0.0-alpha.1 // indirect github.com/docker/cli v24.0.6+incompatible // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/docker/go-metrics v0.0.1 // indirect github.com/docker/go-units v0.5.0 // indirect @@ -64,7 +64,7 @@ require ( github.com/evanphx/json-patch v5.7.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/color v1.13.0 // indirect - github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-gorp/gorp/v3 v3.1.0 // indirect github.com/go-logr/logr v1.4.1 // indirect @@ -82,8 +82,8 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/gorilla/mux v1.8.0 // indirect + github.com/google/uuid v1.3.1 // indirect + github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect @@ -95,7 +95,7 @@ require ( github.com/jmoiron/sqlx v1.3.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/lib/pq v1.10.9 // indirect @@ -135,10 +135,10 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect - go.opentelemetry.io/otel v1.19.0 // indirect - go.opentelemetry.io/otel/metric v1.19.0 // indirect - go.opentelemetry.io/otel/trace v1.19.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect + go.opentelemetry.io/otel v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/trace v1.21.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect @@ -154,7 +154,7 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.58.3 // indirect + google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 3ec8671..87e9935 100644 --- a/go.sum +++ b/go.sum @@ -26,8 +26,6 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= -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/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= @@ -41,12 +39,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= 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/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -64,6 +58,8 @@ github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -74,8 +70,10 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/distribution/distribution/v3 v3.0.0-20230519140516-983358f8e250 h1:B3eXeuNArF23dRKyO8RXRiL7YAJDus6B7bjXeYPt87k= -github.com/distribution/distribution/v3 v3.0.0-20230519140516-983358f8e250/go.mod h1:t1IxPNGdTGez+YGKyJyQrtSSqisfMIm1hnFhvMPlxtE= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/distribution/distribution/v3 v3.0.0-alpha.1 h1:jn7I1gvjOvmLztH1+1cLiUFud7aeJCIQcgzugtwjyJo= +github.com/distribution/distribution/v3 v3.0.0-alpha.1/go.mod h1:LCp4JZp1ZalYg0W/TN05jarCQu+h4w7xc7ZfQF4Y/cY= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= @@ -109,8 +107,8 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwC github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/foomo/htpasswd v0.0.0-20200116085101-e3a90e78da9c h1:DBGU7zCwrrPPDsD6+gqKG8UfMxenWg9BOJE/Nmfph+4= github.com/foomo/htpasswd v0.0.0-20200116085101-e3a90e78da9c/go.mod h1:SHawtolbB0ZOFoRWgDwakX5WpwuIWAK88bUXVZqK0Ss= github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI= @@ -171,8 +169,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= -github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -196,12 +192,12 @@ github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -209,13 +205,19 @@ github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= 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= 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/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw= +github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU= +github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4= +github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -242,8 +244,8 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= 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.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -365,6 +367,12 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho= +github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U= +github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc= +github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ= +github.com/redis/go-redis/v9 v9.1.0 h1:137FnGdk+EQdCbye1FW+qOEcY5S+SpY9T0NiuqvtfMY= +github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH1cY3lZl4c= 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= @@ -416,24 +424,42 @@ github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 h1:ysCfPZB9AjUlMa1UHYup3c9dAOCMQX/6sxSfPBUoxHw= +go.opentelemetry.io/contrib/exporters/autoexport v0.46.1/go.mod h1:ha0aiYm+DOPsLHjh0zoQ8W8sLT+LJ58J3j47lGpSLrU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 h1:jd0+5t/YynESZqsSyPz+7PAFdEop0dlN0+PkyHYo8oI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0/go.mod h1:U707O40ee1FpQGyhvqnzmCJm1Wh6OX6GGBVn0E6Uyyk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 h1:bflGWrfYyuulcdxf14V6n9+CoQcu5SAAdHmDPAJnlps= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0/go.mod h1:qcTO4xHAxZLaLxPd60TdE88rxtItPHgHWqOhOGRr0as= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= +go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 h1:dEZWPjVN22urgYCza3PXRUGEyCB++y1sAqm6guWFesk= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0/go.mod h1:sTt30Evb7hJB/gEk27qLb1+l9n4Tb8HvHkR0Wx3S6CU= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 h1:VhlEQAPp9R1ktYfrPk5SOryw1e9LDDTZCbIPFrho0ec= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0/go.mod h1:kB3ufRbfU+CQ4MlUcqtW8Z7YEOBeK2DJ6CmR5rYYF3E= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0= +go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -550,13 +576,16 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/hack/flakes/flake.lock b/hack/flakes/flake.lock index 45bd9d6..f4de6ef 100644 --- a/hack/flakes/flake.lock +++ b/hack/flakes/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705303754, - "narHash": "sha256-loWkd7lUzSvGBU9xnva37iPB2rr5ulq1qBLT44KjzGA=", + "lastModified": 1707619277, + "narHash": "sha256-vKnYD5GMQbNQyyQm4wRlqi+5n0/F1hnvqSQgaBy4BqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0629618b4b419a47e2c8a3cab223e2a7f3a8f97", + "rev": "f3a93440fbfff8a74350f4791332a19282cc6dc8", "type": "github" }, "original": { diff --git a/make/pre-commit.mk b/make/pre-commit.mk index dadcb52..719d35b 100644 --- a/make/pre-commit.mk +++ b/make/pre-commit.mk @@ -13,6 +13,7 @@ pre-commit: ; $(info $(M) running pre-commit) ifeq ($(wildcard $(PRE_COMMIT_CONFIG_FILE)),) $(error Cannot find pre-commit config file $(PRE_COMMIT_CONFIG_FILE). Specify the config file via PRE_COMMIT_CONFIG_FILE variable) endif + env VIRTUALENV_PIP=24.0 pre-commit install-hooks env SKIP=$(SKIP) pre-commit run -a --show-diff-on-failure --config $(PRE_COMMIT_CONFIG_FILE) git fetch origin main pre-commit run --hook-stage manual gitlint-ci diff --git a/pkg/credentialprovider/dynamic/dynamic_test.go b/pkg/credentialprovider/dynamic/dynamic_test.go index 2706513..11f3fc9 100644 --- a/pkg/credentialprovider/dynamic/dynamic_test.go +++ b/pkg/credentialprovider/dynamic/dynamic_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" "github.com/mesosphere/dynamic-credential-provider/pkg/credentialprovider/dynamic" @@ -26,6 +26,8 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { dummyImageFmt = "img.%s/abc/def:v1.2.3" mirrorUser = "mirroruser" mirrorPassword = "mirrorpassword" + testUser = "testuser" + testPassword = "testpassword" wildcardDomain = "*.*" credentialProviderResponseKind = "CredentialProviderResponse" //nolint:gosec // No actual credentials here. ) @@ -48,12 +50,12 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { cfgFile: filepath.Join("testdata", "config-with-mirror-only.yaml"), img: fmt.Sprintf(dummyImageFmt, v), want: &credentialproviderv1.CredentialProviderResponse{ - TypeMeta: v1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: credentialproviderv1.SchemeGroupVersion.String(), Kind: credentialProviderResponseKind, }, CacheKeyType: credentialproviderv1.ImagePluginCacheKeyType, - CacheDuration: &v1.Duration{Duration: expectedDummyDuration}, + CacheDuration: &metav1.Duration{Duration: expectedDummyDuration}, Auth: map[string]credentialproviderv1.AuthConfig{ fmt.Sprintf(dummyImageFmt, v): { Username: mirrorUser, @@ -67,20 +69,20 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { cfgFile: filepath.Join("testdata", "config-with-mirror-first.yaml"), img: fmt.Sprintf(dummyImageFmt, v), want: &credentialproviderv1.CredentialProviderResponse{ - TypeMeta: v1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: credentialproviderv1.SchemeGroupVersion.String(), Kind: credentialProviderResponseKind, }, CacheKeyType: credentialproviderv1.ImagePluginCacheKeyType, - CacheDuration: &v1.Duration{Duration: expectedDummyDuration}, + CacheDuration: &metav1.Duration{Duration: expectedDummyDuration}, Auth: map[string]credentialproviderv1.AuthConfig{ fmt.Sprintf(dummyImageFmt, v): { Username: mirrorUser, Password: mirrorPassword, }, wildcardDomain: { - Username: v + "user", - Password: v + "password", + Username: v + testUser, + Password: v + testPassword, }, }, }, @@ -90,20 +92,20 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { cfgFile: filepath.Join("testdata", "config-with-mirror-last.yaml"), img: fmt.Sprintf(dummyImageFmt, v), want: &credentialproviderv1.CredentialProviderResponse{ - TypeMeta: v1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: credentialproviderv1.SchemeGroupVersion.String(), Kind: credentialProviderResponseKind, }, CacheKeyType: credentialproviderv1.ImagePluginCacheKeyType, - CacheDuration: &v1.Duration{Duration: expectedDummyDuration}, + CacheDuration: &metav1.Duration{Duration: expectedDummyDuration}, Auth: map[string]credentialproviderv1.AuthConfig{ wildcardDomain: { Username: mirrorUser, Password: mirrorPassword, }, fmt.Sprintf(dummyImageFmt, v): { - Username: v + "user", - Password: v + "password", + Username: v + testUser, + Password: v + testPassword, }, }, }, @@ -113,12 +115,12 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { cfgFile: filepath.Join("testdata", "config-with-mirror-last.yaml"), img: "noorigin/image:v1.2.3.4", want: &credentialproviderv1.CredentialProviderResponse{ - TypeMeta: v1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: credentialproviderv1.SchemeGroupVersion.String(), Kind: credentialProviderResponseKind, }, CacheKeyType: credentialproviderv1.ImagePluginCacheKeyType, - CacheDuration: &v1.Duration{Duration: expectedDummyDuration}, + CacheDuration: &metav1.Duration{Duration: expectedDummyDuration}, Auth: map[string]credentialproviderv1.AuthConfig{ wildcardDomain: {Username: mirrorUser, Password: mirrorPassword}, }, @@ -129,16 +131,16 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { cfgFile: filepath.Join("testdata", "config-no-mirror.yaml"), img: fmt.Sprintf(dummyImageFmt, v), want: &credentialproviderv1.CredentialProviderResponse{ - TypeMeta: v1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: credentialproviderv1.SchemeGroupVersion.String(), Kind: credentialProviderResponseKind, }, CacheKeyType: credentialproviderv1.ImagePluginCacheKeyType, - CacheDuration: &v1.Duration{Duration: expectedDummyDuration}, + CacheDuration: &metav1.Duration{Duration: expectedDummyDuration}, Auth: map[string]credentialproviderv1.AuthConfig{ fmt.Sprintf(dummyImageFmt, v): { - Username: v + "user", - Password: v + "password", + Username: v + testUser, + Password: v + testPassword, }, }, }, @@ -148,12 +150,12 @@ func Test_dynamicProvider_GetCredentials(t *testing.T) { cfgFile: filepath.Join("testdata", "config-with-mirror-with-path-only.yaml"), img: fmt.Sprintf(dummyImageFmt, v), want: &credentialproviderv1.CredentialProviderResponse{ - TypeMeta: v1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: credentialproviderv1.SchemeGroupVersion.String(), Kind: credentialProviderResponseKind, }, CacheKeyType: credentialproviderv1.ImagePluginCacheKeyType, - CacheDuration: &v1.Duration{Duration: expectedDummyDuration}, + CacheDuration: &metav1.Duration{Duration: expectedDummyDuration}, Auth: map[string]credentialproviderv1.AuthConfig{ fmt.Sprintf(dummyImageFmt, v): { Username: mirrorUser, diff --git a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1-withpath.sh b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1-withpath.sh index 180a437..76fea2e 100755 --- a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1-withpath.sh +++ b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1-withpath.sh @@ -12,6 +12,6 @@ echo '{ "cacheKeyType":"Image", "cacheDuration":"5s", "auth":{ - "*.v1withpath/apath": {"username":"v1withpath/apathuser","password":"v1withpath/apathpassword"} + "*.v1withpath/apath": {"username":"v1withpath/apathtestuser","password":"v1withpath/apathtestpassword"} } }' diff --git a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1.sh b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1.sh index 5c53a33..ade0e8d 100755 --- a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1.sh +++ b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1.sh @@ -12,6 +12,6 @@ echo '{ "cacheKeyType":"Image", "cacheDuration":"5s", "auth":{ - "*.v1": {"username":"v1user","password":"v1password"} + "*.v1": {"username":"v1testuser","password":"v1testpassword"} } }' diff --git a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1alpha1.sh b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1alpha1.sh index 6817b1a..bbc4733 100755 --- a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1alpha1.sh +++ b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1alpha1.sh @@ -12,6 +12,6 @@ echo '{ "cacheKeyType":"Image", "cacheDuration":"5s", "auth":{ - "*.v1alpha1": {"username":"v1alpha1user","password":"v1alpha1password"} + "*.v1alpha1": {"username":"v1alpha1testuser","password":"v1alpha1testpassword"} } }' diff --git a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1beta1.sh b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1beta1.sh index 42d27f2..da39f63 100755 --- a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1beta1.sh +++ b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-v1beta1.sh @@ -12,6 +12,6 @@ echo '{ "cacheKeyType":"Image", "cacheDuration":"5s", "auth":{ - "*.v1beta1": {"username":"v1beta1user","password":"v1beta1password"} + "*.v1beta1": {"username":"v1beta1testuser","password":"v1beta1testpassword"} } }' diff --git a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-wildcard.sh b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-wildcard.sh index 24d94e2..c6cba32 100755 --- a/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-wildcard.sh +++ b/pkg/credentialprovider/dynamic/testdata/staticcredentialprovider-wildcard.sh @@ -12,6 +12,6 @@ echo '{ "cacheKeyType":"Image", "cacheDuration":"5s", "auth":{ - "*.*": {"username":"wildcarduser","password":"wildcardpassword"} + "*.*": {"username":"wildcardtestuser","password":"wildcardtestpassword"} } }' diff --git a/pkg/credentialprovider/plugin/plugin.go b/pkg/credentialprovider/plugin/plugin.go index 6f485a7..918e854 100644 --- a/pkg/credentialprovider/plugin/plugin.go +++ b/pkg/credentialprovider/plugin/plugin.go @@ -16,7 +16,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/json" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/kubelet/pkg/apis/credentialprovider/install" - v1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" + credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" ) var ( @@ -27,7 +27,7 @@ var ( //nolint:gochecknoinits // init is idiomatically used to set up schemes func init() { install.Install(scheme) - utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion)) + utilruntime.Must(scheme.SetVersionPriority(credentialproviderv1.SchemeGroupVersion)) } // CredentialProvider is an interface implemented by the kubelet credential provider plugin to fetch @@ -37,7 +37,7 @@ type CredentialProvider interface { ctx context.Context, image string, args []string, - ) (*v1.CredentialProviderResponse, error) + ) (*credentialproviderv1.CredentialProviderResponse, error) } // ExecPlugin implements the exec-based plugin for fetching credentials that is invoked by the kubelet. @@ -76,7 +76,7 @@ func (e *ExecPlugin) runPlugin(ctx context.Context, r io.Reader, w io.Writer, ar return err } - if gvk.GroupVersion() != v1.SchemeGroupVersion { + if gvk.GroupVersion() != credentialproviderv1.SchemeGroupVersion { return fmt.Errorf("%w: %s", ErrUnsupportedAPIVersion, gvk) } @@ -119,8 +119,9 @@ var ( ErrConversionFailure = errors.New("conversion failure") ) -func decodeRequest(data []byte) (*v1.CredentialProviderRequest, error) { - obj, gvk, err := codecs.UniversalDecoder(v1.SchemeGroupVersion).Decode(data, nil, nil) +func decodeRequest(data []byte) (*credentialproviderv1.CredentialProviderRequest, error) { + obj, gvk, err := codecs.UniversalDecoder(credentialproviderv1.SchemeGroupVersion). + Decode(data, nil, nil) if err != nil { if runtime.IsNotRegisteredError(err) { return nil, fmt.Errorf("%w: %v", ErrUnsupportedRequestKind, err) @@ -136,14 +137,14 @@ func decodeRequest(data []byte) (*v1.CredentialProviderRequest, error) { ) } - if gvk.Group != v1.GroupName { + if gvk.Group != credentialproviderv1.GroupName { return nil, fmt.Errorf( "%w: %s (expected %s)", - ErrUnsupportedAPIVersion, gvk.GroupVersion(), v1.SchemeGroupVersion, + ErrUnsupportedAPIVersion, gvk.GroupVersion(), credentialproviderv1.SchemeGroupVersion, ) } - request, ok := obj.(*v1.CredentialProviderRequest) + request, ok := obj.(*credentialproviderv1.CredentialProviderRequest) if !ok { return nil, fmt.Errorf( "%w: unable to convert %T to *CredentialProviderRequest", @@ -155,14 +156,14 @@ func decodeRequest(data []byte) (*v1.CredentialProviderRequest, error) { return request, nil } -func encodeResponse(response *v1.CredentialProviderResponse) ([]byte, error) { +func encodeResponse(response *credentialproviderv1.CredentialProviderResponse) ([]byte, error) { mediaType := "application/json" info, ok := runtime.SerializerInfoForMediaType(codecs.SupportedMediaTypes(), mediaType) if !ok { return nil, fmt.Errorf("unsupported media type %q", mediaType) } - encoder := codecs.EncoderForVersion(info.Serializer, v1.SchemeGroupVersion) + encoder := codecs.EncoderForVersion(info.Serializer, credentialproviderv1.SchemeGroupVersion) data, err := runtime.Encode(encoder, response) if err != nil { return nil, fmt.Errorf("failed to encode response: %v", err) diff --git a/pkg/credentialprovider/plugin/plugin_test.go b/pkg/credentialprovider/plugin/plugin_test.go index e571313..bc06eaa 100644 --- a/pkg/credentialprovider/plugin/plugin_test.go +++ b/pkg/credentialprovider/plugin/plugin_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" + credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" ) type fakePlugin struct{} @@ -21,12 +21,12 @@ func (fakePlugin) GetCredentials( _ context.Context, _ string, _ []string, -) (*v1.CredentialProviderResponse, error) { - return &v1.CredentialProviderResponse{ - CacheKeyType: v1.RegistryPluginCacheKeyType, +) (*credentialproviderv1.CredentialProviderResponse, error) { + return &credentialproviderv1.CredentialProviderResponse{ + CacheKeyType: credentialproviderv1.RegistryPluginCacheKeyType, //nolint:revive // Dummy value in test file, no need for const. CacheDuration: &metav1.Duration{Duration: 10 * time.Minute}, - Auth: map[string]v1.AuthConfig{ + Auth: map[string]credentialproviderv1.AuthConfig{ "*.registry.io": { Username: "user", Password: "password", diff --git a/pkg/credentialprovider/static/static_credentials.go b/pkg/credentialprovider/static/static_credentials.go index 19f899f..b27bb12 100644 --- a/pkg/credentialprovider/static/static_credentials.go +++ b/pkg/credentialprovider/static/static_credentials.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kubelet/pkg/apis/credentialprovider/install" - v1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" + credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" "github.com/mesosphere/dynamic-credential-provider/pkg/credentialprovider/plugin" ) @@ -41,7 +41,7 @@ func (s staticProvider) GetCredentials( _ context.Context, _ string, _ []string, -) (response *v1.CredentialProviderResponse, err error) { +) (response *credentialproviderv1.CredentialProviderResponse, err error) { credentials, err := os.ReadFile(s.credentialsFile) if err != nil { return nil, fmt.Errorf("error reading credentials file: %w", err) @@ -50,8 +50,9 @@ func (s staticProvider) GetCredentials( return decodeResponse(credentials) } -func decodeResponse(data []byte) (*v1.CredentialProviderResponse, error) { - obj, gvk, err := codecs.UniversalDecoder(v1.SchemeGroupVersion).Decode(data, nil, nil) +func decodeResponse(data []byte) (*credentialproviderv1.CredentialProviderResponse, error) { + obj, gvk, err := codecs.UniversalDecoder(credentialproviderv1.SchemeGroupVersion). + Decode(data, nil, nil) if err != nil { return nil, err } @@ -60,11 +61,15 @@ func decodeResponse(data []byte) (*v1.CredentialProviderResponse, error) { return nil, fmt.Errorf("kind was %q, expected CredentialProviderResponse", gvk.Kind) } - if gvk.Group != v1.GroupName { - return nil, fmt.Errorf("group was %q, expected %s", gvk.Group, v1.GroupName) + if gvk.Group != credentialproviderv1.GroupName { + return nil, fmt.Errorf( + "group was %q, expected %s", + gvk.Group, + credentialproviderv1.GroupName, + ) } - response, ok := obj.(*v1.CredentialProviderResponse) + response, ok := obj.(*credentialproviderv1.CredentialProviderResponse) if !ok { return nil, fmt.Errorf("unable to convert %T to *CredentialProviderResponse", obj) } diff --git a/pkg/credentialprovider/static/static_credentials_test.go b/pkg/credentialprovider/static/static_credentials_test.go index 1782af8..746c0bd 100644 --- a/pkg/credentialprovider/static/static_credentials_test.go +++ b/pkg/credentialprovider/static/static_credentials_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" + credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" "github.com/mesosphere/dynamic-credential-provider/pkg/credentialprovider/static" ) @@ -30,7 +30,7 @@ func TestGetCredentials(t *testing.T) { name string in string credentialsString string - expectedOut *v1.CredentialProviderResponse + expectedOut *credentialproviderv1.CredentialProviderResponse expectErr bool }{ { @@ -93,15 +93,15 @@ func generateResponse( duration time.Duration, username string, password string, -) *v1.CredentialProviderResponse { - return &v1.CredentialProviderResponse{ +) *credentialproviderv1.CredentialProviderResponse { + return &credentialproviderv1.CredentialProviderResponse{ TypeMeta: metav1.TypeMeta{ Kind: "CredentialProviderResponse", APIVersion: "credentialprovider.kubelet.k8s.io/v1", }, - CacheKeyType: v1.RegistryPluginCacheKeyType, + CacheKeyType: credentialproviderv1.RegistryPluginCacheKeyType, CacheDuration: &metav1.Duration{Duration: duration}, - Auth: map[string]v1.AuthConfig{ + Auth: map[string]credentialproviderv1.AuthConfig{ registry: { Username: username, Password: password, diff --git a/pkg/urlglobber/globber.go b/pkg/urlglobber/globber.go index 0916fca..ba37379 100644 --- a/pkg/urlglobber/globber.go +++ b/pkg/urlglobber/globber.go @@ -9,7 +9,7 @@ import ( "net" "regexp" - "github.com/distribution/distribution/v3/reference" + "github.com/distribution/reference" ) var ( diff --git a/test/e2e/docker/client.go b/test/e2e/docker/client.go index 9eb5a5c..8f47fb5 100644 --- a/test/e2e/docker/client.go +++ b/test/e2e/docker/client.go @@ -17,6 +17,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" ) @@ -207,7 +208,7 @@ func RetagAndPushImage( //nolint:revive // Lots of args is fine in these tests. } func authString(username, password string) string { - authConfig := types.AuthConfig{ + authConfig := registry.AuthConfig{ Username: username, Password: password, } diff --git a/test/e2e/suites/mirror/dynamic_credentials_test.go b/test/e2e/suites/mirror/dynamic_credentials_test.go index 4ed4898..afa85ca 100644 --- a/test/e2e/suites/mirror/dynamic_credentials_test.go +++ b/test/e2e/suites/mirror/dynamic_credentials_test.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/sethvargo/go-password/password" @@ -27,7 +27,7 @@ import ( applycorev1 "k8s.io/client-go/applyconfigurations/core/v1" applymetav1 "k8s.io/client-go/applyconfigurations/meta/v1" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "sigs.k8s.io/cli-utils/pkg/kstatus/status" "github.com/mesosphere/dynamic-credential-provider/test/e2e/docker" @@ -80,11 +80,11 @@ var _ = Describe("Successful", ctx, &applycorev1.SecretApplyConfiguration{ TypeMetaApplyConfiguration: applymetav1.TypeMetaApplyConfiguration{ - APIVersion: pointer.String(corev1.SchemeGroupVersion.String()), - Kind: pointer.String("Secret"), + APIVersion: ptr.To(corev1.SchemeGroupVersion.String()), + Kind: ptr.To("Secret"), }, ObjectMetaApplyConfiguration: &applymetav1.ObjectMetaApplyConfiguration{ - Name: pointer.String("dynamiccredentialproviderconfig"), + Name: ptr.To("dynamiccredentialproviderconfig"), }, StringData: map[string]string{ "dynamic-credential-provider-config.yaml": buf.String(), @@ -111,11 +111,11 @@ var _ = Describe("Successful", ctx, &applycorev1.SecretApplyConfiguration{ TypeMetaApplyConfiguration: applymetav1.TypeMetaApplyConfiguration{ - APIVersion: pointer.String(corev1.SchemeGroupVersion.String()), - Kind: pointer.String("Secret"), + APIVersion: ptr.To(corev1.SchemeGroupVersion.String()), + Kind: ptr.To("Secret"), }, ObjectMetaApplyConfiguration: &applymetav1.ObjectMetaApplyConfiguration{ - Name: pointer.String("staticcredentialproviderauth"), + Name: ptr.To("staticcredentialproviderauth"), }, StringData: map[string]string{ "static-image-credentials.json": buf.String(), @@ -270,11 +270,11 @@ var _ = Describe("Successful", ctx, &applycorev1.SecretApplyConfiguration{ TypeMetaApplyConfiguration: applymetav1.TypeMetaApplyConfiguration{ - APIVersion: pointer.String(corev1.SchemeGroupVersion.String()), - Kind: pointer.String("Secret"), + APIVersion: ptr.To(corev1.SchemeGroupVersion.String()), + Kind: ptr.To("Secret"), }, ObjectMetaApplyConfiguration: &applymetav1.ObjectMetaApplyConfiguration{ - Name: pointer.String("staticcredentialproviderauth"), + Name: ptr.To("staticcredentialproviderauth"), }, StringData: map[string]string{ "static-image-credentials.json": buf.String(), @@ -326,11 +326,11 @@ var _ = Describe("Successful", ctx, &applycorev1.SecretApplyConfiguration{ TypeMetaApplyConfiguration: applymetav1.TypeMetaApplyConfiguration{ - APIVersion: pointer.String(corev1.SchemeGroupVersion.String()), - Kind: pointer.String("Secret"), + APIVersion: ptr.To(corev1.SchemeGroupVersion.String()), + Kind: ptr.To("Secret"), }, ObjectMetaApplyConfiguration: &applymetav1.ObjectMetaApplyConfiguration{ - Name: pointer.String("staticcredentialproviderauth"), + Name: ptr.To("staticcredentialproviderauth"), }, StringData: map[string]string{ "static-image-credentials.json": buf.String(), @@ -357,11 +357,11 @@ var _ = Describe("Successful", ctx, &applycorev1.SecretApplyConfiguration{ TypeMetaApplyConfiguration: applymetav1.TypeMetaApplyConfiguration{ - APIVersion: pointer.String(corev1.SchemeGroupVersion.String()), - Kind: pointer.String("Secret"), + APIVersion: ptr.To(corev1.SchemeGroupVersion.String()), + Kind: ptr.To("Secret"), }, ObjectMetaApplyConfiguration: &applymetav1.ObjectMetaApplyConfiguration{ - Name: pointer.String("dynamiccredentialproviderconfig"), + Name: ptr.To("dynamiccredentialproviderconfig"), }, StringData: map[string]string{ "dynamic-credential-provider-config.yaml": buf.String(),