Merge branch 'JaydipGabani-opent' into opent

go.mod

@@ -8,8 +8,9 @@ replace sigs.k8s.io/controller-runtime => ./third_party/sigs.k8s.io/controller-r
 require (
 	cloud.google.com/go/trace v1.10.4
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.44.0
-	github.com/dapr/go-sdk v1.8.0
-	github.com/davecgh/go-spew v1.1.1
+	github.com/dapr/dapr v1.12.2
+	github.com/dapr/go-sdk v1.9.1
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/dominikbraun/graph v0.16.2
 	github.com/go-logr/logr v1.3.0
 	github.com/go-logr/zapr v1.2.4
@@ -46,7 +47,7 @@ require (
 	k8s.io/apimachinery v0.27.4
 	k8s.io/client-go v0.27.4
 	k8s.io/klog/v2 v2.90.1
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	oras.land/oras-go v1.2.4
 	sigs.k8s.io/controller-runtime v0.15.0
 	sigs.k8s.io/release-utils v0.7.3
@@ -81,12 +82,12 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-chi/chi/v5 v5.0.8 // indirect
+	github.com/go-chi/chi/v5 v5.0.10 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -96,8 +97,8 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/cel-go v0.12.6 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/cel-go v0.13.0 // indirect
+	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
@@ -109,11 +110,11 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.16.0 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/dns v1.1.48 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -123,10 +124,10 @@ require (
 	github.com/open-policy-agent/opa v0.57.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@@ -143,7 +144,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.15.0 // indirect

pkg/pubsub/dapr/fake_dapr_client.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	daprClient "github.com/dapr/go-sdk/client"
-	commonv1pb "github.com/dapr/go-sdk/dapr/proto/common/v1"
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	commonv1pb "github.com/dapr/dapr/pkg/proto/common/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/uuid"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/pubsub/connection"

test/pubsub/fake-subscriber/main.go

@@ -9,28 +9,9 @@ import (
 
 	"github.com/dapr/go-sdk/service/common"
 	daprd "github.com/dapr/go-sdk/service/http"
+	"github.com/open-policy-agent/gatekeeper/v3/pkg/audit"
 )
 
-type PubsubMsg struct {
-	ID                    string            `json:"id,omitempty"`
-	Details               interface{}       `json:"details,omitempty"`
-	EventType             string            `json:"eventType,omitempty"`
-	Group                 string            `json:"group,omitempty"`
-	Version               string            `json:"version,omitempty"`
-	Kind                  string            `json:"kind,omitempty"`
-	Name                  string            `json:"name,omitempty"`
-	Namespace             string            `json:"namespace,omitempty"`
-	Message               string            `json:"message,omitempty"`
-	EnforcementAction     string            `json:"enforcementAction,omitempty"`
-	ConstraintAnnotations map[string]string `json:"constraintAnnotations,omitempty"`
-	ResourceGroup         string            `json:"resourceGroup,omitempty"`
-	ResourceAPIVersion    string            `json:"resourceAPIVersion,omitempty"`
-	ResourceKind          string            `json:"resourceKind,omitempty"`
-	ResourceNamespace     string            `json:"resourceNamespace,omitempty"`
-	ResourceName          string            `json:"resourceName,omitempty"`
-	ResourceLabels        map[string]string `json:"resourceLabels,omitempty"`
-}
-
 func main() {
 	auditChannel := os.Getenv("AUDIT_CHANNEL")
 	if auditChannel == "" {
@@ -52,7 +33,7 @@ func main() {
 }
 
 func eventHandler(_ context.Context, e *common.TopicEvent) (retry bool, err error) {
-	var msg PubsubMsg
+	var msg audit.PubsubMsg
 	jsonInput, err := strconv.Unquote(string(e.RawData))
 	if err != nil {
 		log.Fatalf("error unquoting %v", err)