From 655f8a7d73355a668df0c14232e4201c55f3ebd8 Mon Sep 17 00:00:00 2001 From: Avinash Patnala Date: Thu, 3 Oct 2024 21:20:04 +0000 Subject: [PATCH] update references of cel driver in codebase Signed-off-by: Avinash Patnala --- main.go | 2 +- pkg/controller/constraint/constraint_controller.go | 4 ++-- pkg/controller/constraint/constraint_controller_test.go | 2 +- .../constrainttemplate/constrainttemplate_controller.go | 4 ++-- .../constrainttemplate/constrainttemplate_controller_test.go | 4 ++-- pkg/drivers/k8scel/driver.go | 4 ++-- pkg/drivers/k8scel/transform/make_vap_objects.go | 2 +- pkg/drivers/k8scel/transform/make_vap_objects_test.go | 2 +- pkg/gator/test/test.go | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/main.go b/main.go index fe86af367f4..e7f035ef736 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,6 @@ import ( "github.com/go-logr/zapr" "github.com/open-policy-agent/cert-controller/pkg/rotator" constraintclient "github.com/open-policy-agent/frameworks/constraint/pkg/client" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel" "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/rego" frameworksexternaldata "github.com/open-policy-agent/frameworks/constraint/pkg/externaldata" api "github.com/open-policy-agent/gatekeeper/v3/apis" @@ -46,6 +45,7 @@ import ( "github.com/open-policy-agent/gatekeeper/v3/pkg/cachemanager" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/config/process" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel" "github.com/open-policy-agent/gatekeeper/v3/pkg/expansion" "github.com/open-policy-agent/gatekeeper/v3/pkg/externaldata" "github.com/open-policy-agent/gatekeeper/v3/pkg/metrics" diff --git a/pkg/controller/constraint/constraint_controller.go b/pkg/controller/constraint/constraint_controller.go index 089d3cb1e42..d91a9d9f6d8 100644 --- a/pkg/controller/constraint/constraint_controller.go +++ b/pkg/controller/constraint/constraint_controller.go @@ -27,12 +27,12 @@ import ( "github.com/go-logr/logr" "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1beta1" constraintclient "github.com/open-policy-agent/frameworks/constraint/pkg/client" - celSchema "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/transform" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" constraintstatusv1beta1 "github.com/open-policy-agent/gatekeeper/v3/apis/status/v1beta1" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/config/process" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/constraintstatus" + celSchema "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/transform" "github.com/open-policy-agent/gatekeeper/v3/pkg/logging" "github.com/open-policy-agent/gatekeeper/v3/pkg/metrics" "github.com/open-policy-agent/gatekeeper/v3/pkg/operations" diff --git a/pkg/controller/constraint/constraint_controller_test.go b/pkg/controller/constraint/constraint_controller_test.go index 87acc788ea1..ad244d39bd5 100644 --- a/pkg/controller/constraint/constraint_controller_test.go +++ b/pkg/controller/constraint/constraint_controller_test.go @@ -10,10 +10,10 @@ import ( "github.com/davecgh/go-spew/spew" apiconstraints "github.com/open-policy-agent/frameworks/constraint/pkg/apis/constraints" templatesv1 "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1" - celSchema "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" regoSchema "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/rego/schema" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" constraintstatusv1beta1 "github.com/open-policy-agent/gatekeeper/v3/apis/status/v1beta1" + celSchema "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" "github.com/open-policy-agent/gatekeeper/v3/pkg/metrics" "github.com/open-policy-agent/gatekeeper/v3/pkg/target" "github.com/open-policy-agent/gatekeeper/v3/pkg/util" diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller.go b/pkg/controller/constrainttemplate/constrainttemplate_controller.go index a9dbb7cccea..6af47e58c0c 100644 --- a/pkg/controller/constrainttemplate/constrainttemplate_controller.go +++ b/pkg/controller/constrainttemplate/constrainttemplate_controller.go @@ -24,13 +24,13 @@ import ( "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1beta1" constraintclient "github.com/open-policy-agent/frameworks/constraint/pkg/client" - celSchema "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/transform" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" statusv1beta1 "github.com/open-policy-agent/gatekeeper/v3/apis/status/v1beta1" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/constraint" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/constraintstatus" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/constrainttemplatestatus" + celSchema "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/transform" "github.com/open-policy-agent/gatekeeper/v3/pkg/logging" "github.com/open-policy-agent/gatekeeper/v3/pkg/metrics" "github.com/open-policy-agent/gatekeeper/v3/pkg/operations" diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go b/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go index f52d4fdc664..b1b282c13ed 100644 --- a/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go +++ b/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go @@ -25,13 +25,13 @@ import ( templatesv1 "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1" "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1beta1" constraintclient "github.com/open-policy-agent/frameworks/constraint/pkg/client" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel" - celSchema "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/rego" "github.com/open-policy-agent/frameworks/constraint/pkg/client/reviews" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" statusv1beta1 "github.com/open-policy-agent/gatekeeper/v3/apis/status/v1beta1" "github.com/open-policy-agent/gatekeeper/v3/pkg/controller/constraint" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel" + celSchema "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" "github.com/open-policy-agent/gatekeeper/v3/pkg/fakes" "github.com/open-policy-agent/gatekeeper/v3/pkg/readiness" "github.com/open-policy-agent/gatekeeper/v3/pkg/target" diff --git a/pkg/drivers/k8scel/driver.go b/pkg/drivers/k8scel/driver.go index 189e8e20fc9..19abedb1bb3 100644 --- a/pkg/drivers/k8scel/driver.go +++ b/pkg/drivers/k8scel/driver.go @@ -9,12 +9,12 @@ import ( "time" "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers" - pSchema "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/transform" "github.com/open-policy-agent/frameworks/constraint/pkg/client/reviews" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" "github.com/open-policy-agent/frameworks/constraint/pkg/instrumentation" "github.com/open-policy-agent/frameworks/constraint/pkg/types" + pSchema "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/transform" "github.com/open-policy-agent/opa/storage" admissionv1 "k8s.io/api/admission/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/drivers/k8scel/transform/make_vap_objects.go b/pkg/drivers/k8scel/transform/make_vap_objects.go index 3edba376d0d..abfc12ac1df 100644 --- a/pkg/drivers/k8scel/transform/make_vap_objects.go +++ b/pkg/drivers/k8scel/transform/make_vap_objects.go @@ -6,8 +6,8 @@ import ( apiconstraints "github.com/open-policy-agent/frameworks/constraint/pkg/apis/constraints" templatesv1beta1 "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1beta1" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/drivers/k8scel/transform/make_vap_objects_test.go b/pkg/drivers/k8scel/transform/make_vap_objects_test.go index 6586a5dc081..954c0f89219 100644 --- a/pkg/drivers/k8scel/transform/make_vap_objects_test.go +++ b/pkg/drivers/k8scel/transform/make_vap_objects_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/open-policy-agent/frameworks/constraint/pkg/apis/constraints" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel/schema" "github.com/open-policy-agent/frameworks/constraint/pkg/core/templates" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel/schema" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/gator/test/test.go b/pkg/gator/test/test.go index c7710a60351..3919c261dd1 100644 --- a/pkg/gator/test/test.go +++ b/pkg/gator/test/test.go @@ -7,9 +7,9 @@ import ( "github.com/open-policy-agent/frameworks/constraint/pkg/apis" templatesv1 "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1" constraintclient "github.com/open-policy-agent/frameworks/constraint/pkg/client" - "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/k8scel" "github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/rego" "github.com/open-policy-agent/frameworks/constraint/pkg/client/reviews" + "github.com/open-policy-agent/gatekeeper/v3/pkg/drivers/k8scel" "github.com/open-policy-agent/gatekeeper/v3/pkg/expansion" "github.com/open-policy-agent/gatekeeper/v3/pkg/gator/expand" "github.com/open-policy-agent/gatekeeper/v3/pkg/gator/reader"