From c66848e6d06b37d4db52a7f5b894c633189f5f87 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 15:41:02 +0000 Subject: [PATCH 1/2] chore(deps): update dependency aquaproj/aqua-registry to v4.276.1 (#3364) * chore(deps): update dependency aquaproj/aqua-registry to v4.276.1 * chore(aqua): update aqua/aqua-checksums.json --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: aquaproj-aqua-releaser[bot] <95135029+aquaproj-aqua-releaser[bot]@users.noreply.github.com> --- aqua/aqua-checksums.json | 4 ++-- aqua/aqua.yaml | 2 +- pkg/controller/initcmd/init.go | 2 +- tests/3064/aqua.yaml | 2 +- tests/aliases/aqua.yaml | 2 +- tests/cargo/aqua.yaml | 2 +- tests/main/aqua.yaml | 2 +- tests/minisign/aqua.yaml | 2 +- tests/tag/aqua.yaml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aqua/aqua-checksums.json b/aqua/aqua-checksums.json index c087910bc..a9b361dc6 100644 --- a/aqua/aqua-checksums.json +++ b/aqua/aqua-checksums.json @@ -216,8 +216,8 @@ "algorithm": "sha256" }, { - "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.276.0/registry.yaml", - "checksum": "B43662956C2BA8D29D997334A2683D22907B477E243BDA43AE8C89DA5E110944EA1FA9D0EC218B96292FC36C9965AA65A39BDBA28E05FF28D0495B52B93E9B25", + "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.276.1/registry.yaml", + "checksum": "0B9D65A3E6C8761501CB6467019928A20F11B13D35FE8D392E18E56835CD87AFBC60A4BB0F7A1F6705C02A271723B312FF0A5DF874FB719CB11EC463EB231533", "algorithm": "sha512" } ] diff --git a/aqua/aqua.yaml b/aqua/aqua.yaml index 0c5dad11e..649b3eed0 100644 --- a/aqua/aqua.yaml +++ b/aqua/aqua.yaml @@ -7,6 +7,6 @@ checksum: require_checksum: true registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry packages: - import: imports/*.yaml diff --git a/pkg/controller/initcmd/init.go b/pkg/controller/initcmd/init.go index 230af7049..4454c6635 100644 --- a/pkg/controller/initcmd/init.go +++ b/pkg/controller/initcmd/init.go @@ -50,7 +50,7 @@ func (c *Controller) Init(ctx context.Context, logE *logrus.Entry, cfgFilePath s return nil } - registryVersion := "v4.276.0" // renovate: depName=aquaproj/aqua-registry + registryVersion := "v4.276.1" // renovate: depName=aquaproj/aqua-registry release, _, err := c.github.GetLatestRelease(ctx, "aquaproj", "aqua-registry") if err != nil { logerr.WithError(logE, err).WithFields(logrus.Fields{ diff --git a/tests/3064/aqua.yaml b/tests/3064/aqua.yaml index 5c8d14c19..ccd31e8d2 100644 --- a/tests/3064/aqua.yaml +++ b/tests/3064/aqua.yaml @@ -9,7 +9,7 @@ checksum: # - all registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry packages: - name: suzuki-shunsuke/cmdx version: v1.7.4 diff --git a/tests/aliases/aqua.yaml b/tests/aliases/aqua.yaml index 72b83ace9..f908bb883 100644 --- a/tests/aliases/aqua.yaml +++ b/tests/aliases/aqua.yaml @@ -9,7 +9,7 @@ # - all registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry packages: - name: hashicorp/terraform@v1.10.2 - name: hashicorp/terraform diff --git a/tests/cargo/aqua.yaml b/tests/cargo/aqua.yaml index d5487c070..233927e16 100644 --- a/tests/cargo/aqua.yaml +++ b/tests/cargo/aqua.yaml @@ -9,6 +9,6 @@ # - all registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry packages: - name: crates.io/skim@0.15.5 diff --git a/tests/main/aqua.yaml b/tests/main/aqua.yaml index 8a5c97802..483068a88 100644 --- a/tests/main/aqua.yaml +++ b/tests/main/aqua.yaml @@ -3,7 +3,7 @@ checksum: require_checksum: false registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry - null packages: diff --git a/tests/minisign/aqua.yaml b/tests/minisign/aqua.yaml index 583fce42b..4ae81112c 100644 --- a/tests/minisign/aqua.yaml +++ b/tests/minisign/aqua.yaml @@ -8,7 +8,7 @@ checksum: # - all registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry packages: - name: bufbuild/buf@v1.47.2 - name: bufbuild/buf diff --git a/tests/tag/aqua.yaml b/tests/tag/aqua.yaml index 779218157..f42f89259 100644 --- a/tests/tag/aqua.yaml +++ b/tests/tag/aqua.yaml @@ -7,7 +7,7 @@ # require_checksum: true registries: - type: standard - ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry packages: - name: suzuki-shunsuke/tfcmt@v4.14.0 tags: From 5737f8b3c80dc8c6cee76e3d33d22e16e785514e Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Mon, 16 Dec 2024 08:07:36 +0900 Subject: [PATCH 2/2] fix(cargo): normalize the install path of cargo packages (#3365) --- pkg/config/package.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/config/package.go b/pkg/config/package.go index ab6175f39..a4b2cb89b 100644 --- a/pkg/config/package.go +++ b/pkg/config/package.go @@ -100,7 +100,7 @@ func (p *Package) PkgPath(rootDir string, rt *runtime.Runtime) (string, error) { return filepath.Join(rootDir, "pkgs", pkgInfo.Type, p, pkg.Version, "bin"), nil case PkgInfoTypeCargo: registry := "crates.io" - return filepath.Join(rootDir, "pkgs", pkgInfo.Type, registry, pkgInfo.Crate, pkg.Version), nil + return filepath.Join(rootDir, "pkgs", pkgInfo.Type, registry, pkgInfo.Crate, strings.TrimPrefix(pkg.Version, "v")), nil case PkgInfoTypeGitHubContent, PkgInfoTypeGitHubRelease: if pkgInfo.RepoOwner == "aquaproj" && (pkgInfo.RepoName == "aqua" || pkgInfo.RepoName == "aqua-proxy") { return filepath.Join(rootDir, "internal", "pkgs", pkgInfo.Type, "github.com", pkgInfo.RepoOwner, pkgInfo.RepoName, pkg.Version, assetName), nil