fixing issues with test cases

wso2 · Feb 4, 2025 · ce98807 · ce98807
1 parent 224ad22
commit ce98807
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 121 deletions.
diff --git a/gateway/enforcer/internal/datastore/api_store.go b/gateway/enforcer/internal/datastore/api_store.go
@@ -180,6 +180,13 @@ func (s *APIStore) GetMatchedAPI(apiKey string) *requestconfig.API {
 	return s.apis[apiKey]
 }
 
+// UpdateMatchedAPI updates the API that matches the given API key.
+func (s *APIStore) UpdateMatchedAPI(apiKey string, api *requestconfig.API) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.apis[apiKey] = api
+}
+
 // ConvertBackendJWTTokenInfoToJWTConfig converts BackendJWTTokenInfo to JWTConfiguration.
 func convertBackendJWTTokenInfoToJWTConfig(info *api.BackendJWTTokenInfo, cfg *config.Server, apiName string) *dto.BackendJWTConfiguration {
 	if info == nil {

diff --git a/gateway/enforcer/internal/dto/external_processing_envoy_attributes.go b/gateway/enforcer/internal/dto/external_processing_envoy_attributes.go
@@ -20,7 +20,7 @@ package dto
 // ExternalProcessingEnvoyAttributes represents the attributes extracted from the external processing request.
 type ExternalProcessingEnvoyAttributes struct {
 	EnableBackendBasedAIRatelimit          string `json:"enableBackendBasedAIRatelimitAttribute"`
-	SuspendAIModel                         string   `json:"suspendAIModelAttribute"`
+	SuspendAIModel                         string `json:"suspendAIModelAttribute"`
 	BackendBasedAIRatelimitDescriptorValue string `json:"backendBasedAIRatelimitDescriptorValueAttribute"`
 	Path                                   string `json:"pathAttribute"`
 	VHost                                  string `json:"vHostAttribute"`
@@ -32,5 +32,5 @@ type ExternalProcessingEnvoyAttributes struct {
 	RequestMehod                           string `json:"requestMehodAttribute"`
 	Organization                           string `json:"organizationAttribute"`
 	ApplicationID                          string `json:"applicationIdAttribute"`
-	CorrelationID						  string   `json:"correlationIdAttribute"`
+	CorrelationID                          string `json:"correlationIdAttribute"`
 }
diff --git a/gateway/enforcer/internal/extproc/ext_proc.go b/gateway/enforcer/internal/extproc/ext_proc.go
diff --git a/runtime/config-deployer-service/ballerina/APIClient.bal b/runtime/config-deployer-service/ballerina/APIClient.bal
@@ -146,14 +146,14 @@ public class APIClient {
                 }
             }
 
-            model:Endpoint[]? productionEndpoints = createdEndpoints.hasKey(PRODUCTION_TYPE) ? createdEndpoints.get(PRODUCTION_TYPE) : (); 
-            model:Endpoint[]? sandboxEndpoints = createdEndpoints.hasKey(SANDBOX_TYPE) ? createdEndpoints.get(SANDBOX_TYPE) : ();
-            if productionEndpoints is model:Endpoint[] && productionEndpoints.length() > 0 {
-                _ = check self.setRoute(apiArtifact, apkConf, createdEndpoints.hasKey(PRODUCTION_TYPE)  ? createdEndpoints.get(PRODUCTION_TYPE) : (), uniqueId, PRODUCTION_TYPE, organization);
-            }
-            if sandboxEndpoints is model:Endpoint[] && sandboxEndpoints.length() > 0 {
-                _ = check self.setRoute(apiArtifact, apkConf, createdEndpoints.hasKey(SANDBOX_TYPE) ? createdEndpoints.get(SANDBOX_TYPE) : (), uniqueId, SANDBOX_TYPE, organization);
-            }
+            // model:Endpoint[]? productionEndpoints = createdEndpoints.hasKey(PRODUCTION_TYPE) ? createdEndpoints.get(PRODUCTION_TYPE) : (); 
+            // model:Endpoint[]? sandboxEndpoints = createdEndpoints.hasKey(SANDBOX_TYPE) ? createdEndpoints.get(SANDBOX_TYPE) : ();
+            // if productionEndpoints is model:Endpoint[] && productionEndpoints.length() > 0 {
+            _ = check self.setRoute(apiArtifact, apkConf, createdEndpoints.hasKey(PRODUCTION_TYPE)  ? createdEndpoints.get(PRODUCTION_TYPE) : (), uniqueId, PRODUCTION_TYPE, organization);
+            //}
+            //if sandboxEndpoints is model:Endpoint[] && sandboxEndpoints.length() > 0 {
+            _ = check self.setRoute(apiArtifact, apkConf, createdEndpoints.hasKey(SANDBOX_TYPE) ? createdEndpoints.get(SANDBOX_TYPE) : (), uniqueId, SANDBOX_TYPE, organization);
+            //}
             string|json generatedSwagger = check self.retrieveGeneratedSwaggerDefinition(apkConf, definition);
             check self.retrieveGeneratedConfigmapForDefinition(apiArtifact, apkConf, generatedSwagger, uniqueId, organization);
             self.generateAndSetAPICRArtifact(apiArtifact, apkConf, organization);
@@ -564,11 +564,6 @@ public class APIClient {
         APKOperations[][] operationsArray = [];
         int row = 0;
         int column = 0;
-        if endpoint is model:Endpoint[] && endpoint.length() > 0 {
-            operationsArray = [apiOperations];
-        } else {
-            operationsArray = [apiOperations];
-        }
         foreach APKOperations item in apiOperations {
             if column > 7 {
                 row = row + 1;

diff --git a/test/cucumber-tests/src/test/resources/artifacts/apk-confs/endpoint_conf.yaml b/test/cucumber-tests/src/test/resources/artifacts/apk-confs/endpoint_conf.yaml
@@ -7,9 +7,9 @@ type: "REST"
 defaultVersion: false
 endpointConfigurations:
   production:
-    - endpoint: "http://backend:80/anything"
+  - endpoint: "http://backend:80/anything"
   sandbox:
-    - endpoint: "http://backend:80/anything/test"
+  - endpoint: "http://backend:80/anything/test"
 operations:
   - target: "/employee"
     verb: "GET"
@@ -21,9 +21,9 @@ operations:
     scopes: []
     endpointConfigurations:
       production:
-        endpoint: "http://backend:80/anything/test"
+      - endpoint: "http://backend:80/anything/test"
       sandbox:
-        endpoint: "http://backend:80/anything"
+      - endpoint: "http://backend:80/anything"
   - target: "/employee/{employeeId}"
     verb: "PUT"
     secured: true

diff --git a/test/cucumber-tests/src/test/resources/artifacts/apk-confs/jwt_custom_header_conf.yaml b/test/cucumber-tests/src/test/resources/artifacts/apk-confs/jwt_custom_header_conf.yaml
@@ -7,7 +7,7 @@ type: "REST"
 defaultVersion: false
 endpointConfigurations:
   production:
-    - endpoint: "http://backend:80/anything"
+  - endpoint: "http://backend:80/anything"
 operations:
   - target: "/employee"
     verb: "GET"

diff --git a/...ests/src/test/resources/artifacts/apk-confs/jwt_custom_header_resource_endpoint_conf.yaml b/...ests/src/test/resources/artifacts/apk-confs/jwt_custom_header_resource_endpoint_conf.yaml
@@ -12,28 +12,28 @@ operations:
     scopes: []
     endpointConfigurations:
       production:
-        - endpoint: "http://backend:80/anything"
+      - endpoint: "http://backend:80/anything"
   - target: "/employee"
     verb: "POST"
     secured: true
     scopes: []
     endpointConfigurations:
       production:
-        - endpoint: "http://backend:80/anything"
+      - endpoint: "http://backend:80/anything"
   - target: "/employee/{employeeId}"
     verb: "PUT"
     secured: true
     scopes: []
     endpointConfigurations:
       production:
-        - endpoint: "http://backend:80/anything"
+      - endpoint: "http://backend:80/anything"
   - target: "/employee/{employeeId}"
     verb: "DELETE"
     secured: true
     scopes: []
     endpointConfigurations:
       production:
-        - endpoint: "http://backend:80/anything"
+      - endpoint: "http://backend:80/anything"
 authentication:
  - authType: OAuth2
    enabled: true