Merge branch 'main' into tjons/6495-symlinks-building-bundles

open-policy-agent · Jun 7, 2024 · 8329087 · 8329087
2 parents 6ee5e4c + 7e98a1f
commit 8329087
Show file tree

Hide file tree

Showing 122 changed files with 19,428 additions and 2,573 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.3
+1.22.4
diff --git a/ast/parser.go b/ast/parser.go
@@ -943,12 +943,10 @@ func (p *Parser) parseHead(defaultRule bool) (*Head, bool) {
  p.illegal("expected rule value term (e.g., %s[%s] = <VALUE> { ... })", name, head.Key)
  }
  case tokens.Assign:
- s := p.save()
  p.scan()
  head.Assign = true
  head.Value = p.parseTermInfixCall()
  if head.Value == nil {
- p.restore(s)
  switch {
  case len(head.Args) > 0:
  p.illegal("expected function value term (e.g., %s(...) := <VALUE> { ... })", name)

diff --git a/ast/parser_test.go b/ast/parser_test.go
@@ -2191,13 +2191,37 @@ func TestRule(t *testing.T) {
  // TODO: expect expressions instead?
  assertParseErrorContains(t, "empty body", `f(_) = y {}`, "rego_parse_error: found empty body")
  assertParseErrorContains(t, "empty rule body", "p {}", "rego_parse_error: found empty body")
- assertParseErrorContains(t, "unmatched braces", `f(x) = y { trim(x, ".", y) `, `rego_parse_error: unexpected eof token: expected \n or ; or }`)
+ assertParseErrorContains(t, "unmatched braces", `f(x) = y { trim(x, ".", y) `, `rego_parse_error: unexpected eof token: expected \n or ; or }
+ f(x) = y { trim(x, ".", y) 
+ ^`)
 
  assertParseErrorContains(t, "no output", `f(_) = { "foo" = "bar" }`, "rego_parse_error: unexpected eq token: expected rule value term")
- assertParseErrorContains(t, "no output", `f(_) := { "foo" = "bar" }`, "rego_parse_error: unexpected assign token: expected function value term")
- assertParseErrorContains(t, "no output", `f := { "foo" = "bar" }`, "rego_parse_error: unexpected assign token: expected rule value term")
- assertParseErrorContains(t, "no output", `f[_] := { "foo" = "bar" }`, "rego_parse_error: unexpected assign token: expected rule value term")
- assertParseErrorContains(t, "no output", `default f :=`, "rego_parse_error: unexpected assign token: expected default rule value term")
+
+ assertParseErrorContains(t, "no output", `f(_) := { "foo" = "bar" }`, `rego_parse_error: unexpected eq token: non-terminated set
+ f(_) := { "foo" = "bar" }
+ ^
+1:17: rego_parse_error: unexpected eq token: expected function value term (e.g., f(...) := <VALUE> { ... })
+ f(_) := { "foo" = "bar" }
+ ^`)
+
+ assertParseErrorContains(t, "no output", `f := { "foo" = "bar" }`, `rego_parse_error: unexpected eq token: non-terminated set
+ f := { "foo" = "bar" }
+ ^
+1:14: rego_parse_error: unexpected eq token: expected rule value term (e.g., f := <VALUE> { ... })
+ f := { "foo" = "bar" }
+ ^`)
+ assertParseErrorContains(t, "no output", `f[_] := { "foo" = "bar" }`, `rego_parse_error: unexpected eq token: non-terminated set
+ f[_] := { "foo" = "bar" }
+ ^
+1:17: rego_parse_error: unexpected eq token: expected rule value term (e.g., f[_] := <VALUE> { ... })
+ f[_] := { "foo" = "bar" }
+ ^`)
+ assertParseErrorContains(t, "no output", `default f :=`, `rego_parse_error: unexpected eof token
+ default f :=
+ ^
+1:12: rego_parse_error: unexpected eof token: expected default rule value term (e.g., default f := <VALUE>)
+ default f :=
+ ^`)
 
  // TODO(tsandall): improve error checking here. This is a common mistake
  // and the current error message is not very good. Need to investigate if the

diff --git a/docs/content/editor-and-ide-support.md b/docs/content/editor-and-ide-support.md
@@ -21,6 +21,7 @@ evaluation, policy coverage, and more.
 | TextMate | [https://github.com/open-policy-agent/opa/tree/main/misc/syntax/textmate](https://github.com/open-policy-agent/opa/tree/main/misc/syntax/textmate) |
 | Vim | [https://github.com/tsandall/vim-rego](https://github.com/tsandall/vim-rego) |
 | Visual Studio Code | [https://marketplace.visualstudio.com/items?itemName=tsandall.opa](https://marketplace.visualstudio.com/items?itemName=tsandall.opa) |
+| Zed | [https://github.com/StyraInc/zed-rego](https://github.com/StyraInc/zed-rego) |
 
 ## Rego Playground
 

diff --git a/docs/content/monitoring.md b/docs/content/monitoring.md
@@ -51,7 +51,6 @@ The Prometheus endpoint exports Go runtime metrics as well as HTTP request laten
 | go_memstats_alloc_bytes_total | counter | Total number of bytes allocated, even if freed. | STABLE |
 | go_memstats_buck_hash_sys_bytes | gauge | Number of bytes used by the profiling bucket hash table. | STABLE |
 | go_memstats_frees_total | counter | Total number of frees. | STABLE |
-| go_memstats_gc_cpu_fraction | gauge | The fraction of this program's available CPU time used by the GC since the program started. | STABLE |
 | go_memstats_gc_sys_bytes | gauge | Number of bytes used for garbage collection system metadata. | STABLE |
 | go_memstats_heap_alloc_bytes | gauge | Number of heap bytes allocated and still in use. | STABLE |
 | go_memstats_heap_idle_bytes | gauge | Number of heap bytes waiting to be used. | STABLE |

diff --git a/docs/website/content/ecosystem/editors.md b/docs/website/content/ecosystem/editors.md
@@ -0,0 +1,8 @@
+---
+title: Code Editors
+description: Use OPA and Rego in your editor
+category: tool
+---
+
+This page lists OPA integrations in various editors. These integrations
+make it easier to write Rego in your editor of choice.
diff --git a/docs/website/content/integrations/flipt.md b/docs/website/content/integrations/flipt.md
@@ -0,0 +1,27 @@
+---
+title: Flipt
+subtitle: CloudNative Feature Flag Management
+labels:
+ layer: application
+ category: Feature Flags
+software:
+- golang
+- oidc
+inventors:
+- flipt
+blogs:
+- https://blog.flipt.io/authorization-with-open-policy-agent
+code:
+- https://github.com/flipt-io/flipt
+tutorials:
+- https://docs.flipt.io/authorization/overview
+- https://docs.flipt.io/guides/operation/authorization/rbac-with-keycloak
+- https://docs.flipt.io/configuration/authorization
+docs_features:
+ go-integration:
+ note: |
+ Flipt's authorization feature uses the Go API to embed Open Policy Agent and evaluate authorization policies.
+ [These docs](https://docs.flipt.io/authorization/overview)
+ explain how it works.
+---
+Flipt is an open-source, Enterprise-ready, GitOps enabled, CloudNative feature management solution.
diff --git a/docs/website/content/integrations/vscode-opa.md b/docs/website/content/integrations/vscode-opa.md
@@ -0,0 +1,28 @@
+---
+title: VS Code Extension
+subtitle: OPA Integration for the VS Code editor
+labels:
+ category: tooling
+ layer: editor
+code:
+- https://github.com/open-policy-agent/vscode-opa
+videos:
+- https://www.youtube.com/watch?v=BpMttxuPv6Y
+tutorials:
+- https://docs.styra.com/regal/editor-support#visual-studio-code
+software:
+- editors
+inventors:
+- styra
+docs_features:
+ editors:
+ note: |
+ This is the official VS Code extension for Rego and OPA. The
+ extension brings a number of features that make writing Rego easier
+ such as syntax highlighting, running of OPA tests as well as
+ completions, linting and more from the
+ [Regal Language Server](/integrations/regal/).
+---
+
+The [vscode-opa extension](https://marketplace.visualstudio.com/items?itemName=tsandall.opa) is a Visual Studio Code extension that provides support for the Rego language and OPA functionality. The extension includes syntax highlighting,
+and support for the [Regal Language Server](/integrations/regal/).
diff --git a/docs/website/content/integrations/zed-rego.md b/docs/website/content/integrations/zed-rego.md
@@ -0,0 +1,23 @@
+---
+title: Zed Extension
+subtitle: OPA Integration for the Zed editor
+labels:
+ category: tooling
+ layer: editor
+inventors:
+- styra
+code:
+- https://github.com/StyraInc/zed-rego
+software:
+- editors
+docs_features:
+ editors:
+ note: |
+ The Zed editor extension for Rego and OPA has support for
+ syntax highlighting, running of OPA tests, completions, linting
+ via the [Regal Language Server](/integrations/regal/).
+---
+The [zed-rego extension](https://github.com/StyraInc/zed-rego)
+is an extension for the [Zed editor](http:https://zed.dev) that provides
+support for the Rego language and OPA functionality. The extension
+also includes support for the [Regal Language Server](/integrations/regal/).
diff --git a/docs/website/content/organizations/flipt.md b/docs/website/content/organizations/flipt.md
@@ -0,0 +1,4 @@
+---
+link: https://www.flipt.io/
+title: Flipt
+---
diff --git a/docs/website/content/softwares/editors.md b/docs/website/content/softwares/editors.md
@@ -0,0 +1,4 @@
+---
+link: https://www.openpolicyagent.org/docs/latest/editor-and-ide-support/
+title: editors
+---
diff --git a/docs/website/static/img/logos/integrations/flipt.png b/docs/website/static/img/logos/integrations/flipt.png
diff --git a/docs/website/static/img/logos/integrations/vscode-opa.png b/docs/website/static/img/logos/integrations/vscode-opa.png
diff --git a/docs/website/static/img/logos/integrations/zed-rego.png b/docs/website/static/img/logos/integrations/zed-rego.png
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/agnivade/levenshtein v1.1.1
  github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
  github.com/bytecodealliance/wasmtime-go/v3 v3.0.2
- github.com/containerd/containerd v1.7.17
+ github.com/containerd/containerd v1.7.18
  github.com/dgraph-io/badger/v3 v3.2103.5
  github.com/fortytw2/leaktest v1.3.0
  github.com/foxcpp/go-mockdns v1.1.0
@@ -41,7 +41,7 @@ require (
  go.opentelemetry.io/otel/sdk v1.21.0
  go.opentelemetry.io/otel/trace v1.21.0
  go.uber.org/automaxprocs v1.5.3
- golang.org/x/net v0.25.0
+ golang.org/x/net v0.26.0
  golang.org/x/time v0.5.0
  google.golang.org/grpc v1.64.0
  gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
@@ -57,6 +57,7 @@ require (
  github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/cespare/xxhash v1.1.0 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/containerd/errdefs v0.1.0 // indirect
  github.com/containerd/log v0.1.0 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
  github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -100,11 +101,11 @@ require (
  go.uber.org/atomic v1.9.0 // indirect
  go.uber.org/multierr v1.9.0 // indirect
  golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
- golang.org/x/mod v0.14.0 // indirect
- golang.org/x/sync v0.6.0 // indirect
- golang.org/x/sys v0.20.0 // indirect
- golang.org/x/text v0.15.0 // indirect
- golang.org/x/tools v0.15.0 // indirect
+ golang.org/x/mod v0.17.0 // indirect
+ golang.org/x/sync v0.7.0 // indirect
+ golang.org/x/sys v0.21.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
+ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
  google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
  google.golang.org/protobuf v1.33.0 // indirect

diff --git a/go.sum b/go.sum
@@ -32,10 +32,12 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
-github.com/containerd/containerd v1.7.17 h1:KjNnn0+tAVQHAoaWRjmdak9WlvnFR/8rU1CHHy8Rm2A=
-github.com/containerd/containerd v1.7.17/go.mod h1:vK+hhT4TIv2uejlcDlbVIc8+h/BqtKLIyNrtCZol8lI=
+github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao=
+github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4=
 github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
 github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
+github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
+github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -297,8 +299,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -315,8 +318,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -329,8 +332,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -349,8 +352,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -365,8 +368,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -380,8 +383,9 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
 golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

diff --git a/internal/providers/aws/util.go b/internal/providers/aws/util.go
@@ -8,7 +8,7 @@ import (
  "github.com/open-policy-agent/opa/logging"
 )
 
-// DoRequestWithClient is a convenience function to get the body of a http response with
+// DoRequestWithClient is a convenience function to get the body of an HTTP response with
 // appropriate error-handling boilerplate and logging.
 func DoRequestWithClient(req *http.Request, client *http.Client, desc string, logger logging.Logger) ([]byte, error) {
  resp, err := client.Do(req)

diff --git a/vendor/github.com/containerd/containerd/archive/compression/compression.go b/vendor/github.com/containerd/containerd/archive/compression/compression.go
diff --git a/vendor/github.com/containerd/containerd/content/helpers.go b/vendor/github.com/containerd/containerd/content/helpers.go
diff --git a/vendor/github.com/containerd/containerd/content/local/locks.go b/vendor/github.com/containerd/containerd/content/local/locks.go
diff --git a/vendor/github.com/containerd/containerd/content/local/readerat.go b/vendor/github.com/containerd/containerd/content/local/readerat.go
diff --git a/vendor/github.com/containerd/containerd/content/local/store.go b/vendor/github.com/containerd/containerd/content/local/store.go
diff --git a/vendor/github.com/containerd/containerd/content/local/writer.go b/vendor/github.com/containerd/containerd/content/local/writer.go