From 44d159bf696b7b7fa2b58b489926b55cac055d17 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:52:24 +0000 Subject: [PATCH 1/5] deps: update nix lock file --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ff650d9884..48e67ff0b4 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732013921, + "narHash": "sha256-grEEN4LjL4DTDZUyZjVcj9dXRykH/SKnpOIADN0q5w8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "5f5c2787576f3e39bbc2ebdbf8521b3177c5c19c", "type": "github" }, "original": { From 534f11aaf558f9391b206bd2735965b29917f1e6 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:27:38 +0100 Subject: [PATCH 2/5] overlays: drop dtc override Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- overlays/nixpkgs.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix index 499b5f6780..9e092499c4 100644 --- a/overlays/nixpkgs.nix +++ b/overlays/nixpkgs.nix @@ -44,14 +44,4 @@ final: prev: --set SOURCE_DATE_EPOCH 0 ''; }); - - # Upstream PR is currently in staging: https://github.com/NixOS/nixpkgs/pull/349201. - dtc = prev.dtc.overrideAttrs (prev: { - patches = final.lib.optionals (prev ? patches) prev.patches ++ [ - (final.fetchpatch2 { - url = "https://github.com/dgibson/dtc/commit/56a7d0cb3be5f2f7604bc42299e24d13a39c72d8.patch"; - hash = "sha256-GmAyk/K2OolH/Z8SsgwCcq3/GOlFuSpnVPr7jsy8Cs0="; - }) - ]; - }); } From 52e92d67f809bca6caa2cf7b7acb37f7fa7904b8 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:28:09 +0100 Subject: [PATCH 3/5] overlays: drop uplosi override Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- overlays/nixpkgs.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix index 9e092499c4..5561b6b42c 100644 --- a/overlays/nixpkgs.nix +++ b/overlays/nixpkgs.nix @@ -18,16 +18,6 @@ final: prev: withExtensions = with final.azure-cli.extensions; [ aks-preview ]; }; - # Use a newer uplosi that has fixes for private galleries. - uplosi = prev.uplosi.overrideAttrs (prev: { - src = final.fetchFromGitHub { - owner = "edgelesssys"; - repo = prev.pname; - rev = "fb292c23ed805cb4005fca41159d0f54bb0a5bcc"; - hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4="; - }; - }); - erofs-utils = prev.erofs-utils.overrideAttrs (prev: { patches = final.lib.optionals (prev ? patches) prev.patches ++ [ ./erofs-utils-reproducibility.patch From f71df383a4362c8280cd340e43c5ddf4d29b7403 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:39:26 +0100 Subject: [PATCH 4/5] treefmt: fix linter issues after golangci-lint update Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- cli/genpolicy/genpolicy_test.go | 2 +- e2e/internal/contrasttest/contrasttest.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/genpolicy/genpolicy_test.go b/cli/genpolicy/genpolicy_test.go index afb749a11e..2408f882ab 100644 --- a/cli/genpolicy/genpolicy_test.go +++ b/cli/genpolicy/genpolicy_test.go @@ -73,7 +73,7 @@ func TestRunner(t *testing.T) { yamlPath, err := os.ReadFile(yamlPathFile) require.NoError(err) - assert.Equal(expectedYAMLPath, string(yamlPath)) + assert.YAMLEq(expectedYAMLPath, string(yamlPath)) require.NoError(r.Teardown()) } diff --git a/e2e/internal/contrasttest/contrasttest.go b/e2e/internal/contrasttest/contrasttest.go index 249bf3c04e..31f2942230 100644 --- a/e2e/internal/contrasttest/contrasttest.go +++ b/e2e/internal/contrasttest/contrasttest.go @@ -67,9 +67,9 @@ func (ct *ContrastTest) Init(t *testing.T, resources []any) { require := require.New(t) f, err := os.Open(ct.ImageReplacementsFile) - require.NoError(err, fmt.Sprintf("Image replacements %s file not found", ct.ImageReplacementsFile)) + require.NoError(err, "Image replacements %s file not found", ct.ImageReplacementsFile) ct.ImageReplacements, err = kuberesource.ImageReplacementsFromFile(f) - require.NoError(err, fmt.Sprintf("Parsing image replacements from %s failed", ct.ImageReplacementsFile)) + require.NoError(err, "Parsing image replacements from %s failed", ct.ImageReplacementsFile) // If available, acquire a fifo ticket to synchronize cluster access with // other running e2e tests. We request a ticket and wait for our turn. From 7bcad4362460e2bfbd34340baef5d80f19ace68f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:41:32 +0100 Subject: [PATCH 5/5] treewide: update proto code after protoc update Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- internal/meshapi/meshapi.pb.go | 2 +- internal/meshapi/meshapi_grpc.pb.go | 2 +- internal/userapi/userapi.pb.go | 2 +- internal/userapi/userapi_grpc.pb.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/meshapi/meshapi.pb.go b/internal/meshapi/meshapi.pb.go index 9801d5ce9c..5e466ed61f 100644 --- a/internal/meshapi/meshapi.pb.go +++ b/internal/meshapi/meshapi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc v5.28.3 // source: meshapi.proto package meshapi diff --git a/internal/meshapi/meshapi_grpc.pb.go b/internal/meshapi/meshapi_grpc.pb.go index 949d13c5ce..a906009d26 100644 --- a/internal/meshapi/meshapi_grpc.pb.go +++ b/internal/meshapi/meshapi_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.28.2 +// - protoc v5.28.3 // source: meshapi.proto package meshapi diff --git a/internal/userapi/userapi.pb.go b/internal/userapi/userapi.pb.go index dcd252994d..57147be1c9 100644 --- a/internal/userapi/userapi.pb.go +++ b/internal/userapi/userapi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc v5.28.3 // source: userapi.proto package userapi diff --git a/internal/userapi/userapi_grpc.pb.go b/internal/userapi/userapi_grpc.pb.go index 792a5ae94a..5b6c472d3c 100644 --- a/internal/userapi/userapi_grpc.pb.go +++ b/internal/userapi/userapi_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.28.2 +// - protoc v5.28.3 // source: userapi.proto package userapi