From 1166b89b701d7ecf65ce4eafb41d20a4dca2bae9 Mon Sep 17 00:00:00 2001 From: Krishanx92 Date: Thu, 28 Mar 2024 11:43:43 +0530 Subject: [PATCH 1/2] Change version to 1.1.0 --- .../config-deployer/wso2-apk-config-deployer-api.yaml | 4 ++-- .../config-deployer/wso2-apk-config-generator-api.yaml | 4 ++-- .../ballerina/resources/artifact-deployer-api.yaml | 4 ++-- .../ballerina/resources/artifact-generator-api.yaml | 4 ++-- .../test/java/org/wso2/apk/integration/utils/Constants.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-deployer-api.yaml b/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-deployer-api.yaml index 6fe585449..3b6f7ca19 100644 --- a/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-deployer-api.yaml +++ b/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-deployer-api.yaml @@ -26,8 +26,8 @@ metadata: spec: apiName: "WSO2 APK Config Deployer API" apiType: "REST" - apiVersion: "1.0.0" - basePath: "/api/deployer/1.0.0" + apiVersion: "1.1.0" + basePath: "/api/deployer/1.1.0" isDefaultVersion: true organization: "apk-system" definitionFileRef: "{{ template "apk-helm.resource.prefix" . }}-wso2-apk-config-deployer-api-definition" diff --git a/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-generator-api.yaml b/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-generator-api.yaml index 82abf7e56..1fa57f7b8 100644 --- a/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-generator-api.yaml +++ b/helm-charts/templates/data-plane/config-deployer/wso2-apk-config-generator-api.yaml @@ -26,8 +26,8 @@ metadata: spec: apiName: "WSO2 APK Config Generator API" apiType: "REST" - apiVersion: "1.0.0" - basePath: "/api/configurator/1.0.0" + apiVersion: "1.1.0" + basePath: "/api/configurator/1.1.0" isDefaultVersion: true organization: "apk-system" definitionFileRef: "{{ template "apk-helm.resource.prefix" . }}-wso2-apk-config-generator-api-definition" diff --git a/runtime/config-deployer-service/ballerina/resources/artifact-deployer-api.yaml b/runtime/config-deployer-service/ballerina/resources/artifact-deployer-api.yaml index 07ea7b8d8..f04fe0f20 100644 --- a/runtime/config-deployer-service/ballerina/resources/artifact-deployer-api.yaml +++ b/runtime/config-deployer-service/ballerina/resources/artifact-deployer-api.yaml @@ -4,9 +4,9 @@ info: title: WSO2 API Platform for Kubernetes - Deploy K8s Resource API description: | This API is used to generate K8s resources for an API. - version: 1.0.0 + version: 1.1.0 servers: - - url: https://api.am.wso2.com/apk/1.0.0 + - url: https://api.am.wso2.com/apk/1.1.0 paths: /apis/deploy: post: diff --git a/runtime/config-deployer-service/ballerina/resources/artifact-generator-api.yaml b/runtime/config-deployer-service/ballerina/resources/artifact-generator-api.yaml index 07bede862..ec08feff9 100644 --- a/runtime/config-deployer-service/ballerina/resources/artifact-generator-api.yaml +++ b/runtime/config-deployer-service/ballerina/resources/artifact-generator-api.yaml @@ -4,9 +4,9 @@ info: title: WSO2 API Platform for Kubernetes - Configuration generator API description: | This document specifies a **RESTful API** for WSO2 **APK** - **Runtime Component**. - version: 1.0.0 + version: 1.1.0 servers: - - url: https://api.am.wso2.com/apk/1.0.0 + - url: https://api.am.wso2.com/apk/1.1.0 paths: /apis/generate-configuration: post: diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java b/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java index 9f0da139c..c84883d3f 100644 --- a/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java +++ b/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java @@ -24,7 +24,7 @@ public class Constants { public static final String DEFAULT_GW_PORT = "9443"; public static final String DEFAULT_TOKEN_EP = "oauth2/token"; public static final String DEFAULT_DCR_EP = "client-registration/v0.17/register"; - public static final String DEFAULT_API_CONFIGURATOR = "api/configurator/1.0.0/"; + public static final String DEFAULT_API_CONFIGURATOR = "api/configurator/1.1.0/"; public static final String DEFAULT_API_DEPLOYER = "api/am/publisher/v4/"; public static final String DEFAULT_DEVPORTAL = "api/am/devportal/v3/"; public static final String ACCESS_TOKEN = "accessToken"; From 62387363b2b993518105859e9ace9b1760399689 Mon Sep 17 00:00:00 2001 From: Krishanx92 Date: Thu, 28 Mar 2024 14:42:09 +0530 Subject: [PATCH 2/2] Add missing config --- .../test/java/org/wso2/apk/integration/utils/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java b/test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java index 8c543c8b0..f02327fc9 100644 --- a/test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java +++ b/test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java @@ -23,8 +23,8 @@ public class Constants { public static final String DEFAULT_API_HOST = "api.am.wso2.com"; public static final String DEFAULT_GW_PORT = "9095"; public static final String DEFAULT_TOKEN_EP = "oauth2/token"; - public static final String DEFAULT_API_CONFIGURATOR = "api/configurator/1.0.0/"; - public static final String DEFAULT_API_DEPLOYER = "api/deployer/1.0.0/"; + public static final String DEFAULT_API_CONFIGURATOR = "api/configurator/1.1.0/"; + public static final String DEFAULT_API_DEPLOYER = "api/deployer/1.1.0/"; public static final String ACCESS_TOKEN = "accessToken"; public static final String EMPTY_STRING = ""; public static final String API_CREATE_SCOPE = "apk:api_create";