update opa imports to v1 package

authorize/evaluator/evaluator.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-jose/go-jose/v3"
 	"github.com/hashicorp/go-set/v3"
-	"github.com/open-policy-agent/opa/rego"
+	"github.com/open-policy-agent/opa/v1/rego"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/pomerium/pomerium/authorize/internal/store"

authorize/evaluator/google_cloud_serverless.go

@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/open-policy-agent/opa/ast"
-	"github.com/open-policy-agent/opa/rego"
-	"github.com/open-policy-agent/opa/types"
+	"github.com/open-policy-agent/opa/v1/ast"
+	"github.com/open-policy-agent/opa/v1/rego"
+	"github.com/open-policy-agent/opa/v1/types"
 	"golang.org/x/oauth2"
 	"golang.org/x/sync/singleflight"
 	"google.golang.org/api/idtoken"

authorize/evaluator/headers_evaluator.go

@@ -7,8 +7,7 @@ import (
 	"time"
 
 	envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	"github.com/open-policy-agent/opa/rego"
-
+	"github.com/open-policy-agent/opa/v1/rego"
 	"github.com/pomerium/pomerium/authorize/internal/store"
 	"github.com/pomerium/pomerium/config"
 	"github.com/pomerium/pomerium/internal/telemetry/trace"

authorize/evaluator/headers_evaluator_test.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/go-jose/go-jose/v3/jwt"
-	"github.com/open-policy-agent/opa/rego"
+	"github.com/open-policy-agent/opa/v1/rego"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"

authorize/evaluator/log.go

@@ -1,7 +1,7 @@
 package evaluator
 
 import (
-	"github.com/open-policy-agent/opa/topdown/print"
+	"github.com/open-policy-agent/opa/v1/topdown/print"
 	"github.com/rs/zerolog"
 )
 

authorize/evaluator/log_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/open-policy-agent/opa/rego"
+	"github.com/open-policy-agent/opa/v1/rego"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

authorize/evaluator/policy_evaluator.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/open-policy-agent/opa/rego"
+	"github.com/open-policy-agent/opa/v1/rego"
 	octrace "go.opencensus.io/trace"
 
 	"github.com/pomerium/pomerium/authorize/internal/store"

authorize/internal/store/store.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/go-jose/go-jose/v3"
-	"github.com/open-policy-agent/opa/ast"
-	"github.com/open-policy-agent/opa/rego"
-	opastorage "github.com/open-policy-agent/opa/storage"
-	"github.com/open-policy-agent/opa/storage/inmem"
-	"github.com/open-policy-agent/opa/types"
+	"github.com/open-policy-agent/opa/v1/ast"
+	"github.com/open-policy-agent/opa/v1/rego"
+	opastorage "github.com/open-policy-agent/opa/v1/storage"
+	"github.com/open-policy-agent/opa/v1/storage/inmem"
+	"github.com/open-policy-agent/opa/v1/types"
 	octrace "go.opencensus.io/trace"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"

go.mod

@@ -180,7 +180,6 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mholt/acmez/v3 v3.0.0 // indirect
 	github.com/miekg/dns v1.1.62 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -238,7 +237,6 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap/exp v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

go.sum

@@ -153,8 +153,6 @@ github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HV
 github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q=
 github.com/caddyserver/certmagic v0.21.4 h1:e7VobB8rffHv8ZZpSiZtEwnLDHUwLVYLWzWSa1FfKI0=
 github.com/caddyserver/certmagic v0.21.4/go.mod h1:swUXjQ1T9ZtMv95qj7/InJvWLXURU85r+CfG0T+ZbDE=
-github.com/caddyserver/certmagic v0.21.5 h1:iIga4nZRgd27EIEbX7RZmoRMul+EVBn/h7bAGL83dnY=
-github.com/caddyserver/certmagic v0.21.5/go.mod h1:n1sCo7zV1Ez2j+89wrzDxo4N/T1Ws/Vx8u5NvuBFabw=
 github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA=
 github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -466,8 +464,6 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mholt/acmez/v2 v2.0.3 h1:CgDBlEwg3QBp6s45tPQmFIBrkRIkBT4rW4orMM6p4sw=
 github.com/mholt/acmez/v2 v2.0.3/go.mod h1:pQ1ysaDeGrIMvJ9dfJMk5kJNkn7L2sb3UhyrX6Q91cw=
-github.com/mholt/acmez/v3 v3.0.0 h1:r1NcjuWR0VaKP2BTjDK9LRFBw/WvURx3jlaEUl9Ht8E=
-github.com/mholt/acmez/v3 v3.0.0/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ=
 github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
 github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
@@ -772,8 +768,6 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
-go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

pkg/policy/criteria/accept.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )

pkg/policy/criteria/authenticated_user.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"

pkg/policy/criteria/claim.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"
 )

pkg/policy/criteria/client_certificate.go

@@ -7,8 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )

pkg/policy/criteria/client_certificate_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/open-policy-agent/opa/ast"
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

pkg/policy/criteria/cors_preflight.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )

pkg/policy/criteria/criteria.go

@@ -4,8 +4,7 @@ package criteria
 import (
 	"sync"
 
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 )
 

pkg/policy/criteria/criteria_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/open-policy-agent/opa/ast"
-	"github.com/open-policy-agent/opa/format"
-	"github.com/open-policy-agent/opa/rego"
-	"github.com/open-policy-agent/opa/types"
+	"github.com/open-policy-agent/opa/v1/ast"
+	"github.com/open-policy-agent/opa/v1/format"
+	"github.com/open-policy-agent/opa/v1/rego"
+	"github.com/open-policy-agent/opa/v1/types"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 

pkg/policy/criteria/device.go

@@ -3,8 +3,7 @@ package criteria
 import (
 	"fmt"
 
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"

pkg/policy/criteria/domain.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"
 )

pkg/policy/criteria/email.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"

pkg/policy/criteria/groups.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/datasource/pkg/directory"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"

pkg/policy/criteria/http_method.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )
 

pkg/policy/criteria/http_path.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )
 

pkg/policy/criteria/invalid_client_certificate.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )

pkg/policy/criteria/matchers.go

@@ -3,8 +3,7 @@ package criteria
 import (
 	"fmt"
 
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )
 

pkg/policy/criteria/matchers_test.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/open-policy-agent/opa/ast"
-	"github.com/open-policy-agent/opa/format"
+	"github.com/open-policy-agent/opa/v1/ast"
+	"github.com/open-policy-agent/opa/v1/format"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

pkg/policy/criteria/reject.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )

pkg/policy/criteria/user.go

@@ -1,8 +1,7 @@
 package criteria
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"

pkg/policy/generator/conditionals.go

@@ -3,8 +3,7 @@ package generator
 import (
 	"fmt"
 
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )
 

pkg/policy/generator/criterion.go

@@ -1,8 +1,7 @@
 package generator
 
 import (
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 )
 

pkg/policy/generator/generator.go

@@ -5,8 +5,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/open-policy-agent/opa/ast"
-
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/pomerium/pomerium/pkg/policy/parser"
 	"github.com/pomerium/pomerium/pkg/policy/rules"
 )

pkg/policy/generator/generator_test.go

@@ -3,8 +3,8 @@ package generator
 import (
 	"testing"
 
-	"github.com/open-policy-agent/opa/ast"
-	"github.com/open-policy-agent/opa/format"
+	"github.com/open-policy-agent/opa/v1/ast"
+	"github.com/open-policy-agent/opa/v1/format"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

pkg/policy/parser/json.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"math"
 
-	"github.com/open-policy-agent/opa/ast"
+	"github.com/open-policy-agent/opa/v1/ast"
 )
 
 // A Value is a JSON value. Either an object, array, string, number, boolean or null.

pkg/policy/parser/json_test.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"testing"
 
-	"github.com/open-policy-agent/opa/ast"
+	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/policy/policy.go

@@ -4,8 +4,7 @@ package policy
 import (
 	"io"
 
-	"github.com/open-policy-agent/opa/format"
-
+	"github.com/open-policy-agent/opa/v1/format"
 	"github.com/pomerium/pomerium/pkg/policy/criteria"
 	"github.com/pomerium/pomerium/pkg/policy/generator"
 	"github.com/pomerium/pomerium/pkg/policy/parser"

pkg/policy/rules/rules.go

@@ -1,7 +1,7 @@
 // Package rules contains useful pre-defined rego AST rules.
 package rules
 
-import "github.com/open-policy-agent/opa/ast"
+import "github.com/open-policy-agent/opa/v1/ast"
 
 // GetSession gets the session for the given id.
 func GetSession() *ast.Rule {