change package of common-controller crd

wso2 · Oct 10, 2023 · 2548d19 · 2548d19
1 parent 4d16f8e
commit 2548d19
Show file tree

Hide file tree

Showing 28 changed files with 454 additions and 454 deletions.
diff --git a/common-controller/coverage.out b/common-controller/coverage.out
diff --git a/common-controller/internal/cache/datastore.go b/common-controller/internal/cache/datastore.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 
 	logger "github.com/sirupsen/logrus"
-	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
+	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/common-controller/internal/operator/PROJECT b/common-controller/internal/operator/PROJECT
@@ -15,6 +15,6 @@ resources:
   domain: wso2.com
   group: dp
   kind: RateLimitPolicy
-  path: github.com/wso2/apk/common-controller/api/v1alpha1
+  path: github.com/wso2/apk/common-controller/api/dp/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/common-controller/internal/operator/apis/cp/.gitKeep b/common-controller/internal/operator/apis/cp/.gitKeep
diff --git a/...ternal/operator/api/v1alpha1/api_types.go → ...al/operator/apis/dp/v1alpha1/api_types.go b/...ternal/operator/api/v1alpha1/api_types.go → ...al/operator/apis/dp/v1alpha1/api_types.go
diff --git a/...rnal/operator/api/v1alpha1/api_webhook.go → .../operator/apis/dp/v1alpha1/api_webhook.go b/...rnal/operator/api/v1alpha1/api_webhook.go → .../operator/apis/dp/v1alpha1/api_webhook.go
diff --git a/...operator/api/v1alpha1/api_webhook_test.go → ...ator/apis/dp/v1alpha1/api_webhook_test.go b/...operator/api/v1alpha1/api_webhook_test.go → ...ator/apis/dp/v1alpha1/api_webhook_test.go
diff --git a/.../operator/api/v1alpha1/apipolicy_types.go → ...rator/apis/dp/v1alpha1/apipolicy_types.go b/.../operator/api/v1alpha1/apipolicy_types.go → ...rator/apis/dp/v1alpha1/apipolicy_types.go
diff --git a/...perator/api/v1alpha1/apipolicy_webhook.go → ...tor/apis/dp/v1alpha1/apipolicy_webhook.go b/...perator/api/v1alpha1/apipolicy_webhook.go → ...tor/apis/dp/v1alpha1/apipolicy_webhook.go
diff --git a/...al/operator/api/v1alpha1/backend_types.go → ...perator/apis/dp/v1alpha1/backend_types.go b/...al/operator/api/v1alpha1/backend_types.go → ...perator/apis/dp/v1alpha1/backend_types.go
diff --git a/.../operator/api/v1alpha1/backend_webhook.go → ...rator/apis/dp/v1alpha1/backend_webhook.go b/.../operator/api/v1alpha1/backend_webhook.go → ...rator/apis/dp/v1alpha1/backend_webhook.go
diff --git a/...operator/api/v1alpha1/backendjwt_types.go → ...ator/apis/dp/v1alpha1/backendjwt_types.go b/...operator/api/v1alpha1/backendjwt_types.go → ...ator/apis/dp/v1alpha1/backendjwt_types.go
diff --git a/...erator/api/v1alpha1/backendjwt_webhook.go → ...or/apis/dp/v1alpha1/backendjwt_webhook.go b/...erator/api/v1alpha1/backendjwt_webhook.go → ...or/apis/dp/v1alpha1/backendjwt_webhook.go
diff --git a/...r/api/v1alpha1/custom_ratelimit_policy.go → ...is/dp/v1alpha1/custom_ratelimit_policy.go b/...r/api/v1alpha1/custom_ratelimit_policy.go → ...is/dp/v1alpha1/custom_ratelimit_policy.go
diff --git a/...perator/api/v1alpha1/groupversion_info.go → ...tor/apis/dp/v1alpha1/groupversion_info.go b/...perator/api/v1alpha1/groupversion_info.go → ...tor/apis/dp/v1alpha1/groupversion_info.go
diff --git a/.../api/v1alpha1/interceptorservice_types.go → ...s/dp/v1alpha1/interceptorservice_types.go b/.../api/v1alpha1/interceptorservice_types.go → ...s/dp/v1alpha1/interceptorservice_types.go
diff --git a/...pi/v1alpha1/interceptorservice_webhook.go → ...dp/v1alpha1/interceptorservice_webhook.go b/...pi/v1alpha1/interceptorservice_webhook.go → ...dp/v1alpha1/interceptorservice_webhook.go
diff --git a/...tor/api/v1alpha1/ratelimitpolicy_types.go → ...apis/dp/v1alpha1/ratelimitpolicy_types.go b/...tor/api/v1alpha1/ratelimitpolicy_types.go → ...apis/dp/v1alpha1/ratelimitpolicy_types.go
diff --git a/...r/api/v1alpha1/ratelimitpolicy_webhook.go → ...is/dp/v1alpha1/ratelimitpolicy_webhook.go b/...r/api/v1alpha1/ratelimitpolicy_webhook.go → ...is/dp/v1alpha1/ratelimitpolicy_webhook.go
diff --git a/...operator/api/v1alpha1/resolveRatelimit.go → ...ator/apis/dp/v1alpha1/resolveRatelimit.go b/...operator/api/v1alpha1/resolveRatelimit.go → ...ator/apis/dp/v1alpha1/resolveRatelimit.go
diff --git a/...erator/api/v1alpha1/webhook_suite_test.go → ...or/apis/dp/v1alpha1/webhook_suite_test.go b/...erator/api/v1alpha1/webhook_suite_test.go → ...or/apis/dp/v1alpha1/webhook_suite_test.go
diff --git a/...tor/api/v1alpha1/zz_generated.deepcopy.go → ...apis/dp/v1alpha1/zz_generated.deepcopy.go b/...tor/api/v1alpha1/zz_generated.deepcopy.go → ...apis/dp/v1alpha1/zz_generated.deepcopy.go
diff --git a/common-controller/internal/operator/controller/ratelimitpolicy_controller.go b/common-controller/internal/operator/controller/ratelimitpolicy_controller.go
@@ -43,7 +43,7 @@ import (
 	cache "github.com/wso2/apk/common-controller/internal/cache"
 	"github.com/wso2/apk/common-controller/internal/config"
 	loggers "github.com/wso2/apk/common-controller/internal/loggers"
-	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
+	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
 	constants "github.com/wso2/apk/common-controller/internal/operator/constant"
 	xds "github.com/wso2/apk/common-controller/internal/xds"
 )

diff --git a/common-controller/internal/operator/controller/suite_test.go b/common-controller/internal/operator/controller/suite_test.go
@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
+	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/common-controller/internal/operator/operator.go b/common-controller/internal/operator/operator.go
@@ -26,7 +26,7 @@ import (
 	"github.com/wso2/apk/adapter/pkg/logging"
 	cache "github.com/wso2/apk/common-controller/internal/cache"
 	"github.com/wso2/apk/common-controller/internal/loggers"
-	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
+	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
 	dpcontrollers "github.com/wso2/apk/common-controller/internal/operator/controller"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"

diff --git a/common-controller/internal/xds/ratelimiter_cache.go b/common-controller/internal/xds/ratelimiter_cache.go
@@ -30,7 +30,7 @@ import (
 	logger "github.com/sirupsen/logrus"
 	"github.com/wso2/apk/adapter/pkg/logging"
 	"github.com/wso2/apk/common-controller/internal/loggers"
-	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
+	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
 	constants "github.com/wso2/apk/common-controller/internal/operator/constant"
 )
 

diff --git a/common-controller/internal/xds/server.go b/common-controller/internal/xds/server.go
@@ -23,7 +23,7 @@ import (
 
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
-	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
+	dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
 )
 
 const (

diff --git a/common-controller/revive.toml b/common-controller/revive.toml
@@ -8,7 +8,7 @@ warningCode = 0
 [rule.context-as-argument]
 [rule.context-keys-type]
 [rule.dot-imports]
-exclude = ["internal/operator/api/v1alpha1/webhook_suite_test.go", "internal/operator/controller/suite_test.go"]
+exclude = ["internal/operator/apis/dp/v1alpha1/webhook_suite_test.go", "internal/operator/controller/suite_test.go"]
 [rule.error-return]
 [rule.error-strings]
 [rule.error-naming]