Improvement/routeref new

adapter/internal/oasparser/envoyconf/routes_with_clusters_test.go

@@ -48,7 +48,7 @@ func TestCreateRoutesWithClustersWithExactAndRegularExpressionRules(t *testing.T
 			BasePath:   "/test-api/2.0.0",
 			Production: []v1alpha2.EnvConfig{
 				{
-					HTTPRouteRefs: []string{
+					RouteRefs: []string{
 						"test-api-2-prod-http-route",
 					},
 				},
@@ -218,7 +218,7 @@ func generateSampleAPI(apiName string, apiVersion string, basePath string) synch
 			BasePath:   basePath,
 			Production: []v1alpha2.EnvConfig{
 				{
-					HTTPRouteRefs: []string{
+					RouteRefs: []string{
 						apiName + "-prod-http-route",
 					},
 				},
@@ -281,7 +281,7 @@ func TestCreateRoutesWithClustersWithMultiplePathPrefixRules(t *testing.T) {
 			BasePath:   "/test-api/1.0.0",
 			Production: []v1alpha2.EnvConfig{
 				{
-					HTTPRouteRefs: []string{
+					RouteRefs: []string{
 						"test-api-1-prod-http-route",
 					},
 				},
@@ -430,7 +430,7 @@ func TestCreateRoutesWithClustersWithBackendTLSConfigs(t *testing.T) {
 			BasePath:   "/test-api-3/1.0.0",
 			Production: []v1alpha2.EnvConfig{
 				{
-					HTTPRouteRefs: []string{
+					RouteRefs: []string{
 						"test-api-3-prod-http-route",
 					},
 				},
@@ -553,7 +553,7 @@ func TestCreateRoutesWithClustersDifferentBackendRefs(t *testing.T) {
 			BasePath:   "/test-api-different-backendrefs/1.0.0",
 			Production: []v1alpha2.EnvConfig{
 				{
-					HTTPRouteRefs: []string{
+					RouteRefs: []string{
 						"test-api-different-backendrefs-prod-http-route",
 					},
 				},
@@ -645,7 +645,7 @@ func TestCreateRoutesWithClustersSameBackendRefs(t *testing.T) {
 			BasePath:   "/test-api-same-backendrefs/1.0.0",
 			Production: []v1alpha2.EnvConfig{
 				{
-					HTTPRouteRefs: []string{
+					RouteRefs: []string{
 						"test-api-same-backendrefs-prod-http-route",
 					},
 				},

adapter/internal/operator/controllers/dp/api_controller.go

@@ -300,10 +300,10 @@ func (apiReconciler *APIReconciler) applyStartupAPIs() {
 func (apiReconciler *APIReconciler) resolveAPIRefs(ctx context.Context, api dpv1alpha2.API) (*synchronizer.APIEvent, error) {
 	var prodRouteRefs, sandRouteRefs []string
 	if len(api.Spec.Production) > 0 {
-		prodRouteRefs = api.Spec.Production[0].HTTPRouteRefs
+		prodRouteRefs = api.Spec.Production[0].RouteRefs
 	}
 	if len(api.Spec.Sandbox) > 0 {
-		sandRouteRefs = api.Spec.Sandbox[0].HTTPRouteRefs
+		sandRouteRefs = api.Spec.Sandbox[0].RouteRefs
 	}
 
 	apiState := &synchronizer.APIState{
@@ -1484,7 +1484,7 @@ func addIndexes(ctx context.Context, mgr manager.Manager) error {
 			api := rawObj.(*dpv1alpha2.API)
 			var httpRoutes []string
 			if len(api.Spec.Production) > 0 {
-				for _, ref := range api.Spec.Production[0].HTTPRouteRefs {
+				for _, ref := range api.Spec.Production[0].RouteRefs {
 					if ref != "" {
 						httpRoutes = append(httpRoutes,
 							types.NamespacedName{
@@ -1495,7 +1495,7 @@ func addIndexes(ctx context.Context, mgr manager.Manager) error {
 				}
 			}
 			if len(api.Spec.Sandbox) > 0 {
-				for _, ref := range api.Spec.Sandbox[0].HTTPRouteRefs {
+				for _, ref := range api.Spec.Sandbox[0].RouteRefs {
 					if ref != "" {
 						httpRoutes = append(httpRoutes,
 							types.NamespacedName{
@@ -1515,7 +1515,7 @@ func addIndexes(ctx context.Context, mgr manager.Manager) error {
 			api := rawObj.(*dpv1alpha2.API)
 			var gqlRoutes []string
 			if len(api.Spec.Production) > 0 {
-				for _, ref := range api.Spec.Production[0].HTTPRouteRefs {
+				for _, ref := range api.Spec.Production[0].RouteRefs {
 					if ref != "" {
 						gqlRoutes = append(gqlRoutes,
 							types.NamespacedName{
@@ -1526,7 +1526,7 @@ func addIndexes(ctx context.Context, mgr manager.Manager) error {
 				}
 			}
 			if len(api.Spec.Sandbox) > 0 {
-				for _, ref := range api.Spec.Sandbox[0].HTTPRouteRefs {
+				for _, ref := range api.Spec.Sandbox[0].RouteRefs {
 					if ref != "" {
 						gqlRoutes = append(gqlRoutes,
 							types.NamespacedName{

adapter/internal/operator/synchronizer/synchronizer.go

@@ -224,7 +224,7 @@ func deployMultipleAPIsInGateway(event *APIEvent, successChannel *chan SuccessEv
 
 	updated := xds.UpdateXdsCacheOnAPIChange(updatedLabelsMap)
 	if updated {
-		loggers.LoggerAPKOperator.Info("XDS cache updated for apis: %+v", updatedAPIs)
+		loggers.LoggerAPKOperator.Infof("XDS cache updated for apis: %+v", updatedAPIs)
 		*successChannel <- SuccessEvent{
 			APINamespacedName: updatedAPIs,
 			State:             event.EventType,
@@ -234,7 +234,7 @@ func deployMultipleAPIsInGateway(event *APIEvent, successChannel *chan SuccessEv
 			paritionCh <- event
 		}
 	} else {
-		loggers.LoggerAPKOperator.Info("XDS cache not updated for APIs : %+v", updatedAPIs)
+		loggers.LoggerAPKOperator.Infof("XDS cache not updated for APIs : %+v", updatedAPIs)
 	}
 }
 

common-controller/internal/operator/controllers/dp/ratelimitpolicy_controller.go

@@ -289,7 +289,7 @@ func (ratelimitReconsiler *RateLimitPolicyReconciler) marshelRateLimit(ctx conte
 
 		if len(api.Spec.Production) > 0 && api.Spec.APIType == "REST" {
 			resolveResourceList, err := ratelimitReconsiler.getHTTPRouteResourceList(ctx, ratelimitKey, ratelimitPolicy,
-				api.Spec.Production[0].HTTPRouteRefs)
+				api.Spec.Production[0].RouteRefs)
 			if err != nil {
 				return nil, err
 			}
@@ -301,7 +301,7 @@ func (ratelimitReconsiler *RateLimitPolicyReconciler) marshelRateLimit(ctx conte
 
 		if len(api.Spec.Sandbox) > 0 && api.Spec.APIType == "REST" {
 			resolveResourceList, err := ratelimitReconsiler.getHTTPRouteResourceList(ctx, ratelimitKey, ratelimitPolicy,
-				api.Spec.Sandbox[0].HTTPRouteRefs)
+				api.Spec.Sandbox[0].RouteRefs)
 			if err != nil {
 				return nil, err
 			}

common-go-libs/apis/dp/v1alpha1/api_conversion.go

@@ -39,6 +39,22 @@ func (src *API) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.BasePath = src.Spec.BasePath
 	dst.Spec.Organization = src.Spec.Organization
 	dst.Spec.SystemAPI = src.Spec.SystemAPI
+	if src.Spec.Production != nil {
+		src.Spec.Production = []EnvConfig{}
+		for _, productionRef := range src.Spec.Production {
+			dst.Spec.Production = append(dst.Spec.Production, v1alpha2.EnvConfig{
+				RouteRefs: productionRef.HTTPRouteRefs,
+			})
+		}
+	}
+	if src.Spec.Sandbox != nil {
+		src.Spec.Sandbox = []EnvConfig{}
+		for _, sandboxRef := range src.Spec.Sandbox {
+			dst.Spec.Sandbox = append(dst.Spec.Sandbox, v1alpha2.EnvConfig{
+				RouteRefs: sandboxRef.HTTPRouteRefs,
+			})
+		}
+	}
 
 	// Convert []Property to []v1alpha2.Property
 	var properties []v1alpha2.Property
@@ -47,19 +63,6 @@ func (src *API) ConvertTo(dstRaw conversion.Hub) error {
 	}
 	dst.Spec.APIProperties = properties
 
-	// Convert []EnvConfig to []v1alpha2.EnvConfig
-	var production []v1alpha2.EnvConfig
-	for _, p := range src.Spec.Production {
-		production = append(production, v1alpha2.EnvConfig(p))
-	}
-	dst.Spec.Production = production
-
-	var sandbox []v1alpha2.EnvConfig
-	for _, s := range src.Spec.Sandbox {
-		sandbox = append(sandbox, v1alpha2.EnvConfig(s))
-	}
-	dst.Spec.Sandbox = sandbox
-
 	// Status
 	dst.Status.DeploymentStatus = v1alpha2.DeploymentStatus(src.Status.DeploymentStatus)
 
@@ -91,19 +94,6 @@ func (src *API) ConvertFrom(srcRaw conversion.Hub) error {
 	}
 	src.Spec.APIProperties = properties
 
-	// Convert []EnvConfig to []v1alpha1.EnvConfig
-	var production []EnvConfig
-	for _, p := range dst.Spec.Production {
-		production = append(production, EnvConfig(p))
-	}
-	src.Spec.Production = production
-
-	var sandbox []EnvConfig
-	for _, s := range dst.Spec.Sandbox {
-		sandbox = append(sandbox, EnvConfig(s))
-	}
-	src.Spec.Sandbox = sandbox
-
 	// Status
 	src.Status.DeploymentStatus = DeploymentStatus(dst.Status.DeploymentStatus)
 

common-go-libs/apis/dp/v1alpha2/api_types.go

@@ -47,7 +47,7 @@ type APISpec struct {
 	// +optional
 	IsDefaultVersion bool `json:"isDefaultVersion"`
 
-	// DefinitionFileRef contains the OpenAPI 3 or Swagger
+	// DefinitionFileRef contains the
 	// definition of the API in a ConfigMap.
 	//
 	// +optional
@@ -124,8 +124,8 @@ type Property struct {
 
 // EnvConfig contains the environment specific configuration
 type EnvConfig struct {
-	// HTTPRouteRefs denotes the environment of the API.
-	HTTPRouteRefs []string `json:"httpRouteRefs"`
+	// RouteRefs denotes the environment of the API.
+	RouteRefs []string `json:"routeRefs"`
 }
 
 // APIStatus defines the observed state of API

common-go-libs/apis/dp/v1alpha2/api_webhook.go

@@ -91,7 +91,6 @@ func (r *API) ValidateDelete() (admission.Warnings, error) {
 
 // validateAPI validate api crd fields
 func (r *API) validateAPI() error {
-	loggers.LoggerAPKOperator.Error("validating...")
 	var allErrs field.ErrorList
 	conf := config.ReadConfigs()
 	namespaces := conf.CommonController.Operator.Namespaces
@@ -127,17 +126,18 @@ func (r *API) validateAPI() error {
 		allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("organization"), "Organization can not be empty"))
 	}
 
-	if !(len(r.Spec.Production) > 0 && r.Spec.Production[0].HTTPRouteRefs != nil && len(r.Spec.Production[0].HTTPRouteRefs) > 0) && !(len(r.Spec.Sandbox) > 0 && r.Spec.Sandbox[0].HTTPRouteRefs != nil && len(r.Spec.Sandbox[0].HTTPRouteRefs) > 0) {
+	if !(len(r.Spec.Production) > 0 && r.Spec.Production[0].RouteRefs != nil && len(r.Spec.Production[0].RouteRefs) > 0) &&
+		!(len(r.Spec.Sandbox) > 0 && r.Spec.Sandbox[0].RouteRefs != nil && len(r.Spec.Sandbox[0].RouteRefs) > 0) {
 		allErrs = append(allErrs, field.Required(field.NewPath("spec"),
 			"both API production and sandbox endpoint references cannot be empty"))
 	}
 
 	var prodHTTPRoute1, sandHTTPRoute1 []string
 	if len(r.Spec.Production) > 0 {
-		prodHTTPRoute1 = r.Spec.Production[0].HTTPRouteRefs
+		prodHTTPRoute1 = r.Spec.Production[0].RouteRefs
 	}
 	if len(r.Spec.Sandbox) > 0 {
-		sandHTTPRoute1 = r.Spec.Sandbox[0].HTTPRouteRefs
+		sandHTTPRoute1 = r.Spec.Sandbox[0].RouteRefs
 	}
 
 	if isEmptyStringsInArray(prodHTTPRoute1) {
@@ -263,8 +263,7 @@ func validateGzip(name, namespace string) (string, string) {
 	configMap := &corev1.ConfigMap{}
 	if err := c.Get(context.Background(), types.NamespacedName{Name: string(name), Namespace: namespace}, configMap); err == nil {
 		var apiDef []byte
-		for key, val := range configMap.BinaryData {
-			loggers.LoggerAPKOperator.Error(key)
+		for _, val := range configMap.BinaryData {
 			// config map data key is "swagger.yaml"
 			apiDef = []byte(val)
 		}

common-go-libs/config/crd/bases/dp.wso2.com_apis.yaml

@@ -259,8 +259,8 @@ spec:
                 pattern: ^[/][a-zA-Z0-9~/_.-]*$
                 type: string
               definitionFileRef:
-                description: DefinitionFileRef contains the OpenAPI 3 or Swagger definition
-                  of the API in a ConfigMap.
+                description: DefinitionFileRef contains the definition of the API
+                  in a ConfigMap.
                 type: string
               definitionPath:
                 default: /api-definition
@@ -285,13 +285,13 @@ spec:
                 items:
                   description: EnvConfig contains the environment specific configuration
                   properties:
-                    httpRouteRefs:
-                      description: HTTPRouteRefs denotes the environment of the API.
+                    routeRefs:
+                      description: RouteRefs denotes the environment of the API.
                       items:
                         type: string
                       type: array
                   required:
-                  - httpRouteRefs
+                  - routeRefs
                   type: object
                 maxItems: 1
                 nullable: true
@@ -302,13 +302,13 @@ spec:
                 items:
                   description: EnvConfig contains the environment specific configuration
                   properties:
-                    httpRouteRefs:
-                      description: HTTPRouteRefs denotes the environment of the API.
+                    routeRefs:
+                      description: RouteRefs denotes the environment of the API.
                       items:
                         type: string
                       type: array
                   required:
-                  - httpRouteRefs
+                  - routeRefs
                   type: object
                 maxItems: 1
                 nullable: true

common-go-libs/go.sum

@@ -153,6 +153,7 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

developer/tryout/samples/sample-api.yaml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------
-apiVersion: dp.wso2.com/v1alpha1
+apiVersion: dp.wso2.com/v1alpha2
 kind: API
 metadata:
   name: http-bin-api
@@ -24,11 +24,11 @@ spec:
   basePath: /http-bin-api/1.0.8
   definitionFileRef: swagger-definition-http-bin-api
   production:
-    - httpRouteRefs:
+    - routeRefs:
       - prod-http-route-http-bin-api-p1
       - prod-http-route-http-bin-api-p2
   sandbox:
-    - httpRouteRefs:
+    - routeRefs:
       - sand-http-route-http-bin-api
   organization: a3b58ccf-6ecc-4557-b5bb-0a35cce38256
 ---