From 9a67fa32c588eaae77353802b75bba6dfc0e8c44 Mon Sep 17 00:00:00 2001 From: mio Date: Mon, 17 Mar 2025 22:13:18 +0000 Subject: [PATCH] testing/opa: upgrade to 1.2.0 https://github.com/open-policy-agent/opa/releases/tag/v1.2.0 --- testing/opa/APKBUILD | 8 ++++---- testing/opa/update-wasmtime-go.patch | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/testing/opa/APKBUILD b/testing/opa/APKBUILD index 99eb7409a3c..3f75fdfb0db 100644 --- a/testing/opa/APKBUILD +++ b/testing/opa/APKBUILD @@ -1,7 +1,7 @@ maintainer="Hoang Nguyen " pkgname=opa -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=0 pkgdesc="Open source, general-purpose policy engine" url="https://www.openpolicyagent.org/" arch="x86_64 aarch64" # blocked by wasmtime @@ -75,6 +75,6 @@ package() { } sha512sums=" -28ec16be43b527b2cb666b66ec598dac4b060d06084534c55cc90b68b41f05eee145961805b84354aec5e5c4de9c1d1bea3c6cb4c95f08f887a0003b79108d0d opa-1.1.0.tar.gz -1820e3a0cb45c6fc1a7c3d7fcbff2ee56d7189a9553aab505af17bb8efab98ed7e13819d1f65b28ffdb19c8ad534afd52f243c94b69a609b626a0955bc912c67 update-wasmtime-go.patch +510534afa3620f92f9e206557725b89a2f83019f9614c13d59a149a9bfc7b0b44daaf729b9ac0aca16b5370d77c4e8ce81459a2a916f296a68b90da42b289bef opa-1.2.0.tar.gz +25d1faa62636109beb3e15eb97c39e580ba188147a2f3632791476ee638f82a0f6e3098ef82088dd8d52e505437b63a6e30775b01adf8c08ea04f3ca57e2755e update-wasmtime-go.patch " diff --git a/testing/opa/update-wasmtime-go.patch b/testing/opa/update-wasmtime-go.patch index 703ddb4e035..46b38f83818 100644 --- a/testing/opa/update-wasmtime-go.patch +++ b/testing/opa/update-wasmtime-go.patch @@ -1,21 +1,21 @@ diff --git a/go.mod b/go.mod -index 4ffbd98b9..1c3dc83f8 100644 +index b106164..8edc6c2 100644 --- a/go.mod +++ b/go.mod -@@ -8,7 +8,7 @@ require ( - github.com/OneOfOne/xxhash v1.2.8 - github.com/agnivade/levenshtein v1.2.0 +@@ -5,7 +5,7 @@ go 1.23.6 + require ( + github.com/agnivade/levenshtein v1.2.1 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 - github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 + github.com/bytecodealliance/wasmtime-go/v28 v28.0.0 - github.com/containerd/containerd v1.7.25 + github.com/cespare/xxhash/v2 v2.3.0 + github.com/containerd/containerd v1.7.26 github.com/containerd/errdefs v1.0.0 - github.com/dgraph-io/badger/v4 v4.5.1 diff --git a/go.sum b/go.sum -index 9a447bdfb..d2b2d3bb1 100644 +index 0f67017..9782d0b 100644 --- a/go.sum +++ b/go.sum -@@ -16,8 +16,8 @@ github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig +@@ -14,8 +14,8 @@ github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -27,7 +27,7 @@ index 9a447bdfb..d2b2d3bb1 100644 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/internal/wasm/sdk/internal/wasm/bindings.go b/internal/wasm/sdk/internal/wasm/bindings.go -index 33ee7e451..867e4c173 100644 +index 33ee7e4..867e4c1 100644 --- a/internal/wasm/sdk/internal/wasm/bindings.go +++ b/internal/wasm/sdk/internal/wasm/bindings.go @@ -16,7 +16,7 @@ import ( @@ -40,7 +40,7 @@ index 33ee7e451..867e4c173 100644 "github.com/open-policy-agent/opa/v1/ast" "github.com/open-policy-agent/opa/v1/metrics" diff --git a/internal/wasm/sdk/internal/wasm/pool.go b/internal/wasm/sdk/internal/wasm/pool.go -index 0bb38b423..f16df12e3 100644 +index 7cbbc0b..c16e07a 100644 --- a/internal/wasm/sdk/internal/wasm/pool.go +++ b/internal/wasm/sdk/internal/wasm/pool.go @@ -9,7 +9,7 @@ import ( @@ -53,7 +53,7 @@ index 0bb38b423..f16df12e3 100644 "github.com/open-policy-agent/opa/internal/wasm/sdk/opa/errors" "github.com/open-policy-agent/opa/internal/wasm/util" diff --git a/internal/wasm/sdk/internal/wasm/vm.go b/internal/wasm/sdk/internal/wasm/vm.go -index e5f589623..b097a3f9c 100644 +index c0a4510..356a664 100644 --- a/internal/wasm/sdk/internal/wasm/vm.go +++ b/internal/wasm/sdk/internal/wasm/vm.go @@ -14,7 +14,7 @@ import (