Merge pull request #499 from PasanT9/4.3.0-fix

Add support for APIM 4.3.0

CHANGELOG.md

@@ -1,13 +1,13 @@
 # Changelog
 
-All notable changes to Docker and Docker Compose resources for WSO2 API Management version `4.2.x` in each resource release, will be documented in this file.
+All notable changes to Docker and Docker Compose resources for WSO2 API Management version `4.3.x` in each resource release, will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [v4.2.0.1] - 2023-03-21
+## [v4.3.0.1] - 2024-04-26
 
 ### Changed
-- Update all Docker resources to support WSO2 API Manager version `4.2.0`.
-- Update all Docker Compose resources to supprt WSO2 API Manager version `4.2.0`.
-- Update Docker Compose resources for the deployment of WSO2 APIM with MI to support Micro Integrator version `4.2.0.1`.
-- Update IS extentions to the [latest version](https://repo1.maven.org/maven2/org/wso2/km/ext/wso2is/distribution/1.4.2/) `1.4.2` and mount wso2carbon and client-truststore keystores with the latest wso2carbon certificate in Identity Server as Key Manager with Choreo Analytics deployment setup.
+- Update all Docker resources to support WSO2 API Manager version `4.3.0`.
+- Update all Docker Compose resources to supprt WSO2 API Manager version `4.3.0`.
+- Update Docker Compose resources for the deployment of WSO2 APIM with MI to support Micro Integrator version `4.3.0.1`.
+- Update IS extentions to the latest version (`1.7.8`) and mount wso2carbon and client-truststore keystores with the latest wso2carbon certificate in Identity Server as Key Manager with Choreo Analytics deployment setup.

CONTRIBUTING.md

@@ -23,21 +23,21 @@ The issues page on GitHub is for tracking bugs and feature requests. When posing
 
 If you like to contribute with a bug fix or a new feature, start by posting an issue and discussing the best way to implement it.
 
-Unlike most projects, development for this repository is carried out on the `4.2.x` branch. This is because the `master` branch contains the latest stable release of the project.
-The code in `4.2.x` is merged to the `master` branch after a final review and a round of testing.
+Unlike most projects, development for this repository is carried out on the `4.3.x` branch. This is because the `master` branch contains the latest stable release of the project.
+The code in `4.3.x` is merged to the `master` branch after a final review and a round of testing.
 
 Please follow these guidelines when contributing to the code:
 
 1. Fork the current repository.
-2. Create a topic branch from the `4.2.x` branch.
+2. Create a topic branch from the `4.3.x` branch.
 3. Make commits in logical units.
 4. Before you send out the pull request, sync your forked repository with a remote repository. This makes your pull request simple and clear.
 
 ```bash
 git clone https://github.com/<user>/docker-apim.git
 git remote add upstream https://github.com/wso2/docker-apim.git
 git fetch upstream
-git checkout -b <topic-branch> upstream/4.2.x
+git checkout -b <topic-branch> upstream/4.3.x
 
 # add some work
 

README.md

@@ -2,7 +2,7 @@
 
 This repository contains following Docker resources:
 
-- Alpine, CentOS and Ubuntu based Docker resources for WSO2 API Manager, Identity Server as Key Manager, and 
+- Alpine, Rocky Linux and Ubuntu based Docker resources for WSO2 API Manager, Identity Server as Key Manager, and 
 Micro Integrator profiles.
 
 - Docker Compose resources for the most common WSO2 API Management deployment patterns
@@ -19,4 +19,4 @@ Docker Compose files have been created according to the most common API Manageme
 to quickly evaluate product features along side their co-operate API Management requirements. The Compose files make use of per profile
 Docker images of WSO2 API Manager, WSO2 Identity Server as Key Manager, and Micro Integrator as well as MySQL.
 
-**Change log** from previous v4.1.0.2 release: [View Here](https://github.com/wso2/docker-apim/blob/4.1.x/CHANGELOG.md)
+**Change log** from previous v4.2.0.1 release: [View Here](https://github.com/wso2/docker-apim/blob/4.2.x/CHANGELOG.md)

docker-compose/apim-is-as-km-with-analytics/README.md

@@ -33,7 +33,7 @@
    `docker-apim-<released-version-here>/docker-compose/apim-is-as-km-with-analytics` folder. 
      
    > If you intend to try out an already released tag, after executing 2nd step, checkout the relevant tag, 
-    i.e. for example: `git checkout tags/v4.2.0.1`, switch to `docker-compose/apim-is-as-km-with-analytics` folder and continue with below steps.
+    i.e. for example: `git checkout tags/v4.3.0.1`, switch to `docker-compose/apim-is-as-km-with-analytics` folder and continue with below steps.
 
 4. [Optional] Replace the existing IS extensions with the latest.
 
@@ -43,7 +43,7 @@
 
    You may replace the web app in `docker-compose/apim-is-as-km-with-analytics/dockerfiles/is-as-km/webapps` as defined in step 5.
 
-5. WSO2 no longer provides an on-premise Analytics solution. In order to connect WSO2 API Manager to [Choreo Analytics](https://analytics.choreo.dev/), obtain an `on-prem-key` by following the steps in the [documentation](https://apim.docs.wso2.com/en/4.2.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/).
+5. WSO2 no longer provides an on-premise Analytics solution. In order to connect WSO2 API Manager to [Choreo Analytics](https://analytics.choreo.dev/), obtain an `on-prem-key` by following the steps in the [documentation](https://apim.docs.wso2.com/en/4.3.0/observe/api-manager-analytics/configure-analytics/register-for-analytics/).
 
 6. Update the analytics configurations in [deployment.toml](./conf/apim/repository/conf/deployment.toml) with the `on-prem key` obtained.
 

docker-compose/apim-is-as-km-with-analytics/conf/apim/repository/conf/deployment.toml

@@ -60,6 +60,7 @@ key_password =  "wso2carbon"
 name = "Default"
 type = "hybrid"
 provider = "wso2"
+gateway_type = "Regular"
 display_in_api_console = true
 description = "This is a hybrid gateway that handles both production and sandbox token traffic."
 show_as_token_endpoint_url = true
@@ -109,7 +110,13 @@ enable = true
 config_endpoint = "https://analytics-event-auth.choreo.dev/auth/v1"	
 auth_token = "<on-prem-key>"
 
+[apim.ai]
+enable = true
+token = ""
+endpoint = ""
+
 [apim.key_manager]
+enable_apikey_subscription_validation = true
 service_url = "https://is-as-km:9444/services/"
 type = "WSO2-IS"
 #username = "$ref{super_admin.username}"
@@ -136,6 +143,7 @@ type = "WSO2-IS"
 #signing_algorithm = "SHA256withRSA"
 #enable_user_claims = true
 #claims_extractor_impl = "org.wso2.carbon.apimgt.impl.token.ExtendedDefaultClaimsRetriever"
+#use_sha256_hash = false
 
 #[apim.oauth_config]
 #enable_outbound_auth_header = false
@@ -232,7 +240,7 @@ allow_credentials = false
 #enable_authentication = true
 
 #[apim.token.revocation]
-#notifier_impl = "org.wso2.carbon.apimgt.keymgt.events.TokenRevocationNotifierImpl"
+#notifier_impl = "org.wso2.carbon.apimgt.notification.TokenRevocationNotifierImpl"
 #enable_realtime_notifier = true
 #realtime_notifier.ttl = 5000
 #enable_persistent_notifier = true
@@ -273,3 +281,19 @@ path = "/_system/apim/config"
 
 [transport.passthru_https.sender.parameters]	
 HostnameVerifier="AllowAll"
+
+#[integration.transaction_counter]
+#enable = true
+#server_id = "Gateway1"
+#producer_counting_thread_pool_size = 10
+#producer_scheduled_interval = 10
+#max_transaction_count_per_record = 20
+#min_transaction_count_per_record = 5
+#record_queue_size = 1000
+#publisher_scheduled_interval = 5
+#publisher_max_batch_size = 100
+#publisher_max_retries = 3
+#store_impl = "org.wso2.integration.transaction.counter.store.TransactionRecordStoreImpl"
+#service_url = "https://localhost:8080/transactions/records"
+#service_username = "admin"
+#service_password = "admin"