Remove apk conf changes

wso2 · Oct 31, 2023 · d084b8c · d084b8c
1 parent f2340a0
commit d084b8c
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 31 deletions.
diff --git a/runtime/config-deployer-service/ballerina/APIClient.bal b/runtime/config-deployer-service/ballerina/APIClient.bal
@@ -392,7 +392,6 @@ public class APIClient {
                 apiVersion: apkConf.'version,
                 basePath: self.returnFullBasePath(apkConf.basePath, apkConf.'version),
                 isDefaultVersion: apkConf.defaultVersion,
-                subscriptionValidation: apkConf.subscriptionValidation,
                 organization: organization.name,
                 definitionPath: apkConf.definitionPath,
                 environment: apkConf.environment
@@ -573,14 +572,7 @@ public class APIClient {
                 defaultSpecData.responseInterceptors = [item];
             }
         }
-        SubscriptionValidation[]? subscriptionValidation = apkConf.subscriptionValidation;
         // TODO(Ashera): Need to implement subscription validation API policy CR creation for config deployer approach
-        // if corsConfiguration is CORSConfiguration {
-        //     model:CORSPolicy? cORSPolicy = self.retrieveCORSPolicyDetails(apiArtifact, apkConf, corsConfiguration, organization);
-        //     if cORSPolicy is model:CORSPolicy {
-        //         defaultSpecData.cORSPolicy = cORSPolicy;
-        //     }
-        // }
         CORSConfiguration? corsConfiguration = apkConf.corsConfiguration;
         if corsConfiguration is CORSConfiguration {
             model:CORSPolicy? cORSPolicy = self.retrieveCORSPolicyDetails(apiArtifact, apkConf, corsConfiguration, organization);

diff --git a/runtime/config-deployer-service/ballerina/modules/model/API.bal b/runtime/config-deployer-service/ballerina/modules/model/API.bal
@@ -29,9 +29,8 @@ public type APISpec record {|
     string apiType;
     string apiVersion;
     string basePath;
-    string organization;
+string organization;
     boolean isDefaultVersion?;
-    boolean subscriptionValidation?;
     string definitionFileRef?;
     string environment?;
     string definitionPath?;

diff --git a/runtime/config-deployer-service/ballerina/resources/apk-conf-schema.yaml b/runtime/config-deployer-service/ballerina/resources/apk-conf-schema.yaml
@@ -49,10 +49,6 @@ components:
           type: string
           description: |
             Environment of the API
-        subscriptionValidation:
-          type: boolean
-          description: |
-            Denotes whether subscription validation is enabled for the API
         endpointConfigurations:
           $ref: "#/components/schemas/EndpointConfigurations"
         operations:

diff --git a/runtime/config-deployer-service/ballerina/tests/resources/apk-schema.json b/runtime/config-deployer-service/ballerina/tests/resources/apk-schema.json
@@ -47,10 +47,6 @@
       "type": "string",
       "description": "Environment of the API"
     },
-    "subscriptionValidation": {
-      "type": "boolean",
-      "description": "Denotes whether subscription validation is enabled for the API"
-    },
     "endpointConfigurations": {
       "$ref": "#/schemas/EndpointConfigurations",
       "description": "Configuration for different endpoints of the API."

diff --git a/runtime/config-deployer-service/ballerina/types.bal b/runtime/config-deployer-service/ballerina/types.bal
@@ -213,8 +213,6 @@ public type APKConf record {
     boolean defaultVersion = false;
     # Environment of the API
     string environment?;
-    # Denotes whether subscription validation is enabled for the API
-    boolean subscriptionValidation = false;
     EndpointConfigurations endpointConfigurations?;
     APKOperations[] operations?;
     APIOperationPolicies apiPolicies?;

diff --git a/runtime/config-deployer-service/docker/config-deployer/conf/apk-schema.json b/runtime/config-deployer-service/docker/config-deployer/conf/apk-schema.json
@@ -47,10 +47,6 @@
       "type": "string",
       "description": "Environment of the API"
     },
-    "subscriptionValidation": {
-      "type": "boolean",
-      "description": "Denotes whether subscription validation is enabled for the API"
-    },
     "endpointConfigurations": {
       "$ref": "#/schemas/EndpointConfigurations",
       "description": "Configuration for different endpoints of the API."

diff --git a/runtime/runtime-ui/schema/apk-conf.yaml b/runtime/runtime-ui/schema/apk-conf.yaml
@@ -37,9 +37,6 @@ properties:
   defaultVersion:
     type: boolean
     description: Is this the default version of the API
-  subscriptionValidation:
-    type: boolean
-    description: Denotes whether subscription validation is enabled for the API  
   endpointConfigurations:
     "$ref": "#/schemas/EndpointConfigurations"
     description: Configuration for different endpoints of the API.

diff --git a/runtime/runtime-ui/schema/apk-schema.json b/runtime/runtime-ui/schema/apk-schema.json
@@ -47,10 +47,6 @@
       "type": "string",
       "description": "Environment of the API"
     },
-    "subscriptionValidation": {
-      "type": "boolean",
-      "description": "Denotes whether subscription validation is enabled for the API"
-    },
     "endpointConfigurations": {
       "$ref": "#/schemas/EndpointConfigurations",
       "description": "Configuration for different endpoints of the API."