Feature/grpc

adapter/internal/oasparser/constants/constants.go

@@ -98,6 +98,7 @@ const (
  SOAP string = "SOAP"
  WS string = "WS"
  GRAPHQL string = "GraphQL"
+ GRPC string = "GRPC"
  WEBHOOK string = "WEBHOOK"
  SSE string = "SSE"
  Prototyped string = "prototyped"

adapter/internal/oasparser/envoyconf/internal_dtos.go

@@ -19,7 +19,7 @@ package envoyconf
 
 import (
  "github.com/wso2/apk/adapter/internal/oasparser/model"
- dpv1alpha2 "github.com/wso2/apk/common-go-libs/apis/dp/v1alpha2"
+ dpv1beta1 "github.com/wso2/apk/common-go-libs/apis/dp/v1beta1"
 )
 
 // routeCreateParams is the DTO used to provide information to the envoy route create function
@@ -41,7 +41,7 @@ type routeCreateParams struct {
  isDefaultVersion bool
  createDefaultPath bool
  apiLevelRateLimitPolicy *model.RateLimitPolicy
- apiProperties []dpv1alpha2.Property
+ apiProperties []dpv1beta1.Property
  environment string
  envType string
 }

adapter/internal/oasparser/envoyconf/routes_with_clusters.go

@@ -52,7 +52,7 @@ import (
  logging "github.com/wso2/apk/adapter/internal/logging"
  "github.com/wso2/apk/adapter/internal/oasparser/constants"
  "github.com/wso2/apk/adapter/internal/oasparser/model"
- dpv1alpha2 "github.com/wso2/apk/common-go-libs/apis/dp/v1alpha2"
+ dpv1beta1 "github.com/wso2/apk/common-go-libs/apis/dp/v1beta1"
  "google.golang.org/protobuf/proto"
  gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
@@ -197,6 +197,73 @@ func CreateRoutesWithClusters(adapterInternalAPI *model.AdapterInternalAPI, inte
  }
  return routes, clusters, endpoints, nil
  }
+ if adapterInternalAPI.GetAPIType() == constants.GRPC {
+ basePath := strings.TrimSuffix(adapterInternalAPI.Endpoints.Endpoints[0].Basepath, "/")
+
+ clusterName := getClusterName(adapterInternalAPI.Endpoints.EndpointPrefix, organizationID, vHost,
+ adapterInternalAPI.GetTitle(), apiVersion, "")
+ adapterInternalAPI.Endpoints.HTTP2BackendEnabled = true
+ cluster, address, err := processEndpoints(clusterName, adapterInternalAPI.Endpoints, timeout, basePath)
+ if err != nil {
+ logger.LoggerOasparser.ErrorC(logging.PrintError(logging.Error2239, logging.MAJOR,
+ "Error while adding grpc endpoints for %s:%v. %v", apiTitle, apiVersion, err.Error()))
+ return nil, nil, nil, fmt.Errorf("error while adding grpc endpoints for %s:%v. %v", apiTitle, apiVersion,
+ err.Error())
+ }
+ clusters = append(clusters, cluster)
+ endpoints = append(endpoints, address...)
+
+ for _, resource := range adapterInternalAPI.GetResources() {
+ var clusterName string
+ resourcePath := resource.GetPath()
+ endpoint := resource.GetEndpoints()
+ endpoint.HTTP2BackendEnabled = true
+ basePath := strings.TrimSuffix(endpoint.Endpoints[0].Basepath, "/")
+ existingClusterName := getExistingClusterName(*endpoint, processedEndpoints)
+
+ if existingClusterName == "" {
+ clusterName = getClusterName(endpoint.EndpointPrefix, organizationID, vHost, adapterInternalAPI.GetTitle(), apiVersion, resource.GetID())
+ cluster, address, err := processEndpoints(clusterName, endpoint, timeout, basePath)
+ if err != nil {
+ logger.LoggerOasparser.ErrorC(logging.PrintError(logging.Error2239, logging.MAJOR, "Error while adding resource level endpoints for %s:%v-%v. %v", apiTitle, apiVersion, resourcePath, err.Error()))
+ } else {
+ clusters = append(clusters, cluster)
+ endpoints = append(endpoints, address...)
+ processedEndpoints[clusterName] = *endpoint
+ }
+ } else {
+ clusterName = existingClusterName
+ }
+ // Create resource level interceptor clusters if required
+ clustersI, endpointsI, operationalReqInterceptors, operationalRespInterceptorVal := createInterceptorResourceClusters(adapterInternalAPI,
+ interceptorCerts, vHost, organizationID, apiRequestInterceptor, apiResponseInterceptor, resource)
+ clusters = append(clusters, clustersI...)
+ endpoints = append(endpoints, endpointsI...)
+ routeParams := genRouteCreateParams(adapterInternalAPI, resource, vHost, basePath, clusterName, *operationalReqInterceptors, *operationalRespInterceptorVal, organizationID,
+ false, false)
+
+ routeP, err := createRoutes(routeParams)
+ if err != nil {
+ logger.LoggerXds.ErrorC(logging.PrintError(logging.Error2231, logging.MAJOR,
+ "Error while creating routes for GRPC API %s %s for path: %s Error: %s", adapterInternalAPI.GetTitle(),
+ adapterInternalAPI.GetVersion(), resource.GetPath(), err.Error()))
+ return nil, nil, nil, fmt.Errorf("error while creating routes. %v", err)
+ }
+ routes = append(routes, routeP...)
+ if adapterInternalAPI.IsDefaultVersion {
+ defaultRoutes, errDefaultPath := createRoutes(genRouteCreateParams(adapterInternalAPI, resource, vHost, basePath, clusterName, *operationalReqInterceptors, *operationalRespInterceptorVal, organizationID,
+ false, true))
+ if errDefaultPath != nil {
+ logger.LoggerXds.ErrorC(logging.PrintError(logging.Error2231, logging.MAJOR, "Error while creating routes for GRPC API %s %s for path: %s Error: %s", adapterInternalAPI.GetTitle(), adapterInternalAPI.GetVersion(), removeFirstOccurrence(resource.GetPath(), adapterInternalAPI.GetVersion()), errDefaultPath.Error()))
+ return nil, nil, nil, fmt.Errorf("error while creating routes. %v", errDefaultPath)
+ }
+ routes = append(routes, defaultRoutes...)
+ }
+
+ }
+
+ return routes, clusters, endpoints, nil
+ }
  for _, resource := range adapterInternalAPI.GetResources() {
  var clusterName string
  resourcePath := resource.GetPath()
@@ -860,8 +927,14 @@ func createRoutes(params *routeCreateParams) (routes []*routev3.Route, err error
  decorator *routev3.Decorator
  )
  if params.createDefaultPath {
- xWso2Basepath = removeFirstOccurrence(xWso2Basepath, "/"+version)
- resourcePath = removeFirstOccurrence(resource.GetPath(), "/"+version)
+ //check if basepath is separated from version by a . or /
+ if strings.Contains(basePath, "."+version) {
+ xWso2Basepath = removeFirstOccurrence(basePath, "."+version)
+ resourcePath = removeFirstOccurrence(resource.GetPath(), "."+version)
+ } else {
+ xWso2Basepath = removeFirstOccurrence(xWso2Basepath, "/"+version)
+ resourcePath = removeFirstOccurrence(resource.GetPath(), "/"+version)
+ }
  }
 
  if pathMatchType != gwapiv1.PathMatchExact {
@@ -1058,6 +1131,16 @@ func createRoutes(params *routeCreateParams) (routes []*routev3.Route, err error
  rewritePath := generateRoutePathForReWrite(basePath, resourcePath, pathMatchType)
  action.Route.RegexRewrite = generateRegexMatchAndSubstitute(rewritePath, resourcePath, pathMatchType)
 
+ if apiType == "GRPC" {
+ match.Headers = nil
+ newRoutePath := "/" + strings.TrimPrefix(resourcePath, basePath+".")
+ if newRoutePath == "/"+resourcePath {
+ temp := removeFirstOccurrence(basePath, "."+version)
+ newRoutePath = "/" + strings.TrimPrefix(resourcePath, temp+".")
+ }
+ action.Route.RegexRewrite = generateRegexMatchAndSubstitute(rewritePath, newRoutePath, pathMatchType)
+ }
+
  route := generateRouteConfig(xWso2Basepath, match, action, nil, decorator, perRouteFilterConfigs,
  nil, nil, nil, nil) // general headers to add and remove are included in this methods
  routes = append(routes, route)
@@ -1209,8 +1292,14 @@ func CreateAPIDefinitionEndpoint(adapterInternalAPI *model.AdapterInternalAPI, v
 
  matchPath := basePath + endpoint
  if isDefaultversion {
- basePathWithoutVersion := removeLastOccurrence(basePath, "/"+version)
- matchPath = basePathWithoutVersion + endpoint
+ if adapterInternalAPI.GetAPIType() == "GRPC" {
+ basePathWithoutVersion := removeLastOccurrence(basePath, "."+version)
+ matchPath = basePathWithoutVersion + "/" + vHost + endpoint
+ } else {
+ basePathWithoutVersion := removeLastOccurrence(basePath, "/"+version)
+ matchPath = basePathWithoutVersion + endpoint
+
+ }
  }
 
  matchPath = strings.Replace(matchPath, basePath, regexp.QuoteMeta(basePath), 1)
@@ -1466,7 +1555,7 @@ func getUpgradeConfig(apiType string) []*routev3.RouteAction_UpgradeConfig {
  return upgradeConfig
 }
 
-func getAPIProperties(apiPropertiesConfig []dpv1alpha2.Property) string {
+func getAPIProperties(apiPropertiesConfig []dpv1beta1.Property) string {
  var apiProperties = make(map[string]string)
  for _, val := range apiPropertiesConfig {
  apiProperties[val.Name] = val.Value

adapter/internal/oasparser/envoyconf/routes_with_clusters_test.go

@@ -30,7 +30,7 @@ import (
  "github.com/wso2/apk/adapter/internal/operator/synchronizer"
  operatorutils "github.com/wso2/apk/adapter/internal/operator/utils"
  "github.com/wso2/apk/common-go-libs/apis/dp/v1alpha1"
- "github.com/wso2/apk/common-go-libs/apis/dp/v1alpha2"
+ "github.com/wso2/apk/common-go-libs/apis/dp/v1beta1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  k8types "k8s.io/apimachinery/pkg/types"
  gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
@@ -39,16 +39,16 @@ import (
 
 func TestCreateRoutesWithClustersWithExactAndRegularExpressionRules(t *testing.T) {
  apiState := synchronizer.APIState{}
- apiDefinition := v1alpha2.API{
+ apiDefinition := v1beta1.API{
  ObjectMeta: metav1.ObjectMeta{
  Namespace: "default",
  Name: "test-api-2",
  },
- Spec: v1alpha2.APISpec{
+ Spec: v1beta1.APISpec{
  APIName: "test-api-2",
  APIVersion: "2.0.0",
  BasePath: "/test-api/2.0.0",
- Production: []v1alpha2.EnvConfig{
+ Production: []v1beta1.EnvConfig{
  {
  RouteRefs: []string{
  "test-api-2-prod-http-route",
@@ -211,16 +211,16 @@ func TestExtractAPIDetailsFromHTTPRouteForSpecificEnvironment(t *testing.T) {
 func generateSampleAPI(apiName string, apiVersion string, basePath string) synchronizer.APIState {
 
  apiState := synchronizer.APIState{}
- apiDefinition := v1alpha2.API{
+ apiDefinition := v1beta1.API{
  ObjectMeta: metav1.ObjectMeta{
  Namespace: "default",
  Name: apiName,
  },
- Spec: v1alpha2.APISpec{
+ Spec: v1beta1.APISpec{
  APIName: apiName,
  APIVersion: apiVersion,
  BasePath: basePath,
- Production: []v1alpha2.EnvConfig{
+ Production: []v1beta1.EnvConfig{
  {
  RouteRefs: []string{
  apiName + "-prod-http-route",
@@ -274,16 +274,16 @@ func generateSampleAPI(apiName string, apiVersion string, basePath string) synch
 // TODO: Fix this test case
 func TestCreateRoutesWithClustersWithMultiplePathPrefixRules(t *testing.T) {
  apiState := synchronizer.APIState{}
- apiDefinition := v1alpha2.API{
+ apiDefinition := v1beta1.API{
  ObjectMeta: metav1.ObjectMeta{
  Namespace: "default",
  Name: "test-api-1",
  },
- Spec: v1alpha2.APISpec{
+ Spec: v1beta1.APISpec{
  APIName: "test-api",
  APIVersion: "1.0.0",
  BasePath: "/test-api/1.0.0",
- Production: []v1alpha2.EnvConfig{
+ Production: []v1beta1.EnvConfig{
  {
  RouteRefs: []string{
  "test-api-1-prod-http-route",
@@ -423,16 +423,16 @@ func TestCreateRoutesWithClustersWithMultiplePathPrefixRules(t *testing.T) {
 
 func TestCreateRoutesWithClustersWithBackendTLSConfigs(t *testing.T) {
  apiState := synchronizer.APIState{}
- apiDefinition := v1alpha2.API{
+ apiDefinition := v1beta1.API{
  ObjectMeta: metav1.ObjectMeta{
  Namespace: "default",
  Name: "test-api-3",
  },
- Spec: v1alpha2.APISpec{
+ Spec: v1beta1.APISpec{
  APIName: "test-api-3",
  APIVersion: "1.0.0",
  BasePath: "/test-api-3/1.0.0",
- Production: []v1alpha2.EnvConfig{
+ Production: []v1beta1.EnvConfig{
  {
  RouteRefs: []string{
  "test-api-3-prod-http-route",
@@ -546,16 +546,16 @@ func TestCreateHealthEndpoint(t *testing.T) {
 
 func TestCreateRoutesWithClustersDifferentBackendRefs(t *testing.T) {
  apiState := synchronizer.APIState{}
- apiDefinition := v1alpha2.API{
+ apiDefinition := v1beta1.API{
  ObjectMeta: metav1.ObjectMeta{
  Namespace: "default",
  Name: "test-api-different-backendrefs",
  },
- Spec: v1alpha2.APISpec{
+ Spec: v1beta1.APISpec{
  APIName: "test-api-different-backendrefs",
  APIVersion: "1.0.0",
  BasePath: "/test-api-different-backendrefs/1.0.0",
- Production: []v1alpha2.EnvConfig{
+ Production: []v1beta1.EnvConfig{
  {
  RouteRefs: []string{
  "test-api-different-backendrefs-prod-http-route",
@@ -638,16 +638,16 @@ func TestCreateRoutesWithClustersDifferentBackendRefs(t *testing.T) {
 
 func TestCreateRoutesWithClustersSameBackendRefs(t *testing.T) {
  apiState := synchronizer.APIState{}
- apiDefinition := v1alpha2.API{
+ apiDefinition := v1beta1.API{
  ObjectMeta: metav1.ObjectMeta{
  Namespace: "default",
  Name: "test-api-same-backendrefs",
  },
- Spec: v1alpha2.APISpec{
+ Spec: v1beta1.APISpec{
  APIName: "test-api-same-backendrefs",
  APIVersion: "1.0.0",
  BasePath: "/test-api-same-backendrefs/1.0.0",
- Production: []v1alpha2.EnvConfig{
+ Production: []v1beta1.EnvConfig{
  {
  RouteRefs: []string{
  "test-api-same-backendrefs-prod-http-route",