Merge pull request #460 from wso2/4.1.x

Merge 4.1.x branch to the master

.gitignore

@@ -23,6 +23,9 @@ hs_err_pid*
 .idea/
 *.iml
 
+# macOS
+.DS_Store
+
 rat.txt
 
 # exclude everything

CHANGELOG.md

@@ -1,29 +1,13 @@
 # Changelog
 
-All notable changes to Docker and Docker Compose resources for WSO2 API Management version `4.0.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.1.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.0.0.4] - 2022-03-10
+## [v4.1.0.0] - 2022-03-23
 
 ### Changed
-- Use base OS images as opposed to AdoptOpenJDK images for each corresponding OS flavour (Alpine, CentOS, Ubuntu).
-- Use Temurin OpenJDK binaries to build OpenJDK on top of the base OS image.
-- Upgrade OpenJDK versions to the latest available versions of Temurin OpenJDK from Adoptium. 
-
-## [v4.0.0.1] - 2021-04-28
-
-### Added
-
-- Alpine, CentOS, and Ubuntu based Docker resources for WSO2 API Manager version `4.0.0`.
-- Docker Compose resources for the deployment of WSO2 API Manager `4.0.0` with Choreo Analytics support.
-- Docker Compose resources for the deployment of WSO2 API Manager `4.0.0` with Identity Server `5.11.0` as Key Manager and Choreo Analytics support.
-- Docker Compose resources for the deployment of WSO2 API Manager `4.0.0` with Micro Integrator `4.0.0`.
-
-### Changed
-
-- Upgrade MySQL version used in Docker Compose resources - `5.7.34`.
-
-### Removed
-
-- WSO2 API Manager Analytics Dashboard and Worker related Docker Compose resources.
+- Update all Docker resources to support WSO2 API Manager version `4.1.0`.
+- Update all Docker Compose resources to supprt WSO2 API Manager version `4.1.0`.
+- Update Docker Compose resources for the deployment of WSO2 APIM with MI to support Micro Integrator version `4.1.0.0`.
+- 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.

README.md

@@ -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 v3.2.0.3 release: [View Here](https://github.com/wso2/docker-apim/blob/3.2.x/CHANGELOG.md)
+**Change log** from previous v4.0.0.4 release: [View Here](https://github.com/wso2/docker-apim/blob/4.0.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.0.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.1.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.0.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.1.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.
 
@@ -80,3 +80,5 @@
    ```
 
 9. To see analytics data, log in to [Choreo Analytics](https://analytics.choreo.dev/).
+
+Note: In order to support the renewed wso2carbon certificate in API Manager, we are mounting wso2carbon and client-truststore keystores with the renewed certificate in the Identity Server.

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

@@ -39,6 +39,9 @@ password =  "wso2carbon"
 alias =  "wso2carbon"
 key_password =  "wso2carbon"
 
+#[keystore.listener_profile]
+#bind_address = "0.0.0.0"
+
 #[keystore.primary]
 #file_name =  "wso2carbon.jks"
 #type =  "JKS"
@@ -56,6 +59,7 @@ key_password =  "wso2carbon"
 [[apim.gateway.environment]]
 name = "Default"
 type = "hybrid"
+provider = "wso2"
 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
@@ -100,10 +104,10 @@ gateway_labels =["Default"]
 #[apim.cache.tags]
 #expiry_time = "2m"
 
-[apim.analytics]
-enable = true
-config_endpoint = "https://analytics-event-auth.choreo.dev/auth/v1"
-auth_token = "<on-prem-key>"
+[apim.analytics]	
+enable = true	
+config_endpoint = "https://analytics-event-auth.choreo.dev/auth/v1"	
+auth_token = "<on-prem-key>"	
 
 [apim.key_manager]
 service_url = "https://is-as-km:9444/services/"
@@ -252,14 +256,20 @@ id = "token_revocation"
 type = "org.wso2.carbon.identity.core.handler.AbstractIdentityHandler"
 name = "org.wso2.is.notification.ApimOauthEventInterceptor"
 order = 1
+
 [event_listener.properties]
 notification_endpoint = "https://localhost:${mgt.transport.https.port}/internal/data/v1/notify"
 username = "${admin.username}"
 password = "${admin.password}"
-'header.X-WSO2-KEY-MANAGER' = "default"
+'header.X-WSO2-KEY-MANAGER' = "WSO2-IS"
+
+[oauth.grant_type.token_exchange]
+enable = true
+allow_refresh_tokens = true
+iat_validity_period = "1h"
 
-[config_data]
-path = "/_system/apim/config"
+[config_data]	
+path = "/_system/apim/config"	
 
-[transport.passthru_https.sender.parameters]
+[transport.passthru_https.sender.parameters]	
 HostnameVerifier="AllowAll"