diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3d728e..f99767c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ name: Release policy jobs: test: name: run tests and linters - uses: kubewarden/github-actions/.github/workflows/reusable-test-policy-go.yml@v3.1.11 + uses: kubewarden/github-actions/.github/workflows/reusable-test-policy-go.yml@v3.1.12 release: needs: test @@ -22,6 +22,6 @@ jobs: # Required by cosign keyless signing id-token: write - uses: kubewarden/github-actions/.github/workflows/reusable-release-policy-go.yml@v3.1.11 + uses: kubewarden/github-actions/.github/workflows/reusable-release-policy-go.yml@v3.1.12 with: oci-target: ghcr.io/${{ github.repository_owner }}/policies/volumes-psp diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 214f01e..8ce2483 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,4 +3,4 @@ name: Continuous integration jobs: test: name: run tests and linters - uses: kubewarden/github-actions/.github/workflows/reusable-test-policy-go.yml@v3.1.11 + uses: kubewarden/github-actions/.github/workflows/reusable-test-policy-go.yml@v3.1.12 diff --git a/go.mod b/go.mod index 3d5a111..04f277b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/kubewarden/go-policy-template go 1.20 require ( - github.com/deckarep/golang-set/v2 v2.5.0 + github.com/deckarep/golang-set/v2 v2.6.0 github.com/francoispqt/onelog v0.0.0-20190306043706-8c2bb31b10a4 github.com/kubewarden/gjson v1.7.2 github.com/kubewarden/policy-sdk-go v0.5.1 diff --git a/go.sum b/go.sum index 8e25d20..fbb4e4c 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/deckarep/golang-set/v2 v2.4.0 h1:DnfgWKdhvHM8Kihdw9fKWXd08EdsPiyoHsk5 github.com/deckarep/golang-set/v2 v2.4.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/deckarep/golang-set/v2 v2.5.0 h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA= github.com/deckarep/golang-set/v2 v2.5.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= +github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/francoispqt/gojay v0.0.0-20181220093123-f2cc13a668ca h1:F2BD6Vhei4w0rtm4eNpzylNsB07CcCbpYA+xlqMx3mA= github.com/francoispqt/gojay v0.0.0-20181220093123-f2cc13a668ca/go.mod h1:H8Wgri1Asi1VevY3ySdpIK5+KCpqzToVswNq8g2xZj4= github.com/francoispqt/onelog v0.0.0-20190306043706-8c2bb31b10a4 h1:N9eG+1y9e3tnNPXKjssLMa8MumIBDWWoJQWM7htGWUc= diff --git a/vendor/github.com/deckarep/golang-set/v2/set.go b/vendor/github.com/deckarep/golang-set/v2/set.go index 28d2ada..292089d 100644 --- a/vendor/github.com/deckarep/golang-set/v2/set.go +++ b/vendor/github.com/deckarep/golang-set/v2/set.go @@ -62,6 +62,13 @@ type Set[T comparable] interface { // are all in the set. Contains(val ...T) bool + // ContainsOne returns whether the given item + // is in the set. + // + // Contains may cause the argument to escape to the heap. + // See: https://github.com/deckarep/golang-set/issues/118 + ContainsOne(val T) bool + // ContainsAny returns whether at least one of the // given items are in the set. ContainsAny(val ...T) bool diff --git a/vendor/github.com/deckarep/golang-set/v2/threadsafe.go b/vendor/github.com/deckarep/golang-set/v2/threadsafe.go index 6086f31..ad7a834 100644 --- a/vendor/github.com/deckarep/golang-set/v2/threadsafe.go +++ b/vendor/github.com/deckarep/golang-set/v2/threadsafe.go @@ -66,6 +66,14 @@ func (t *threadSafeSet[T]) Contains(v ...T) bool { return ret } +func (t *threadSafeSet[T]) ContainsOne(v T) bool { + t.RLock() + ret := t.uss.ContainsOne(v) + t.RUnlock() + + return ret +} + func (t *threadSafeSet[T]) ContainsAny(v ...T) bool { t.RLock() ret := t.uss.ContainsAny(v...) diff --git a/vendor/github.com/deckarep/golang-set/v2/threadunsafe.go b/vendor/github.com/deckarep/golang-set/v2/threadunsafe.go index 228bada..8b17b01 100644 --- a/vendor/github.com/deckarep/golang-set/v2/threadunsafe.go +++ b/vendor/github.com/deckarep/golang-set/v2/threadunsafe.go @@ -93,6 +93,11 @@ func (s threadUnsafeSet[T]) Contains(v ...T) bool { return true } +func (s threadUnsafeSet[T]) ContainsOne(v T) bool { + _, ok := s[v] + return ok +} + func (s threadUnsafeSet[T]) ContainsAny(v ...T) bool { for _, val := range v { if _, ok := s[val]; ok { diff --git a/vendor/modules.txt b/vendor/modules.txt index 3bf4194..e5031ef 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/deckarep/golang-set/v2 v2.5.0 +# github.com/deckarep/golang-set/v2 v2.6.0 ## explicit; go 1.18 github.com/deckarep/golang-set/v2 # github.com/francoispqt/gojay v0.0.0-20181220093123-f2cc13a668ca