From 5d44bb8436ac68ab59e1da02332c639de631130c Mon Sep 17 00:00:00 2001 From: Roo Thorp Date: Fri, 27 Sep 2024 11:19:07 +0100 Subject: [PATCH 1/9] Bump Go & golangci --- devbox.json | 4 +- devbox.lock | 138 ++++++++++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/devbox.json b/devbox.json index 9e0e1b1370..a12076479c 100644 --- a/devbox.json +++ b/devbox.json @@ -3,7 +3,7 @@ "yq-go@latest", "kubebuilder@4.1.1", "jq@latest", - "go@1.22.5", + "go@1.23", "gotests@latest", "act@latest", "kubectl@latest", @@ -20,7 +20,7 @@ "ginkgo@latest", "operator-sdk@1.36.1", "shellcheck@latest", - "golangci-lint@1.59.1", + "golangci-lint@1.60", "kubernetes-controller-tools@0.16.1" ] } diff --git a/devbox.lock b/devbox.lock index 00ffbec2df..d732b9ea25 100644 --- a/devbox.lock +++ b/devbox.lock @@ -98,8 +98,8 @@ } }, "docker@latest": { - "last_modified": "2024-09-13T05:52:00Z", - "resolved": "github:NixOS/nixpkgs/673d99f1406cb09b8eb6feab4743ebdf70046557#docker", + "last_modified": "2024-09-23T10:58:17Z", + "resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#docker", "source": "devbox-search", "version": "27.2.0", "systems": { @@ -107,41 +107,41 @@ "outputs": [ { "name": "out", - "path": "/nix/store/djpji4gal3p4xb6zzfcmxvzyi763rs81-docker-27.2.0", + "path": "/nix/store/dq60rw3m68bzcvkr7n1n1la82il33vpn-docker-27.2.0", "default": true } ], - "store_path": "/nix/store/djpji4gal3p4xb6zzfcmxvzyi763rs81-docker-27.2.0" + "store_path": "/nix/store/dq60rw3m68bzcvkr7n1n1la82il33vpn-docker-27.2.0" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/wwyz92pbgl6039rla0bb8s31ylg34asa-docker-27.2.0", + "path": "/nix/store/3dslblj4v2kdd1nlfmkq6b60av5rl9ay-docker-27.2.0", "default": true } ], - "store_path": "/nix/store/wwyz92pbgl6039rla0bb8s31ylg34asa-docker-27.2.0" + "store_path": "/nix/store/3dslblj4v2kdd1nlfmkq6b60av5rl9ay-docker-27.2.0" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/8yd9szyhz306m48i7rg3p3i6cl38wlsq-docker-27.2.0", + "path": "/nix/store/xb8d5lcgcp2vr6fmy649dfwagkxzrjlw-docker-27.2.0", "default": true } ], - "store_path": "/nix/store/8yd9szyhz306m48i7rg3p3i6cl38wlsq-docker-27.2.0" + "store_path": "/nix/store/xb8d5lcgcp2vr6fmy649dfwagkxzrjlw-docker-27.2.0" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/szw73hrv059aqj6prdvqq5h7gdliasd2-docker-27.2.0", + "path": "/nix/store/r4p9kjvzj8amd4pc217gf098p8p2bgi8-docker-27.2.0", "default": true } ], - "store_path": "/nix/store/szw73hrv059aqj6prdvqq5h7gdliasd2-docker-27.2.0" + "store_path": "/nix/store/r4p9kjvzj8amd4pc217gf098p8p2bgi8-docker-27.2.0" } } }, @@ -413,99 +413,99 @@ } } }, - "go@1.22.5": { - "last_modified": "2024-08-18T12:44:29Z", - "resolved": "github:NixOS/nixpkgs/ff1c2669bbb4d0dd9e62cc94f0968cfa652ceec1#go", + "go@1.23": { + "last_modified": "2024-09-10T15:01:03Z", + "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#go_1_23", "source": "devbox-search", - "version": "1.22.5", + "version": "1.23.1", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/p2i1kd6n12qj3s8kx65l3199mmjcffwz-go-1.22.5", + "path": "/nix/store/nvaay1c4banbccyvv6ba1gzyqpypjmfq-go-1.23.1", "default": true } ], - "store_path": "/nix/store/p2i1kd6n12qj3s8kx65l3199mmjcffwz-go-1.22.5" + "store_path": "/nix/store/nvaay1c4banbccyvv6ba1gzyqpypjmfq-go-1.23.1" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/xvwr7mp9yqafl8pclayhrhdcxkszaf6d-go-1.22.5", + "path": "/nix/store/9ylsay11jb3p6yarkmlz0fin76cdypwa-go-1.23.1", "default": true } ], - "store_path": "/nix/store/xvwr7mp9yqafl8pclayhrhdcxkszaf6d-go-1.22.5" + "store_path": "/nix/store/9ylsay11jb3p6yarkmlz0fin76cdypwa-go-1.23.1" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/vkrmfnargqkzg5amlfl4yh8vgxja7pli-go-1.22.5", + "path": "/nix/store/zkg5xhyx2rs03dq0qp14nqlx9ff1y5c5-go-1.23.1", "default": true } ], - "store_path": "/nix/store/vkrmfnargqkzg5amlfl4yh8vgxja7pli-go-1.22.5" + "store_path": "/nix/store/zkg5xhyx2rs03dq0qp14nqlx9ff1y5c5-go-1.23.1" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/4ay992wzksf59aapkkh5lflv4rkbmdjy-go-1.22.5", + "path": "/nix/store/mi0ybwsm6pmxzv9hsm6bcbqaq1pkf8wh-go-1.23.1", "default": true } ], - "store_path": "/nix/store/4ay992wzksf59aapkkh5lflv4rkbmdjy-go-1.22.5" + "store_path": "/nix/store/mi0ybwsm6pmxzv9hsm6bcbqaq1pkf8wh-go-1.23.1" } } }, - "golangci-lint@1.59.1": { - "last_modified": "2024-07-31T08:48:38Z", - "resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#golangci-lint", + "golangci-lint@1.60": { + "last_modified": "2024-09-07T06:00:21Z", + "resolved": "github:NixOS/nixpkgs/29cca090417df03e6d1928d99f77e8e81c74c3fa#golangci-lint", "source": "devbox-search", - "version": "1.59.1", + "version": "1.60.3", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/k3rnfx753gnx5v8l3i4sx1g1al2ds0di-golangci-lint-1.59.1", + "path": "/nix/store/byyqd75qaws3bp84lfnipwdz65y2sms8-golangci-lint-1.60.3", "default": true } ], - "store_path": "/nix/store/k3rnfx753gnx5v8l3i4sx1g1al2ds0di-golangci-lint-1.59.1" + "store_path": "/nix/store/byyqd75qaws3bp84lfnipwdz65y2sms8-golangci-lint-1.60.3" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/29908ar68rrr9jzdhzcrlkbfk30gnihf-golangci-lint-1.59.1", + "path": "/nix/store/q76c0iw8rpf1n8v2kwl7shiiymvm2lkn-golangci-lint-1.60.3", "default": true } ], - "store_path": "/nix/store/29908ar68rrr9jzdhzcrlkbfk30gnihf-golangci-lint-1.59.1" + "store_path": "/nix/store/q76c0iw8rpf1n8v2kwl7shiiymvm2lkn-golangci-lint-1.60.3" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/v7882fqgdy46a7l432q11f3xmbln80rc-golangci-lint-1.59.1", + "path": "/nix/store/4ihxpxi0q56329cnvikv15vcj4lsz17m-golangci-lint-1.60.3", "default": true } ], - "store_path": "/nix/store/v7882fqgdy46a7l432q11f3xmbln80rc-golangci-lint-1.59.1" + "store_path": "/nix/store/4ihxpxi0q56329cnvikv15vcj4lsz17m-golangci-lint-1.60.3" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/1m1i9zhrgdw2192803n6wf2k7g86y6d5-golangci-lint-1.59.1", + "path": "/nix/store/ilaacmahr3mfjh2hsfvcsyh7f2gsz0zj-golangci-lint-1.60.3", "default": true } ], - "store_path": "/nix/store/1m1i9zhrgdw2192803n6wf2k7g86y6d5-golangci-lint-1.59.1" + "store_path": "/nix/store/ilaacmahr3mfjh2hsfvcsyh7f2gsz0zj-golangci-lint-1.60.3" } } }, @@ -654,8 +654,8 @@ } }, "jq@latest": { - "last_modified": "2024-09-16T10:17:16Z", - "resolved": "github:NixOS/nixpkgs/20f9370d5f588fb8c72e844c54511cab054b5f40#jq", + "last_modified": "2024-09-23T10:58:17Z", + "resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#jq", "source": "devbox-search", "version": "1.7.1", "systems": { @@ -671,6 +671,10 @@ "path": "/nix/store/gxakkni5fxplsxkhlpd1y39z848r9w1k-jq-1.7.1-man", "default": true }, + { + "name": "lib", + "path": "/nix/store/1xx96kscxipvqg02hg5zhkc3p6jg8dax-jq-1.7.1-lib" + }, { "name": "out", "path": "/nix/store/49pvp5zyzs3kqafdrvl5l8zrr5gxg2ha-jq-1.7.1" @@ -682,10 +686,6 @@ { "name": "doc", "path": "/nix/store/dgrfyris3jajhimxw0p5qwpmdwsz0k6m-jq-1.7.1-doc" - }, - { - "name": "lib", - "path": "/nix/store/1xx96kscxipvqg02hg5zhkc3p6jg8dax-jq-1.7.1-lib" } ], "store_path": "/nix/store/9h78n0xjxgjmmb37bi8ca6wyikx357fn-jq-1.7.1-bin" @@ -702,10 +702,6 @@ "path": "/nix/store/m2q5jyh2ifvyy71054kvdq12bq1kny0q-jq-1.7.1-man", "default": true }, - { - "name": "dev", - "path": "/nix/store/xwy0g4wfzibz2hv9gnrcmg4hncncg0gx-jq-1.7.1-dev" - }, { "name": "doc", "path": "/nix/store/3scw7wdaz3mnigbqpir7yd81lfx4vb4a-jq-1.7.1-doc" @@ -717,6 +713,10 @@ { "name": "out", "path": "/nix/store/hsrxl3njwwhi8zcbdrradmzdhf8q8b2c-jq-1.7.1" + }, + { + "name": "dev", + "path": "/nix/store/xwy0g4wfzibz2hv9gnrcmg4hncncg0gx-jq-1.7.1-dev" } ], "store_path": "/nix/store/d53sa7n91q32bj4n3d8yfih66w0cnybk-jq-1.7.1-bin" @@ -733,10 +733,6 @@ "path": "/nix/store/b7g1b4d9bkrii1l08h7jm42m346rch3n-jq-1.7.1-man", "default": true }, - { - "name": "out", - "path": "/nix/store/m8y9qhibbih84af3vqs4wl72k9dpyiyj-jq-1.7.1" - }, { "name": "dev", "path": "/nix/store/mz2z5g6xiji538wkxclm7hxjqcji8kj0-jq-1.7.1-dev" @@ -748,6 +744,10 @@ { "name": "lib", "path": "/nix/store/0lg1w92gx3aam7b1h311ssmjq63p3kd4-jq-1.7.1-lib" + }, + { + "name": "out", + "path": "/nix/store/m8y9qhibbih84af3vqs4wl72k9dpyiyj-jq-1.7.1" } ], "store_path": "/nix/store/vprdq5a3dk284s7blbxgaciqn90j5vgy-jq-1.7.1-bin" @@ -764,6 +764,10 @@ "path": "/nix/store/0jpj9xq83imjwhldsrmiyn8pp8wjazp5-jq-1.7.1-man", "default": true }, + { + "name": "dev", + "path": "/nix/store/04ca5xwvasz6s3jg0k7njz6rzi0d225w-jq-1.7.1-dev" + }, { "name": "doc", "path": "/nix/store/yfc9bsy7n9k66238s3cy7vw3cw1l1ap8-jq-1.7.1-doc" @@ -775,10 +779,6 @@ { "name": "out", "path": "/nix/store/7sy12xv4fwii421d920jxqx63c0ai3w3-jq-1.7.1" - }, - { - "name": "dev", - "path": "/nix/store/04ca5xwvasz6s3jg0k7njz6rzi0d225w-jq-1.7.1-dev" } ], "store_path": "/nix/store/x8jzsy0y1zk30mcvav2rh6lrw1gbzzy3-jq-1.7.1-bin" @@ -966,50 +966,50 @@ } }, "kubernetes-helm@latest": { - "last_modified": "2024-09-10T15:01:03Z", - "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#kubernetes-helm", + "last_modified": "2024-09-17T14:38:52Z", + "resolved": "github:NixOS/nixpkgs/658e7223191d2598641d50ee4e898126768fe847#kubernetes-helm", "source": "devbox-search", - "version": "3.15.4", + "version": "3.16.1", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/yxbbxgpql76sabh4ac8gwivy1xiik6ds-kubernetes-helm-3.15.4", + "path": "/nix/store/g9b797qqdsp7ymdx7dhwy5nfkhf90r4m-kubernetes-helm-3.16.1", "default": true } ], - "store_path": "/nix/store/yxbbxgpql76sabh4ac8gwivy1xiik6ds-kubernetes-helm-3.15.4" + "store_path": "/nix/store/g9b797qqdsp7ymdx7dhwy5nfkhf90r4m-kubernetes-helm-3.16.1" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/vdw78nb3gvfvf1zjk18zi4niqqgg60pm-kubernetes-helm-3.15.4", + "path": "/nix/store/s1smmyjs9988adbszdg2nd58qradswbc-kubernetes-helm-3.16.1", "default": true } ], - "store_path": "/nix/store/vdw78nb3gvfvf1zjk18zi4niqqgg60pm-kubernetes-helm-3.15.4" + "store_path": "/nix/store/s1smmyjs9988adbszdg2nd58qradswbc-kubernetes-helm-3.16.1" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/his95njlm5f7pivvyhmjx55lxsrg7b7v-kubernetes-helm-3.15.4", + "path": "/nix/store/3wfzg682rdi2md92jlql5i4h2pzxbq7a-kubernetes-helm-3.16.1", "default": true } ], - "store_path": "/nix/store/his95njlm5f7pivvyhmjx55lxsrg7b7v-kubernetes-helm-3.15.4" + "store_path": "/nix/store/3wfzg682rdi2md92jlql5i4h2pzxbq7a-kubernetes-helm-3.16.1" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/x4mb959fwbfpjn1mlq4hhh6cz6h4gvr3-kubernetes-helm-3.15.4", + "path": "/nix/store/gl7z7bx0csk5flgidxjhjswf13y7vd7w-kubernetes-helm-3.16.1", "default": true } ], - "store_path": "/nix/store/x4mb959fwbfpjn1mlq4hhh6cz6h4gvr3-kubernetes-helm-3.15.4" + "store_path": "/nix/store/gl7z7bx0csk5flgidxjhjswf13y7vd7w-kubernetes-helm-3.16.1" } } }, @@ -1182,8 +1182,8 @@ } }, "wget@latest": { - "last_modified": "2024-09-10T15:01:03Z", - "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#wget", + "last_modified": "2024-09-23T10:58:17Z", + "resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#wget", "source": "devbox-search", "version": "1.24.5", "systems": { @@ -1191,11 +1191,11 @@ "outputs": [ { "name": "out", - "path": "/nix/store/jp912nkxxzk3crf4ji7qzizzx658pwh9-wget-1.24.5", + "path": "/nix/store/sgakycbzmdkm6jb9r1jf30zrn0m6w2dr-wget-1.24.5", "default": true } ], - "store_path": "/nix/store/jp912nkxxzk3crf4ji7qzizzx658pwh9-wget-1.24.5" + "store_path": "/nix/store/sgakycbzmdkm6jb9r1jf30zrn0m6w2dr-wget-1.24.5" }, "aarch64-linux": { "outputs": [ @@ -1211,11 +1211,11 @@ "outputs": [ { "name": "out", - "path": "/nix/store/m9g22b1zkyiqj2zrg0pcx8m76jhlpbbh-wget-1.24.5", + "path": "/nix/store/xf0n0pbp63h7yx4vzvxdkp0y2xj0f97c-wget-1.24.5", "default": true } ], - "store_path": "/nix/store/m9g22b1zkyiqj2zrg0pcx8m76jhlpbbh-wget-1.24.5" + "store_path": "/nix/store/xf0n0pbp63h7yx4vzvxdkp0y2xj0f97c-wget-1.24.5" }, "x86_64-linux": { "outputs": [ From a7acfdd3181f7ad4a95e810eb6f795cfeee7472a Mon Sep 17 00:00:00 2001 From: Roo Thorp Date: Fri, 27 Sep 2024 11:20:06 +0100 Subject: [PATCH 2/9] Replace deprecated linter --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index ad420a807f..fec8b28ce0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -7,7 +7,7 @@ linters: - dupl - errcheck - errorlint - - exportloopref + - copyloopvar #- gocritic - gocyclo - goimports From bfb864b41182a8703eff46649f3ac3e93953edbb Mon Sep 17 00:00:00 2001 From: Roo Thorp Date: Fri, 27 Sep 2024 11:20:33 +0100 Subject: [PATCH 3/9] Remedy linter errors --- pkg/controller/atlasproject/custom_roles.go | 6 +++--- test/helper/cel/cel.go | 1 - test/helper/cel/pattern.go | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/controller/atlasproject/custom_roles.go b/pkg/controller/atlasproject/custom_roles.go index 412d0cbde4..2a272dae46 100644 --- a/pkg/controller/atlasproject/custom_roles.go +++ b/pkg/controller/atlasproject/custom_roles.go @@ -200,7 +200,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol if ok { if stat.Status == status.CustomRoleStatusFailed { statuses = append(statuses, stat) - err = errors.Join(err, fmt.Errorf(stat.Error)) + err = errors.Join(err, fmt.Errorf("%s", stat.Error)) } continue @@ -210,7 +210,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol statuses = append(statuses, stat) if stat.Status == status.CustomRoleStatusFailed { - err = errors.Join(err, fmt.Errorf(stat.Error)) + err = errors.Join(err, fmt.Errorf("%s", stat.Error)) } continue @@ -220,7 +220,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol statuses = append(statuses, stat) if stat.Status == status.CustomRoleStatusFailed { - err = errors.Join(err, fmt.Errorf(stat.Error)) + err = errors.Join(err, fmt.Errorf("%s", stat.Error)) } continue diff --git a/test/helper/cel/cel.go b/test/helper/cel/cel.go index 7cbc033743..5ab3af7ce8 100644 --- a/test/helper/cel/cel.go +++ b/test/helper/cel/cel.go @@ -114,7 +114,6 @@ func findCEL(t *testing.T, s *schema.Structural, root bool, pth *field.Path) (ma } for k, v := range s.Properties { - v := v sub, err := findCEL(t, &v, false, pth.Child("properties").Child(k)) if err != nil { return nil, err diff --git a/test/helper/cel/pattern.go b/test/helper/cel/pattern.go index 94db2cd648..394eb1312a 100644 --- a/test/helper/cel/pattern.go +++ b/test/helper/cel/pattern.go @@ -90,7 +90,6 @@ func findPattern(t *testing.T, s *schema.Structural, pth *field.Path) (map[strin } for k, v := range s.Properties { - v := v sub, err := findPattern(t, &v, pth.Child("properties").Child(k)) if err != nil { return nil, err From 5171140123d893a47362e1169c2c5c66197171d4 Mon Sep 17 00:00:00 2001 From: Roo Thorp Date: Fri, 27 Sep 2024 12:53:20 +0100 Subject: [PATCH 4/9] Update licenses --- licenses.csv | 151 --------------------------------------------------- 1 file changed, 151 deletions(-) diff --git a/licenses.csv b/licenses.csv index d2a8d134b5..e69de29bb2 100644 --- a/licenses.csv +++ b/licenses.csv @@ -1,151 +0,0 @@ -cloud.google.com/go/auth,https://github.com/googleapis/google-cloud-go/blob/auth/v0.9.5/auth/LICENSE,Apache-2.0 -cloud.google.com/go/auth/oauth2adapt,https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt/v0.2.4/auth/oauth2adapt/LICENSE,Apache-2.0 -cloud.google.com/go/compute/apiv1,https://github.com/googleapis/google-cloud-go/blob/compute/v1.28.1/compute/apiv1/license_codes_client.go,Apache-2.0 -cloud.google.com/go/compute/internal,https://github.com/googleapis/google-cloud-go/blob/compute/v1.28.1/compute/LICENSE,Apache-2.0 -cloud.google.com/go/compute/metadata,https://github.com/googleapis/google-cloud-go/blob/compute/metadata/v0.5.2/compute/metadata/LICENSE,Apache-2.0 -cloud.google.com/go/iam,https://github.com/googleapis/google-cloud-go/blob/iam/v1.2.1/iam/LICENSE,Apache-2.0 -cloud.google.com/go/kms,https://github.com/googleapis/google-cloud-go/blob/kms/v1.20.0/kms/LICENSE,Apache-2.0 -cloud.google.com/go/longrunning,https://github.com/googleapis/google-cloud-go/blob/longrunning/v0.6.1/longrunning/LICENSE,Apache-2.0 -github.com/Azure/azure-sdk-for-go,https://github.com/Azure/azure-sdk-for-go/blob/v68.0.0/LICENSE.txt,MIT -github.com/Azure/azure-sdk-for-go/sdk/azcore,https://github.com/Azure/azure-sdk-for-go/blob/sdk/azcore/v1.14.0/sdk/azcore/LICENSE.txt,MIT -github.com/Azure/azure-sdk-for-go/sdk/azidentity,https://github.com/Azure/azure-sdk-for-go/blob/sdk/azidentity/v1.7.0/sdk/azidentity/LICENSE.txt,MIT -github.com/Azure/azure-sdk-for-go/sdk/internal,https://github.com/Azure/azure-sdk-for-go/blob/sdk/internal/v1.10.0/sdk/internal/LICENSE.txt,MIT -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault,https://github.com/Azure/azure-sdk-for-go/blob/sdk/resourcemanager/keyvault/armkeyvault/v1.4.0/sdk/resourcemanager/keyvault/armkeyvault/LICENSE.txt,MIT -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2,https://github.com/Azure/azure-sdk-for-go/blob/sdk/resourcemanager/network/armnetwork/v2.2.1/sdk/resourcemanager/network/armnetwork/LICENSE.txt,MIT -github.com/Azure/go-autorest/autorest,https://github.com/Azure/go-autorest/blob/autorest/v0.11.29/autorest/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/autorest/adal,https://github.com/Azure/go-autorest/blob/autorest/adal/v0.9.22/autorest/adal/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/autorest/azure/auth,https://github.com/Azure/go-autorest/blob/autorest/azure/auth/v0.5.13/autorest/azure/auth/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/autorest/azure/cli,https://github.com/Azure/go-autorest/blob/autorest/azure/cli/v0.4.6/autorest/azure/cli/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/autorest/date,https://github.com/Azure/go-autorest/blob/autorest/date/v0.3.0/autorest/date/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/autorest/to,https://github.com/Azure/go-autorest/blob/autorest/to/v0.4.0/autorest/to/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/autorest/validation,https://github.com/Azure/go-autorest/blob/autorest/validation/v0.3.1/autorest/validation/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/logger,https://github.com/Azure/go-autorest/blob/logger/v0.2.1/logger/LICENSE,Apache-2.0 -github.com/Azure/go-autorest/tracing,https://github.com/Azure/go-autorest/blob/tracing/v0.6.0/tracing/LICENSE,Apache-2.0 -github.com/AzureAD/microsoft-authentication-library-for-go/apps,https://github.com/AzureAD/microsoft-authentication-library-for-go/blob/v1.2.2/LICENSE,MIT -github.com/Masterminds/semver,https://github.com/Masterminds/semver/blob/v1.5.0/LICENSE.txt,MIT -github.com/antlr4-go/antlr/v4,https://github.com/antlr4-go/antlr/blob/v4.13.0/LICENSE,BSD-3-Clause -github.com/asaskevich/govalidator,https://github.com/asaskevich/govalidator/blob/f61b66f89f4a/LICENSE,MIT -github.com/aws/aws-sdk-go,https://github.com/aws/aws-sdk-go/blob/v1.55.5/LICENSE.txt,Apache-2.0 -github.com/aws/aws-sdk-go/internal/sync/singleflight,https://github.com/aws/aws-sdk-go/blob/v1.55.5/internal/sync/singleflight/LICENSE,BSD-3-Clause -github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LICENSE,MIT -github.com/blang/semver/v4,https://github.com/blang/semver/blob/v4.0.0/v4/LICENSE,MIT -github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.3.0/LICENSE.txt,MIT -github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/d8f796af33cc/LICENSE,ISC -github.com/dimchansky/utfbom,https://github.com/dimchansky/utfbom/blob/v1.1.1/LICENSE,Apache-2.0 -github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3.11.0/LICENSE,MIT -github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.9.0/v5/LICENSE,BSD-3-Clause -github.com/felixge/httpsnoop,https://github.com/felixge/httpsnoop/blob/v1.0.4/LICENSE.txt,MIT -github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.7.0/LICENSE,BSD-3-Clause -github.com/fxamacker/cbor/v2,https://github.com/fxamacker/cbor/blob/v2.7.0/LICENSE,MIT -github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v1.4.2/LICENSE,Apache-2.0 -github.com/go-logr/stdr,https://github.com/go-logr/stdr/blob/v1.2.2/LICENSE,Apache-2.0 -github.com/go-logr/zapr,https://github.com/go-logr/zapr/blob/v1.3.0/LICENSE,Apache-2.0 -github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.19.6/LICENSE,Apache-2.0 -github.com/go-openapi/jsonreference,https://github.com/go-openapi/jsonreference/blob/v0.20.2/LICENSE,Apache-2.0 -github.com/go-openapi/swag,https://github.com/go-openapi/swag/blob/v0.22.4/LICENSE,Apache-2.0 -github.com/go-test/deep,https://github.com/go-test/deep/blob/v1.1.1/LICENSE,MIT -github.com/gogo/protobuf,https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE,BSD-3-Clause -github.com/golang-jwt/jwt/v4,https://github.com/golang-jwt/jwt/blob/v4.5.0/LICENSE,MIT -github.com/golang-jwt/jwt/v5,https://github.com/golang-jwt/jwt/blob/v5.2.1/LICENSE,MIT -github.com/golang/groupcache/lru,https://github.com/golang/groupcache/blob/41bb18bfe9da/LICENSE,Apache-2.0 -github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.4/LICENSE,BSD-3-Clause -github.com/golang/snappy,https://github.com/golang/snappy/blob/v0.0.4/LICENSE,BSD-3-Clause -github.com/google/cel-go,https://github.com/google/cel-go/blob/v0.20.1/LICENSE,Apache-2.0 -github.com/google/gnostic-models,https://github.com/google/gnostic-models/blob/v0.6.8/LICENSE,Apache-2.0 -github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.6.0/LICENSE,BSD-3-Clause -github.com/google/go-querystring/query,https://github.com/google/go-querystring/blob/v1.1.0/LICENSE,BSD-3-Clause -github.com/google/gofuzz,https://github.com/google/gofuzz/blob/v1.2.0/LICENSE,Apache-2.0 -github.com/google/s2a-go,https://github.com/google/s2a-go/blob/v0.1.8/LICENSE.md,Apache-2.0 -github.com/google/uuid,https://github.com/google/uuid/blob/v1.6.0/LICENSE,BSD-3-Clause -github.com/googleapis/enterprise-certificate-proxy/client,https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.4/LICENSE,Apache-2.0 -github.com/googleapis/gax-go/v2,https://github.com/googleapis/gax-go/blob/v2.13.0/v2/LICENSE,BSD-3-Clause -github.com/imdario/mergo,https://github.com/imdario/mergo/blob/v0.3.12/LICENSE,BSD-3-Clause -github.com/jmespath/go-jmespath,https://github.com/jmespath/go-jmespath/blob/v0.4.0/LICENSE,Apache-2.0 -github.com/josharian/intern,https://github.com/josharian/intern/blob/v1.0.0/license.md,MIT -github.com/json-iterator/go,https://github.com/json-iterator/go/blob/v1.1.12/LICENSE,MIT -github.com/klauspost/compress,https://github.com/klauspost/compress/blob/v1.14.4/LICENSE,Apache-2.0 -github.com/klauspost/compress/internal/snapref,https://github.com/klauspost/compress/blob/v1.14.4/internal/snapref/LICENSE,BSD-3-Clause -github.com/klauspost/compress/zstd/internal/xxhash,https://github.com/klauspost/compress/blob/v1.14.4/zstd/internal/xxhash/LICENSE.txt,MIT -github.com/kylelemons/godebug,https://github.com/kylelemons/godebug/blob/v1.1.0/LICENSE,Apache-2.0 -github.com/mailru/easyjson,https://github.com/mailru/easyjson/blob/v0.7.7/LICENSE,MIT -github.com/mitchellh/go-homedir,https://github.com/mitchellh/go-homedir/blob/v1.1.0/LICENSE,MIT -github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0 -github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0 -github.com/mongodb-forks/digest,https://github.com/mongodb-forks/digest/blob/v1.1.0/COPYING,Apache-2.0 -github.com/mongodb/mongodb-atlas-kubernetes/v2,https://github.com/mongodb/mongodb-atlas-kubernetes/blob/HEAD/LICENSE,Apache-2.0 -github.com/montanaflynn/stats,https://github.com/montanaflynn/stats/blob/v0.7.1/LICENSE,MIT -github.com/munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause -github.com/nsf/jsondiff,https://github.com/nsf/jsondiff/blob/43f6cf3098c1/LICENSE,MIT -github.com/onsi/ginkgo/v2,https://github.com/onsi/ginkgo/blob/v2.20.2/LICENSE,MIT -github.com/onsi/gomega,https://github.com/onsi/gomega/blob/v1.34.2/LICENSE,MIT -github.com/pkg/browser,https://github.com/pkg/browser/blob/5ac0b6a4141c/LICENSE,BSD-2-Clause -github.com/pkg/errors,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause -github.com/pmezard/go-difflib/difflib,https://github.com/pmezard/go-difflib/blob/5d4384ee4fb2/LICENSE,BSD-3-Clause -github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.19.1/LICENSE,Apache-2.0 -github.com/prometheus/client_model/go,https://github.com/prometheus/client_model/blob/v0.6.1/LICENSE,Apache-2.0 -github.com/prometheus/common,https://github.com/prometheus/common/blob/v0.55.0/LICENSE,Apache-2.0 -github.com/prometheus/procfs,https://github.com/prometheus/procfs/blob/v0.15.1/LICENSE,Apache-2.0 -github.com/sethvargo/go-password/password,https://github.com/sethvargo/go-password/blob/v0.3.1/LICENSE,MIT -github.com/spf13/cobra,https://github.com/spf13/cobra/blob/v1.8.1/LICENSE.txt,Apache-2.0 -github.com/spf13/pflag,https://github.com/spf13/pflag/blob/v1.0.5/LICENSE,BSD-3-Clause -github.com/stoewer/go-strcase,https://github.com/stoewer/go-strcase/blob/v1.2.0/LICENSE,MIT -github.com/stretchr/objx,https://github.com/stretchr/objx/blob/v0.5.2/LICENSE,MIT -github.com/stretchr/testify,https://github.com/stretchr/testify/blob/v1.9.0/LICENSE,MIT -github.com/x448/float16,https://github.com/x448/float16/blob/v0.8.4/LICENSE,MIT -github.com/xdg-go/pbkdf2,https://github.com/xdg-go/pbkdf2/blob/v1.0.0/LICENSE,Apache-2.0 -github.com/xdg-go/scram,https://github.com/xdg-go/scram/blob/v1.1.2/LICENSE,Apache-2.0 -github.com/xdg-go/stringprep,https://github.com/xdg-go/stringprep/blob/v1.0.4/LICENSE,Apache-2.0 -github.com/youmark/pkcs8,https://github.com/youmark/pkcs8/blob/a2c0da244d78/LICENSE,MIT -go.mongodb.org/atlas-sdk/v20231115004,https://github.com/mongodb/atlas-sdk-go/blob/v20231115004.1.0/LICENSE,Apache-2.0 -go.mongodb.org/atlas-sdk/v20231115008,https://github.com/mongodb/atlas-sdk-go/blob/v20231115008.5.0/LICENSE,Apache-2.0 -go.mongodb.org/atlas/mongodbatlas,https://github.com/mongodb/go-client-mongodb-atlas/blob/v0.37.0/LICENSE,Apache-2.0 -go.mongodb.org/mongo-driver,https://github.com/mongodb/mongo-go-driver/blob/v1.17.0/LICENSE,Apache-2.0 -go.opencensus.io,https://github.com/census-instrumentation/opencensus-go/blob/v0.24.0/LICENSE,Apache-2.0 -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc,https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/google.golang.org/grpc/otelgrpc/v0.54.0/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE,Apache-2.0 -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp,https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/net/http/otelhttp/v0.54.0/instrumentation/net/http/otelhttp/LICENSE,Apache-2.0 -go.opentelemetry.io/otel,https://github.com/open-telemetry/opentelemetry-go/blob/v1.29.0/LICENSE,Apache-2.0 -go.opentelemetry.io/otel/metric,https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.29.0/metric/LICENSE,Apache-2.0 -go.opentelemetry.io/otel/trace,https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.29.0/trace/LICENSE,Apache-2.0 -go.uber.org/multierr,https://github.com/uber-go/multierr/blob/v1.11.0/LICENSE.txt,MIT -go.uber.org/zap,https://github.com/uber-go/zap/blob/v1.27.0/LICENSE,MIT -golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.27.0:LICENSE,BSD-3-Clause -golang.org/x/exp,https://cs.opensource.google/go/x/exp/+/8a7402ab:LICENSE,BSD-3-Clause -golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.29.0:LICENSE,BSD-3-Clause -golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.23.0:LICENSE,BSD-3-Clause -golang.org/x/sync,https://cs.opensource.google/go/x/sync/+/v0.8.0:LICENSE,BSD-3-Clause -golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.25.0:LICENSE,BSD-3-Clause -golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.24.0:LICENSE,BSD-3-Clause -golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.18.0:LICENSE,BSD-3-Clause -golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.6.0:LICENSE,BSD-3-Clause -gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0 -google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0.199.0/LICENSE,BSD-3-Clause -google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.199.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause -google.golang.org/genproto/googleapis,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/LICENSE,Apache-2.0 -google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/googleapis/api/LICENSE,Apache-2.0 -google.golang.org/genproto/googleapis/rpc,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/googleapis/rpc/LICENSE,Apache-2.0 -google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.67.0/LICENSE,Apache-2.0 -google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.34.2/LICENSE,BSD-3-Clause -gopkg.in/evanphx/json-patch.v4,https://github.com/evanphx/json-patch/blob/v4.12.0/LICENSE,BSD-3-Clause -gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause -gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0 -gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE,MIT -k8s.io/api,https://github.com/kubernetes/api/blob/v0.31.1/LICENSE,Apache-2.0 -k8s.io/apiextensions-apiserver/pkg,https://github.com/kubernetes/apiextensions-apiserver/blob/v0.31.1/LICENSE,Apache-2.0 -k8s.io/apimachinery/pkg,https://github.com/kubernetes/apimachinery/blob/v0.31.1/LICENSE,Apache-2.0 -k8s.io/apimachinery/third_party/forked/golang,https://github.com/kubernetes/apimachinery/blob/v0.31.1/third_party/forked/golang/LICENSE,BSD-3-Clause -k8s.io/apiserver/pkg,https://github.com/kubernetes/apiserver/blob/v0.31.1/LICENSE,Apache-2.0 -k8s.io/client-go,https://github.com/kubernetes/client-go/blob/v0.31.1/LICENSE,Apache-2.0 -k8s.io/component-base,https://github.com/kubernetes/component-base/blob/v0.31.1/LICENSE,Apache-2.0 -k8s.io/klog/v2,https://github.com/kubernetes/klog/blob/v2.130.1/LICENSE,Apache-2.0 -k8s.io/kube-openapi/pkg,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/LICENSE,Apache-2.0 -k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/internal/third_party/go-json-experiment/json/LICENSE,BSD-3-Clause -k8s.io/kube-openapi/pkg/validation/errors,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/validation/errors/LICENSE,Apache-2.0 -k8s.io/kube-openapi/pkg/validation/spec,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/validation/spec/LICENSE,Apache-2.0 -k8s.io/kube-openapi/pkg/validation/strfmt,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/validation/strfmt/LICENSE,Apache-2.0 -k8s.io/utils,https://github.com/kubernetes/utils/blob/18e509b52bc8/LICENSE,Apache-2.0 -k8s.io/utils/internal/third_party/forked/golang/net,https://github.com/kubernetes/utils/blob/18e509b52bc8/internal/third_party/forked/golang/LICENSE,BSD-3-Clause -sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.19.0/LICENSE,Apache-2.0 -sigs.k8s.io/json,https://github.com/kubernetes-sigs/json/blob/bc3834ca7abd/LICENSE,Apache-2.0 -sigs.k8s.io/structured-merge-diff/v4,https://github.com/kubernetes-sigs/structured-merge-diff/blob/v4.4.1/LICENSE,Apache-2.0 -sigs.k8s.io/yaml,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/LICENSE,Apache-2.0 -sigs.k8s.io/yaml/goyaml.v2,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/goyaml.v2/LICENSE,Apache-2.0 From ba2b02d83d873a2f2bfe7ac4f5eeccb639eb2b62 Mon Sep 17 00:00:00 2001 From: "jose.vazquez" Date: Mon, 30 Sep 2024 19:21:48 +0200 Subject: [PATCH 5/9] Move to go 1.23 --- go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c4cf9120e8..6a6da89744 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/mongodb/mongodb-atlas-kubernetes/v2 -go 1.22.0 - -toolchain go1.22.7 +go 1.23.1 require ( cloud.google.com/go/kms v1.20.0 From c0df39d1a10770aa1e95ff4879556e7f7cad8ba6 Mon Sep 17 00:00:00 2001 From: "jose.vazquez" Date: Mon, 30 Sep 2024 19:44:15 +0200 Subject: [PATCH 6/9] Try fix the licenses issue --- .licenses-gomod.sha256 | 2 +- Makefile | 12 ++-- devbox.json | 1 - devbox.lock | 132 ++++++++++++----------------------- licenses.csv | 151 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 201 insertions(+), 97 deletions(-) diff --git a/.licenses-gomod.sha256 b/.licenses-gomod.sha256 index 7855834ab6..ad2141ee13 100644 --- a/.licenses-gomod.sha256 +++ b/.licenses-gomod.sha256 @@ -1 +1 @@ -100644 c4cf9120e81ef4e31f288eef5adccbba2862f023 go.mod +100644 f625a1833624ed1e502f99797221700e17ea944d go.mod diff --git a/Makefile b/Makefile index 9e52e3d405..a72132c484 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ ATLAS_KEY_SECRET_NAME = mongodb-atlas-operator-api-key BASE_GO_PACKAGE = github.com/mongodb/mongodb-atlas-kubernetes/v2 GO_LICENSES = go-licenses +GO_LICENSES_VERSION = 1.6.0 KUSTOMIZE = kustomize DISALLOWED_LICENSES = restricted,reciprocal @@ -126,9 +127,9 @@ all: manager ## Build all binaries build-licenses.csv: go.mod ## Track licenses in a CSV file @echo "Tracking licenses into file $@" @echo "========================================" - GOOS=linux GOARCH=amd64 go mod download - # https://github.com/google/go-licenses/issues/244 - GOTOOLCHAIN=local GOOS=linux GOARCH=amd64 $(GO_LICENSES) csv --include_tests $(BASE_GO_PACKAGE)/... > licenses.csv + export GOOS=linux + export GOARCH=amd64 + go run github.com/google/$(GO_LICENSES)@v$(GO_LICENSES_VERSION) csv --include_tests $(BASE_GO_PACKAGE)/... > licenses.csv echo $(GOMOD_SHA) > $(LICENSES_GOMOD_SHA_FILE) .PHONY: recompute-licenses @@ -145,8 +146,9 @@ licenses-up-to-date: ## Check if the licenses.csv is up to date check-licenses: licenses-up-to-date ## Check licenses are compliant with our restrictions @echo "Checking licenses not to be: $(DISALLOWED_LICENSES)" @echo "============================================" - # https://github.com/google/go-licenses/issues/244 - GOTOOLCHAIN=local GOOS=linux GOARCH=amd64 $(GO_LICENSES) check --include_tests \ + export GOOS=linux + export GOARCH=amd64 + go run github.com/google/$(GO_LICENSES)@v$(GO_LICENSES_VERSION) check --include_tests \ --disallowed_types $(DISALLOWED_LICENSES) $(BASE_GO_PACKAGE)/... @echo "--------------------" @echo "Licenses check: PASS" diff --git a/devbox.json b/devbox.json index a12076479c..ba78809292 100644 --- a/devbox.json +++ b/devbox.json @@ -16,7 +16,6 @@ "kubernetes-helm@latest", "govulncheck@latest", "gotools@latest", - "go-licenses@latest", "ginkgo@latest", "operator-sdk@1.36.1", "shellcheck@latest", diff --git a/devbox.lock b/devbox.lock index d732b9ea25..4ac7fa88a8 100644 --- a/devbox.lock +++ b/devbox.lock @@ -2,50 +2,50 @@ "lockfile_version": "1", "packages": { "act@latest": { - "last_modified": "2024-09-10T15:01:03Z", - "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#act", + "last_modified": "2024-09-29T05:15:19Z", + "resolved": "github:NixOS/nixpkgs/2dcd9c55e8914017226f5948ac22c53872a13ee2#act", "source": "devbox-search", - "version": "0.2.66", + "version": "0.2.67", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/wpbqsvhz0p0fxzybqqmhv3j92fyds1xk-act-0.2.66", + "path": "/nix/store/95ng1vsmq36600yl5jnhydwwp7qlw4qs-act-0.2.67", "default": true } ], - "store_path": "/nix/store/wpbqsvhz0p0fxzybqqmhv3j92fyds1xk-act-0.2.66" + "store_path": "/nix/store/95ng1vsmq36600yl5jnhydwwp7qlw4qs-act-0.2.67" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/5bv5239h13a2bff3kbq8qd8nyxlnlxsh-act-0.2.66", + "path": "/nix/store/han8drmgpwc6pdz0jyaxf4zs18fsvp40-act-0.2.67", "default": true } ], - "store_path": "/nix/store/5bv5239h13a2bff3kbq8qd8nyxlnlxsh-act-0.2.66" + "store_path": "/nix/store/han8drmgpwc6pdz0jyaxf4zs18fsvp40-act-0.2.67" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/hx3976ks2y5v5p6c5853bg8scy2s9xv0-act-0.2.66", + "path": "/nix/store/daqqazwkrf3b4rivcg4wahpij1k0359h-act-0.2.67", "default": true } ], - "store_path": "/nix/store/hx3976ks2y5v5p6c5853bg8scy2s9xv0-act-0.2.66" + "store_path": "/nix/store/daqqazwkrf3b4rivcg4wahpij1k0359h-act-0.2.67" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/6sis0w1w41mic6lgpalb08pn6hgkr67j-act-0.2.66", + "path": "/nix/store/8kh39sl27yzgd7pd8smfw5vjkshpxml7-act-0.2.67", "default": true } ], - "store_path": "/nix/store/6sis0w1w41mic6lgpalb08pn6hgkr67j-act-0.2.66" + "store_path": "/nix/store/8kh39sl27yzgd7pd8smfw5vjkshpxml7-act-0.2.67" } } }, @@ -98,50 +98,50 @@ } }, "docker@latest": { - "last_modified": "2024-09-23T10:58:17Z", - "resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#docker", + "last_modified": "2024-09-27T09:34:34Z", + "resolved": "github:NixOS/nixpkgs/e0f477a570df7375172a08ddb9199c90853c63f0#docker", "source": "devbox-search", - "version": "27.2.0", + "version": "27.3.0", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/dq60rw3m68bzcvkr7n1n1la82il33vpn-docker-27.2.0", + "path": "/nix/store/962n5f437smyb6p3nw0z8nskyylxnm01-docker-27.3.0", "default": true } ], - "store_path": "/nix/store/dq60rw3m68bzcvkr7n1n1la82il33vpn-docker-27.2.0" + "store_path": "/nix/store/962n5f437smyb6p3nw0z8nskyylxnm01-docker-27.3.0" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/3dslblj4v2kdd1nlfmkq6b60av5rl9ay-docker-27.2.0", + "path": "/nix/store/9v8impsbg1vsxnmwna786vi6rzgam9g5-docker-27.3.0", "default": true } ], - "store_path": "/nix/store/3dslblj4v2kdd1nlfmkq6b60av5rl9ay-docker-27.2.0" + "store_path": "/nix/store/9v8impsbg1vsxnmwna786vi6rzgam9g5-docker-27.3.0" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/xb8d5lcgcp2vr6fmy649dfwagkxzrjlw-docker-27.2.0", + "path": "/nix/store/z5kr0jj4h5zlvybdcckslhv13q1ys407-docker-27.3.0", "default": true } ], - "store_path": "/nix/store/xb8d5lcgcp2vr6fmy649dfwagkxzrjlw-docker-27.2.0" + "store_path": "/nix/store/z5kr0jj4h5zlvybdcckslhv13q1ys407-docker-27.3.0" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/r4p9kjvzj8amd4pc217gf098p8p2bgi8-docker-27.2.0", + "path": "/nix/store/28sn43pf5245rr0iham0222qgwrrp66z-docker-27.3.0", "default": true } ], - "store_path": "/nix/store/r4p9kjvzj8amd4pc217gf098p8p2bgi8-docker-27.2.0" + "store_path": "/nix/store/28sn43pf5245rr0iham0222qgwrrp66z-docker-27.3.0" } } }, @@ -365,54 +365,6 @@ } } }, - "go-licenses@latest": { - "last_modified": "2024-09-10T15:01:03Z", - "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#go-licenses", - "source": "devbox-search", - "version": "1.6.0", - "systems": { - "aarch64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/xrqf812ghh9mag43vpjq5n95hs6cjazh-go-licenses-1.6.0", - "default": true - } - ], - "store_path": "/nix/store/xrqf812ghh9mag43vpjq5n95hs6cjazh-go-licenses-1.6.0" - }, - "aarch64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/awh5r3dix6iw3qh175zpk37sv36frrsg-go-licenses-1.6.0", - "default": true - } - ], - "store_path": "/nix/store/awh5r3dix6iw3qh175zpk37sv36frrsg-go-licenses-1.6.0" - }, - "x86_64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/91pyjlqq8rkp89cvfnkb2rk051jcrzpw-go-licenses-1.6.0", - "default": true - } - ], - "store_path": "/nix/store/91pyjlqq8rkp89cvfnkb2rk051jcrzpw-go-licenses-1.6.0" - }, - "x86_64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/r4kp26590jzkacciq06sz4rd6r0nzb2f-go-licenses-1.6.0", - "default": true - } - ], - "store_path": "/nix/store/r4kp26590jzkacciq06sz4rd6r0nzb2f-go-licenses-1.6.0" - } - } - }, "go@1.23": { "last_modified": "2024-09-10T15:01:03Z", "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#go_1_23", @@ -654,8 +606,8 @@ } }, "jq@latest": { - "last_modified": "2024-09-23T10:58:17Z", - "resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#jq", + "last_modified": "2024-09-29T05:15:19Z", + "resolved": "github:NixOS/nixpkgs/2dcd9c55e8914017226f5948ac22c53872a13ee2#jq", "source": "devbox-search", "version": "1.7.1", "systems": { @@ -671,10 +623,6 @@ "path": "/nix/store/gxakkni5fxplsxkhlpd1y39z848r9w1k-jq-1.7.1-man", "default": true }, - { - "name": "lib", - "path": "/nix/store/1xx96kscxipvqg02hg5zhkc3p6jg8dax-jq-1.7.1-lib" - }, { "name": "out", "path": "/nix/store/49pvp5zyzs3kqafdrvl5l8zrr5gxg2ha-jq-1.7.1" @@ -686,6 +634,10 @@ { "name": "doc", "path": "/nix/store/dgrfyris3jajhimxw0p5qwpmdwsz0k6m-jq-1.7.1-doc" + }, + { + "name": "lib", + "path": "/nix/store/1xx96kscxipvqg02hg5zhkc3p6jg8dax-jq-1.7.1-lib" } ], "store_path": "/nix/store/9h78n0xjxgjmmb37bi8ca6wyikx357fn-jq-1.7.1-bin" @@ -702,6 +654,10 @@ "path": "/nix/store/m2q5jyh2ifvyy71054kvdq12bq1kny0q-jq-1.7.1-man", "default": true }, + { + "name": "dev", + "path": "/nix/store/xwy0g4wfzibz2hv9gnrcmg4hncncg0gx-jq-1.7.1-dev" + }, { "name": "doc", "path": "/nix/store/3scw7wdaz3mnigbqpir7yd81lfx4vb4a-jq-1.7.1-doc" @@ -713,10 +669,6 @@ { "name": "out", "path": "/nix/store/hsrxl3njwwhi8zcbdrradmzdhf8q8b2c-jq-1.7.1" - }, - { - "name": "dev", - "path": "/nix/store/xwy0g4wfzibz2hv9gnrcmg4hncncg0gx-jq-1.7.1-dev" } ], "store_path": "/nix/store/d53sa7n91q32bj4n3d8yfih66w0cnybk-jq-1.7.1-bin" @@ -733,6 +685,10 @@ "path": "/nix/store/b7g1b4d9bkrii1l08h7jm42m346rch3n-jq-1.7.1-man", "default": true }, + { + "name": "out", + "path": "/nix/store/m8y9qhibbih84af3vqs4wl72k9dpyiyj-jq-1.7.1" + }, { "name": "dev", "path": "/nix/store/mz2z5g6xiji538wkxclm7hxjqcji8kj0-jq-1.7.1-dev" @@ -744,10 +700,6 @@ { "name": "lib", "path": "/nix/store/0lg1w92gx3aam7b1h311ssmjq63p3kd4-jq-1.7.1-lib" - }, - { - "name": "out", - "path": "/nix/store/m8y9qhibbih84af3vqs4wl72k9dpyiyj-jq-1.7.1" } ], "store_path": "/nix/store/vprdq5a3dk284s7blbxgaciqn90j5vgy-jq-1.7.1-bin" @@ -1182,8 +1134,8 @@ } }, "wget@latest": { - "last_modified": "2024-09-23T10:58:17Z", - "resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#wget", + "last_modified": "2024-09-24T01:22:05Z", + "resolved": "github:NixOS/nixpkgs/189e5f171b163feb7791a9118afa778d9a1db81f#wget", "source": "devbox-search", "version": "1.24.5", "systems": { @@ -1191,11 +1143,11 @@ "outputs": [ { "name": "out", - "path": "/nix/store/sgakycbzmdkm6jb9r1jf30zrn0m6w2dr-wget-1.24.5", + "path": "/nix/store/psa874fw1wd425xqqk7q95hgnb6vdhxg-wget-1.24.5", "default": true } ], - "store_path": "/nix/store/sgakycbzmdkm6jb9r1jf30zrn0m6w2dr-wget-1.24.5" + "store_path": "/nix/store/psa874fw1wd425xqqk7q95hgnb6vdhxg-wget-1.24.5" }, "aarch64-linux": { "outputs": [ @@ -1211,11 +1163,11 @@ "outputs": [ { "name": "out", - "path": "/nix/store/xf0n0pbp63h7yx4vzvxdkp0y2xj0f97c-wget-1.24.5", + "path": "/nix/store/iz3hq7bsl1fhrfv5jasyplw17hyyp7hf-wget-1.24.5", "default": true } ], - "store_path": "/nix/store/xf0n0pbp63h7yx4vzvxdkp0y2xj0f97c-wget-1.24.5" + "store_path": "/nix/store/iz3hq7bsl1fhrfv5jasyplw17hyyp7hf-wget-1.24.5" }, "x86_64-linux": { "outputs": [ diff --git a/licenses.csv b/licenses.csv index e69de29bb2..e2ae770b8f 100644 --- a/licenses.csv +++ b/licenses.csv @@ -0,0 +1,151 @@ +cloud.google.com/go/auth,https://github.com/googleapis/google-cloud-go/blob/auth/v0.9.4/auth/LICENSE,Apache-2.0 +cloud.google.com/go/auth/oauth2adapt,https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt/v0.2.4/auth/oauth2adapt/LICENSE,Apache-2.0 +cloud.google.com/go/compute/apiv1,https://github.com/googleapis/google-cloud-go/blob/compute/v1.28.1/compute/apiv1/license_codes_client.go,Apache-2.0 +cloud.google.com/go/compute/internal,https://github.com/googleapis/google-cloud-go/blob/compute/v1.28.1/compute/LICENSE,Apache-2.0 +cloud.google.com/go/compute/metadata,https://github.com/googleapis/google-cloud-go/blob/compute/metadata/v0.5.1/compute/metadata/LICENSE,Apache-2.0 +cloud.google.com/go/iam,https://github.com/googleapis/google-cloud-go/blob/iam/v1.2.1/iam/LICENSE,Apache-2.0 +cloud.google.com/go/kms,https://github.com/googleapis/google-cloud-go/blob/kms/v1.20.0/kms/LICENSE,Apache-2.0 +cloud.google.com/go/longrunning,https://github.com/googleapis/google-cloud-go/blob/longrunning/v0.6.1/longrunning/LICENSE,Apache-2.0 +github.com/Azure/azure-sdk-for-go,https://github.com/Azure/azure-sdk-for-go/blob/v68.0.0/LICENSE.txt,MIT +github.com/Azure/azure-sdk-for-go/sdk/azcore,https://github.com/Azure/azure-sdk-for-go/blob/sdk/azcore/v1.14.0/sdk/azcore/LICENSE.txt,MIT +github.com/Azure/azure-sdk-for-go/sdk/azidentity,https://github.com/Azure/azure-sdk-for-go/blob/sdk/azidentity/v1.7.0/sdk/azidentity/LICENSE.txt,MIT +github.com/Azure/azure-sdk-for-go/sdk/internal,https://github.com/Azure/azure-sdk-for-go/blob/sdk/internal/v1.10.0/sdk/internal/LICENSE.txt,MIT +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault,https://github.com/Azure/azure-sdk-for-go/blob/sdk/resourcemanager/keyvault/armkeyvault/v1.4.0/sdk/resourcemanager/keyvault/armkeyvault/LICENSE.txt,MIT +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2,https://github.com/Azure/azure-sdk-for-go/blob/sdk/resourcemanager/network/armnetwork/v2.2.1/sdk/resourcemanager/network/armnetwork/LICENSE.txt,MIT +github.com/Azure/go-autorest/autorest,https://github.com/Azure/go-autorest/blob/autorest/v0.11.29/autorest/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/autorest/adal,https://github.com/Azure/go-autorest/blob/autorest/adal/v0.9.22/autorest/adal/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/autorest/azure/auth,https://github.com/Azure/go-autorest/blob/autorest/azure/auth/v0.5.13/autorest/azure/auth/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/autorest/azure/cli,https://github.com/Azure/go-autorest/blob/autorest/azure/cli/v0.4.6/autorest/azure/cli/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/autorest/date,https://github.com/Azure/go-autorest/blob/autorest/date/v0.3.0/autorest/date/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/autorest/to,https://github.com/Azure/go-autorest/blob/autorest/to/v0.4.0/autorest/to/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/autorest/validation,https://github.com/Azure/go-autorest/blob/autorest/validation/v0.3.1/autorest/validation/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/logger,https://github.com/Azure/go-autorest/blob/logger/v0.2.1/logger/LICENSE,Apache-2.0 +github.com/Azure/go-autorest/tracing,https://github.com/Azure/go-autorest/blob/tracing/v0.6.0/tracing/LICENSE,Apache-2.0 +github.com/AzureAD/microsoft-authentication-library-for-go/apps,https://github.com/AzureAD/microsoft-authentication-library-for-go/blob/v1.2.2/LICENSE,MIT +github.com/Masterminds/semver,https://github.com/Masterminds/semver/blob/v1.5.0/LICENSE.txt,MIT +github.com/antlr4-go/antlr/v4,https://github.com/antlr4-go/antlr/blob/v4.13.0/LICENSE,BSD-3-Clause +github.com/asaskevich/govalidator,https://github.com/asaskevich/govalidator/blob/f61b66f89f4a/LICENSE,MIT +github.com/aws/aws-sdk-go,https://github.com/aws/aws-sdk-go/blob/v1.55.5/LICENSE.txt,Apache-2.0 +github.com/aws/aws-sdk-go/internal/sync/singleflight,https://github.com/aws/aws-sdk-go/blob/v1.55.5/internal/sync/singleflight/LICENSE,BSD-3-Clause +github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LICENSE,MIT +github.com/blang/semver/v4,https://github.com/blang/semver/blob/v4.0.0/v4/LICENSE,MIT +github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.3.0/LICENSE.txt,MIT +github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/d8f796af33cc/LICENSE,ISC +github.com/dimchansky/utfbom,https://github.com/dimchansky/utfbom/blob/v1.1.1/LICENSE,Apache-2.0 +github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3.11.0/LICENSE,MIT +github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.9.0/v5/LICENSE,BSD-3-Clause +github.com/felixge/httpsnoop,https://github.com/felixge/httpsnoop/blob/v1.0.4/LICENSE.txt,MIT +github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.7.0/LICENSE,BSD-3-Clause +github.com/fxamacker/cbor/v2,https://github.com/fxamacker/cbor/blob/v2.7.0/LICENSE,MIT +github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v1.4.2/LICENSE,Apache-2.0 +github.com/go-logr/stdr,https://github.com/go-logr/stdr/blob/v1.2.2/LICENSE,Apache-2.0 +github.com/go-logr/zapr,https://github.com/go-logr/zapr/blob/v1.3.0/LICENSE,Apache-2.0 +github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.19.6/LICENSE,Apache-2.0 +github.com/go-openapi/jsonreference,https://github.com/go-openapi/jsonreference/blob/v0.20.2/LICENSE,Apache-2.0 +github.com/go-openapi/swag,https://github.com/go-openapi/swag/blob/v0.22.4/LICENSE,Apache-2.0 +github.com/go-test/deep,https://github.com/go-test/deep/blob/v1.1.1/LICENSE,MIT +github.com/gogo/protobuf,https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE,BSD-3-Clause +github.com/golang-jwt/jwt/v4,https://github.com/golang-jwt/jwt/blob/v4.5.0/LICENSE,MIT +github.com/golang-jwt/jwt/v5,https://github.com/golang-jwt/jwt/blob/v5.2.1/LICENSE,MIT +github.com/golang/groupcache/lru,https://github.com/golang/groupcache/blob/41bb18bfe9da/LICENSE,Apache-2.0 +github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.4/LICENSE,BSD-3-Clause +github.com/golang/snappy,https://github.com/golang/snappy/blob/v0.0.4/LICENSE,BSD-3-Clause +github.com/google/cel-go,https://github.com/google/cel-go/blob/v0.20.1/LICENSE,Apache-2.0 +github.com/google/gnostic-models,https://github.com/google/gnostic-models/blob/v0.6.8/LICENSE,Apache-2.0 +github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.6.0/LICENSE,BSD-3-Clause +github.com/google/go-querystring/query,https://github.com/google/go-querystring/blob/v1.1.0/LICENSE,BSD-3-Clause +github.com/google/gofuzz,https://github.com/google/gofuzz/blob/v1.2.0/LICENSE,Apache-2.0 +github.com/google/s2a-go,https://github.com/google/s2a-go/blob/v0.1.8/LICENSE.md,Apache-2.0 +github.com/google/uuid,https://github.com/google/uuid/blob/v1.6.0/LICENSE,BSD-3-Clause +github.com/googleapis/enterprise-certificate-proxy/client,https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.4/LICENSE,Apache-2.0 +github.com/googleapis/gax-go/v2,https://github.com/googleapis/gax-go/blob/v2.13.0/v2/LICENSE,BSD-3-Clause +github.com/imdario/mergo,https://github.com/imdario/mergo/blob/v0.3.12/LICENSE,BSD-3-Clause +github.com/jmespath/go-jmespath,https://github.com/jmespath/go-jmespath/blob/v0.4.0/LICENSE,Apache-2.0 +github.com/josharian/intern,https://github.com/josharian/intern/blob/v1.0.0/license.md,MIT +github.com/json-iterator/go,https://github.com/json-iterator/go/blob/v1.1.12/LICENSE,MIT +github.com/klauspost/compress,https://github.com/klauspost/compress/blob/v1.14.4/LICENSE,Apache-2.0 +github.com/klauspost/compress/internal/snapref,https://github.com/klauspost/compress/blob/v1.14.4/internal/snapref/LICENSE,BSD-3-Clause +github.com/klauspost/compress/zstd/internal/xxhash,https://github.com/klauspost/compress/blob/v1.14.4/zstd/internal/xxhash/LICENSE.txt,MIT +github.com/kylelemons/godebug,https://github.com/kylelemons/godebug/blob/v1.1.0/LICENSE,Apache-2.0 +github.com/mailru/easyjson,https://github.com/mailru/easyjson/blob/v0.7.7/LICENSE,MIT +github.com/mitchellh/go-homedir,https://github.com/mitchellh/go-homedir/blob/v1.1.0/LICENSE,MIT +github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0 +github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0 +github.com/mongodb-forks/digest,https://github.com/mongodb-forks/digest/blob/v1.1.0/COPYING,Apache-2.0 +github.com/mongodb/mongodb-atlas-kubernetes/v2,https://github.com/mongodb/mongodb-atlas-kubernetes/blob/HEAD/LICENSE,Apache-2.0 +github.com/montanaflynn/stats,https://github.com/montanaflynn/stats/blob/v0.7.1/LICENSE,MIT +github.com/munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause +github.com/nsf/jsondiff,https://github.com/nsf/jsondiff/blob/43f6cf3098c1/LICENSE,MIT +github.com/onsi/ginkgo/v2,https://github.com/onsi/ginkgo/blob/v2.20.2/LICENSE,MIT +github.com/onsi/gomega,https://github.com/onsi/gomega/blob/v1.34.2/LICENSE,MIT +github.com/pkg/browser,https://github.com/pkg/browser/blob/5ac0b6a4141c/LICENSE,BSD-2-Clause +github.com/pkg/errors,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause +github.com/pmezard/go-difflib/difflib,https://github.com/pmezard/go-difflib/blob/5d4384ee4fb2/LICENSE,BSD-3-Clause +github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.19.1/LICENSE,Apache-2.0 +github.com/prometheus/client_model/go,https://github.com/prometheus/client_model/blob/v0.6.1/LICENSE,Apache-2.0 +github.com/prometheus/common,https://github.com/prometheus/common/blob/v0.55.0/LICENSE,Apache-2.0 +github.com/prometheus/procfs,https://github.com/prometheus/procfs/blob/v0.15.1/LICENSE,Apache-2.0 +github.com/sethvargo/go-password/password,https://github.com/sethvargo/go-password/blob/v0.3.1/LICENSE,MIT +github.com/spf13/cobra,https://github.com/spf13/cobra/blob/v1.8.1/LICENSE.txt,Apache-2.0 +github.com/spf13/pflag,https://github.com/spf13/pflag/blob/v1.0.5/LICENSE,BSD-3-Clause +github.com/stoewer/go-strcase,https://github.com/stoewer/go-strcase/blob/v1.2.0/LICENSE,MIT +github.com/stretchr/objx,https://github.com/stretchr/objx/blob/v0.5.2/LICENSE,MIT +github.com/stretchr/testify,https://github.com/stretchr/testify/blob/v1.9.0/LICENSE,MIT +github.com/x448/float16,https://github.com/x448/float16/blob/v0.8.4/LICENSE,MIT +github.com/xdg-go/pbkdf2,https://github.com/xdg-go/pbkdf2/blob/v1.0.0/LICENSE,Apache-2.0 +github.com/xdg-go/scram,https://github.com/xdg-go/scram/blob/v1.1.2/LICENSE,Apache-2.0 +github.com/xdg-go/stringprep,https://github.com/xdg-go/stringprep/blob/v1.0.4/LICENSE,Apache-2.0 +github.com/youmark/pkcs8,https://github.com/youmark/pkcs8/blob/a2c0da244d78/LICENSE,MIT +go.mongodb.org/atlas-sdk/v20231115004,https://github.com/mongodb/atlas-sdk-go/blob/v20231115004.1.0/LICENSE,Apache-2.0 +go.mongodb.org/atlas-sdk/v20231115008,https://github.com/mongodb/atlas-sdk-go/blob/v20231115008.5.0/LICENSE,Apache-2.0 +go.mongodb.org/atlas/mongodbatlas,https://github.com/mongodb/go-client-mongodb-atlas/blob/v0.37.0/LICENSE,Apache-2.0 +go.mongodb.org/mongo-driver,https://github.com/mongodb/mongo-go-driver/blob/v1.17.0/LICENSE,Apache-2.0 +go.opencensus.io,https://github.com/census-instrumentation/opencensus-go/blob/v0.24.0/LICENSE,Apache-2.0 +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc,https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/google.golang.org/grpc/otelgrpc/v0.54.0/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE,Apache-2.0 +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp,https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/net/http/otelhttp/v0.54.0/instrumentation/net/http/otelhttp/LICENSE,Apache-2.0 +go.opentelemetry.io/otel,https://github.com/open-telemetry/opentelemetry-go/blob/v1.29.0/LICENSE,Apache-2.0 +go.opentelemetry.io/otel/metric,https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.29.0/metric/LICENSE,Apache-2.0 +go.opentelemetry.io/otel/trace,https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.29.0/trace/LICENSE,Apache-2.0 +go.uber.org/multierr,https://github.com/uber-go/multierr/blob/v1.11.0/LICENSE.txt,MIT +go.uber.org/zap,https://github.com/uber-go/zap/blob/v1.27.0/LICENSE,MIT +golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.27.0:LICENSE,BSD-3-Clause +golang.org/x/exp,https://cs.opensource.google/go/x/exp/+/8a7402ab:LICENSE,BSD-3-Clause +golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.29.0:LICENSE,BSD-3-Clause +golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.23.0:LICENSE,BSD-3-Clause +golang.org/x/sync,https://cs.opensource.google/go/x/sync/+/v0.8.0:LICENSE,BSD-3-Clause +golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.25.0:LICENSE,BSD-3-Clause +golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.24.0:LICENSE,BSD-3-Clause +golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.18.0:LICENSE,BSD-3-Clause +golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.6.0:LICENSE,BSD-3-Clause +gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0 +google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0.198.0/LICENSE,BSD-3-Clause +google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.198.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause +google.golang.org/genproto/googleapis,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/LICENSE,Apache-2.0 +google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/googleapis/api/LICENSE,Apache-2.0 +google.golang.org/genproto/googleapis/rpc,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/googleapis/rpc/LICENSE,Apache-2.0 +google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.66.2/LICENSE,Apache-2.0 +google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.34.2/LICENSE,BSD-3-Clause +gopkg.in/evanphx/json-patch.v4,https://github.com/evanphx/json-patch/blob/v4.12.0/LICENSE,BSD-3-Clause +gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause +gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0 +gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE,MIT +k8s.io/api,https://github.com/kubernetes/api/blob/v0.31.1/LICENSE,Apache-2.0 +k8s.io/apiextensions-apiserver/pkg,https://github.com/kubernetes/apiextensions-apiserver/blob/v0.31.1/LICENSE,Apache-2.0 +k8s.io/apimachinery/pkg,https://github.com/kubernetes/apimachinery/blob/v0.31.1/LICENSE,Apache-2.0 +k8s.io/apimachinery/third_party/forked/golang,https://github.com/kubernetes/apimachinery/blob/v0.31.1/third_party/forked/golang/LICENSE,BSD-3-Clause +k8s.io/apiserver/pkg,https://github.com/kubernetes/apiserver/blob/v0.31.1/LICENSE,Apache-2.0 +k8s.io/client-go,https://github.com/kubernetes/client-go/blob/v0.31.1/LICENSE,Apache-2.0 +k8s.io/component-base,https://github.com/kubernetes/component-base/blob/v0.31.1/LICENSE,Apache-2.0 +k8s.io/klog/v2,https://github.com/kubernetes/klog/blob/v2.130.1/LICENSE,Apache-2.0 +k8s.io/kube-openapi/pkg,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/LICENSE,Apache-2.0 +k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/internal/third_party/go-json-experiment/json/LICENSE,BSD-3-Clause +k8s.io/kube-openapi/pkg/validation/errors,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/validation/errors/LICENSE,Apache-2.0 +k8s.io/kube-openapi/pkg/validation/spec,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/validation/spec/LICENSE,Apache-2.0 +k8s.io/kube-openapi/pkg/validation/strfmt,https://github.com/kubernetes/kube-openapi/blob/70dd3763d340/pkg/validation/strfmt/LICENSE,Apache-2.0 +k8s.io/utils,https://github.com/kubernetes/utils/blob/18e509b52bc8/LICENSE,Apache-2.0 +k8s.io/utils/internal/third_party/forked/golang/net,https://github.com/kubernetes/utils/blob/18e509b52bc8/internal/third_party/forked/golang/LICENSE,BSD-3-Clause +sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.19.0/LICENSE,Apache-2.0 +sigs.k8s.io/json,https://github.com/kubernetes-sigs/json/blob/bc3834ca7abd/LICENSE,Apache-2.0 +sigs.k8s.io/structured-merge-diff/v4,https://github.com/kubernetes-sigs/structured-merge-diff/blob/v4.4.1/LICENSE,Apache-2.0 +sigs.k8s.io/yaml,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/LICENSE,Apache-2.0 +sigs.k8s.io/yaml/goyaml.v2,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/goyaml.v2/LICENSE,Apache-2.0 From d0fc6d4a469d0769bca0ae7ef38a82d8b41dd57d Mon Sep 17 00:00:00 2001 From: "jose.vazquez" Date: Mon, 30 Sep 2024 21:46:15 +0200 Subject: [PATCH 7/9] Bump all images to 1.23 also --- .github/actions/gen-install-scripts/Dockerfile | 2 +- Dockerfile.post-install | 2 +- fast.Dockerfile | 2 +- test/app/Dockerfile | 2 +- test/app/go.mod | 4 +--- tools/clean/go.mod | 4 +--- tools/makejwt/go.mod | 4 +--- tools/metrics/go.mod | 4 +--- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/actions/gen-install-scripts/Dockerfile b/.github/actions/gen-install-scripts/Dockerfile index 7dd9a52dbe..62a8cb748b 100644 --- a/.github/actions/gen-install-scripts/Dockerfile +++ b/.github/actions/gen-install-scripts/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 +FROM golang:1.23 ENV KUBECTL_VERSION 1.18.12 ENV GO111MODULE on diff --git a/Dockerfile.post-install b/Dockerfile.post-install index d5ff391a27..983defd9f6 100644 --- a/Dockerfile.post-install +++ b/Dockerfile.post-install @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.23 as builder ENV CGO_ENABLED=0 ENV GOOS=linux diff --git a/fast.Dockerfile b/fast.Dockerfile index 4c4cac4895..b27a791c9e 100644 --- a/fast.Dockerfile +++ b/fast.Dockerfile @@ -1,5 +1,5 @@ # TODO: Eventually replace main Dockerfile -FROM golang:1.22 as certs-source +FROM golang:1.23 as certs-source ARG GOTOOLCHAIN=auto # Using rolling tag to stay on latest UBI 9 diff --git a/test/app/Dockerfile b/test/app/Dockerfile index 8feaffb31b..414ae33bf1 100644 --- a/test/app/Dockerfile +++ b/test/app/Dockerfile @@ -1,7 +1,7 @@ # Please push to quay.io/mongodb/mongodb-atlas-kubernetes-operator-test-app:v1 # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.23 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/test/app/go.mod b/test/app/go.mod index e7389625a6..c00accdc40 100644 --- a/test/app/go.mod +++ b/test/app/go.mod @@ -1,8 +1,6 @@ module github.com/mongodb/mongodb-atlas-kubernetes/test/app -go 1.22.1 - -toolchain go1.22.5 +go 1.23.1 require ( github.com/gorilla/mux v1.8.0 diff --git a/tools/clean/go.mod b/tools/clean/go.mod index 341ba7129b..bf19abe638 100644 --- a/tools/clean/go.mod +++ b/tools/clean/go.mod @@ -1,8 +1,6 @@ module tools/clean -go 1.22.1 - -toolchain go1.22.5 +go 1.23.1 require ( cloud.google.com/go/compute v1.28.1 diff --git a/tools/makejwt/go.mod b/tools/makejwt/go.mod index 23fa745a88..d5cbaff10e 100644 --- a/tools/makejwt/go.mod +++ b/tools/makejwt/go.mod @@ -1,7 +1,5 @@ module tools/makejwt -go 1.22.1 - -toolchain go1.22.5 +go 1.23.1 require github.com/golang-jwt/jwt v3.2.2+incompatible diff --git a/tools/metrics/go.mod b/tools/metrics/go.mod index 21ec403b17..5e0e4b3eae 100644 --- a/tools/metrics/go.mod +++ b/tools/metrics/go.mod @@ -1,8 +1,6 @@ module tools/metrics -go 1.22.1 - -toolchain go1.22.5 +go 1.23.1 require ( github.com/google/go-github/v57 v57.0.0 From 30cc42b7c27faf70b7585cccd0505ca2bc92c103 Mon Sep 17 00:00:00 2001 From: josvaz Date: Tue, 1 Oct 2024 14:33:35 +0200 Subject: [PATCH 8/9] Apply suggestions from code review Use %w for error wrapping Co-authored-by: Sergiusz Urbaniak Signed-off-by: jose.vazquez --- .licenses-gomod.sha256 | 2 +- licenses.csv | 10 +++++----- pkg/controller/atlasproject/custom_roles.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.licenses-gomod.sha256 b/.licenses-gomod.sha256 index ad2141ee13..082c275813 100644 --- a/.licenses-gomod.sha256 +++ b/.licenses-gomod.sha256 @@ -1 +1 @@ -100644 f625a1833624ed1e502f99797221700e17ea944d go.mod +100644 6a6da89744c37c3cd16ce3e453f217e5927c2860 go.mod diff --git a/licenses.csv b/licenses.csv index e2ae770b8f..aa7fc1552f 100644 --- a/licenses.csv +++ b/licenses.csv @@ -1,8 +1,8 @@ -cloud.google.com/go/auth,https://github.com/googleapis/google-cloud-go/blob/auth/v0.9.4/auth/LICENSE,Apache-2.0 +cloud.google.com/go/auth,https://github.com/googleapis/google-cloud-go/blob/auth/v0.9.5/auth/LICENSE,Apache-2.0 cloud.google.com/go/auth/oauth2adapt,https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt/v0.2.4/auth/oauth2adapt/LICENSE,Apache-2.0 cloud.google.com/go/compute/apiv1,https://github.com/googleapis/google-cloud-go/blob/compute/v1.28.1/compute/apiv1/license_codes_client.go,Apache-2.0 cloud.google.com/go/compute/internal,https://github.com/googleapis/google-cloud-go/blob/compute/v1.28.1/compute/LICENSE,Apache-2.0 -cloud.google.com/go/compute/metadata,https://github.com/googleapis/google-cloud-go/blob/compute/metadata/v0.5.1/compute/metadata/LICENSE,Apache-2.0 +cloud.google.com/go/compute/metadata,https://github.com/googleapis/google-cloud-go/blob/compute/metadata/v0.5.2/compute/metadata/LICENSE,Apache-2.0 cloud.google.com/go/iam,https://github.com/googleapis/google-cloud-go/blob/iam/v1.2.1/iam/LICENSE,Apache-2.0 cloud.google.com/go/kms,https://github.com/googleapis/google-cloud-go/blob/kms/v1.20.0/kms/LICENSE,Apache-2.0 cloud.google.com/go/longrunning,https://github.com/googleapis/google-cloud-go/blob/longrunning/v0.6.1/longrunning/LICENSE,Apache-2.0 @@ -118,12 +118,12 @@ golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.24.0:LICENSE,BSD-3 golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.18.0:LICENSE,BSD-3-Clause golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.6.0:LICENSE,BSD-3-Clause gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0 -google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0.198.0/LICENSE,BSD-3-Clause -google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.198.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause +google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0.199.0/LICENSE,BSD-3-Clause +google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.199.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause google.golang.org/genproto/googleapis,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/LICENSE,Apache-2.0 google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/googleapis/api/LICENSE,Apache-2.0 google.golang.org/genproto/googleapis/rpc,https://github.com/googleapis/go-genproto/blob/8af14fe29dc1/googleapis/rpc/LICENSE,Apache-2.0 -google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.66.2/LICENSE,Apache-2.0 +google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.67.0/LICENSE,Apache-2.0 google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.34.2/LICENSE,BSD-3-Clause gopkg.in/evanphx/json-patch.v4,https://github.com/evanphx/json-patch/blob/v4.12.0/LICENSE,BSD-3-Clause gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause diff --git a/pkg/controller/atlasproject/custom_roles.go b/pkg/controller/atlasproject/custom_roles.go index 2a272dae46..e75b156260 100644 --- a/pkg/controller/atlasproject/custom_roles.go +++ b/pkg/controller/atlasproject/custom_roles.go @@ -200,7 +200,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol if ok { if stat.Status == status.CustomRoleStatusFailed { statuses = append(statuses, stat) - err = errors.Join(err, fmt.Errorf("%s", stat.Error)) + err = errors.Join(err, fmt.Errorf("%w", stat.Error)) } continue @@ -210,7 +210,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol statuses = append(statuses, stat) if stat.Status == status.CustomRoleStatusFailed { - err = errors.Join(err, fmt.Errorf("%s", stat.Error)) + err = errors.Join(err, fmt.Errorf("%w", stat.Error)) } continue @@ -220,7 +220,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol statuses = append(statuses, stat) if stat.Status == status.CustomRoleStatusFailed { - err = errors.Join(err, fmt.Errorf("%s", stat.Error)) + err = errors.Join(err, fmt.Errorf("%w", stat.Error)) } continue From e89ede549b70bf27551214b934ef9e8f19d32eaf Mon Sep 17 00:00:00 2001 From: josvaz Date: Tue, 1 Oct 2024 15:02:24 +0200 Subject: [PATCH 9/9] Apply suggestions from code review Revert to use `%s` again, because `stat.Error` is a `string` and thus cannot be wrapped as an error. --- pkg/controller/atlasproject/custom_roles.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/atlasproject/custom_roles.go b/pkg/controller/atlasproject/custom_roles.go index e75b156260..2a272dae46 100644 --- a/pkg/controller/atlasproject/custom_roles.go +++ b/pkg/controller/atlasproject/custom_roles.go @@ -200,7 +200,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol if ok { if stat.Status == status.CustomRoleStatusFailed { statuses = append(statuses, stat) - err = errors.Join(err, fmt.Errorf("%w", stat.Error)) + err = errors.Join(err, fmt.Errorf("%s", stat.Error)) } continue @@ -210,7 +210,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol statuses = append(statuses, stat) if stat.Status == status.CustomRoleStatusFailed { - err = errors.Join(err, fmt.Errorf("%w", stat.Error)) + err = errors.Join(err, fmt.Errorf("%s", stat.Error)) } continue @@ -220,7 +220,7 @@ func syncCustomRolesStatus(ctx *workflow.Context, desiredCustomRoles []customrol statuses = append(statuses, stat) if stat.Status == status.CustomRoleStatusFailed { - err = errors.Join(err, fmt.Errorf("%w", stat.Error)) + err = errors.Join(err, fmt.Errorf("%s", stat.Error)) } continue