From a3f9859eec4a38bc6d0cd1549dc9ac17de23db93 Mon Sep 17 00:00:00 2001 From: Thibault NORMAND Date: Wed, 26 Jul 2023 08:56:42 +0200 Subject: [PATCH] chore(release): v2.1.3 (#232) * chore(release): v2.1.3 * chore(doc): update changelog --- CHANGELOG.md | 23 ++++++++++++++++++++ default.nix | 2 +- flake.lock | 12 +++++----- flake.nix | 6 ++--- pkg/bundle/ruleset/engine/cel/ext/package.go | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed399df3..09b79b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ +## 2.1.3 + +### 2022-07-26 + +DIST: + +* CI + * Build with Golang 1.20.6 + * Dependency updates + +## 2.1.2 + +### 2022-07-11 + +DIST: + +* CI + * Dependency updates + ## 2.1.1 +### 2022-06-22 + DIST: * CI @@ -9,6 +30,8 @@ DIST: ## 2.1.0 +### 2022-06-02 + FEATURES: * container/seal: diff --git a/default.nix b/default.nix index 447ec702..b3e80f33 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { src = lib.cleanSource ./.; subPackages = [ "cmd/harp" ]; - vendorSha256 = "sha256-Y7tCEEpryLYdFDPAPssCnd/O3TcZsubbYCZSj2HeerA="; + vendorSha256 = "sha256-9D3JLNkXoQL+oa+P+i3uCI+wmpStLX5uWtHnZZrpRAc="; ldflags = [ "-s" "-w" "-buildid=" "-X zntr.io/harp/v2/build/version.Name=harp" diff --git a/flake.lock b/flake.lock index 615e3456..7dc254da 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1687335664, - "narHash": "sha256-gMoOCTUSLozoi+eSe99SGzjNJdgciMOoNxVJlVrqLfs=", + "lastModified": 1690266062, + "narHash": "sha256-ExihC8Pxu4iRZAKhiL6rxWrRCAmW9KXju1xCV50gzeU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7b697d9698d5ae350e49e8eeb05c568708bdd9f0", + "rev": "d0991cc3e51b8dbd3a7a3d8b22d43b125cdba588", "type": "github" }, "original": { @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dfc71775..becd7abf 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ owner = "frapposelli"; repo = "wwhrd"; rev = "${version}"; - sha256 = "sha256-OxJFxa833AmjFIOeLI94SxpP/Jlz7d4qglQwQm9TPG4="; + sha256 = "sha256-jppPciJR2A1uKWhr+CB1Aquh33JXag0gjoBvohdt6+k="; }; vendorSha256 = null; @@ -75,10 +75,10 @@ owner = "CycloneDX"; repo = "cyclonedx-gomod"; rev = "${version}"; - sha256 = "sha256-wrBFt06ym3tfSMJW+1KSv6J9dGwGqpqHIgjn50VlU0k="; + sha256 = "sha256-BTvvVwompM7Ie4BsRcjT4yxLLJc1qH1514A4uzwgGCc="; }; - vendorSha256 = "sha256-1gEDHn7EcNVY10ahaEirn8KghgxpsS2pLC7HoycE428="; + vendorSha256 = "sha256-uJgC44JtBSEwR6iKg8nmVmsFdyc3rtKSYxt8dbCABe0="; subPackages = [ "cmd/cyclonedx-gomod" ]; nativeBuildInputs = [ pkgs.installShellFiles ]; diff --git a/pkg/bundle/ruleset/engine/cel/ext/package.go b/pkg/bundle/ruleset/engine/cel/ext/package.go index 5f90a94f..6ce7e5fd 100644 --- a/pkg/bundle/ruleset/engine/cel/ext/package.go +++ b/pkg/bundle/ruleset/engine/cel/ext/package.go @@ -399,7 +399,7 @@ func celPackageIsCSOCompliant(lhs ref.Val) ref.Val { return types.Bool(true) } -func celPackageGetSecret(reg ref.TypeAdapter) func(lhs, rhs ref.Val) ref.Val { +func celPackageGetSecret(reg types.Adapter) func(lhs, rhs ref.Val) ref.Val { return func(lhs, rhs ref.Val) ref.Val { x, _ := lhs.ConvertToNative(reflect.TypeOf(&bundlev1.Package{})) p, ok := x.(*bundlev1.Package)