Adding environment field to the helm chart

wso2 · Oct 6, 2023 · 639c108 · 639c108
1 parent c0f43f4
commit 639c108
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/...forcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/constants/Constants.java b/...forcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/constants/Constants.java
@@ -78,6 +78,5 @@ since new lines in different OSs differ (Linux: \n, Windows: \r\n) */
     public static final String DEFAULT_CON_FACTORY_JNDI_NAME = "TopicConnectionFactory";
 
     // multi-env constants
-    public static final String DEFAULT_ENVIRONMENT_TOKEN_ISSUER = "*";
-    public static final String DEFAULT_ENVIRONMENT = "Default";
+    public static final String DEFAULT_ALL_ENVIRONMENTS_TOKEN_ISSUER = "*";
 }
diff --git a/....enforcer/src/main/java/org/wso2/apk/enforcer/subscription/SubscriptionDataStoreImpl.java b/....enforcer/src/main/java/org/wso2/apk/enforcer/subscription/SubscriptionDataStoreImpl.java
@@ -439,23 +439,14 @@ public JWTValidator getJWTValidatorByIssuer(String issuer, String organization,
 
         if (orgBaseJWTValidators != null) {
 
-            String mapKey;
-            if (environment.equals(Constants.DEFAULT_ENVIRONMENT)) {
-                mapKey = getMapKey(Constants.DEFAULT_ENVIRONMENT_TOKEN_ISSUER, issuer);
-            } else {
-                mapKey = getMapKey(environment, issuer);
-            }
-
+            String mapKey = getMapKey(Constants.DEFAULT_ALL_ENVIRONMENTS_TOKEN_ISSUER, issuer);
             JWTValidator jwtValidator = orgBaseJWTValidators.get(mapKey);
             if (jwtValidator != null) {
                 return jwtValidator;
             }
 
-            // Fall back to the default environment if the validator is not found
-            if (!environment.equals(Constants.DEFAULT_ENVIRONMENT)) {
-                mapKey = getMapKey(Constants.DEFAULT_ENVIRONMENT_TOKEN_ISSUER, issuer);
-                return orgBaseJWTValidators.get(mapKey);
-            }
+            mapKey = getMapKey(environment, issuer);
+            return orgBaseJWTValidators.get(mapKey);
         }
 
         return null;
@@ -471,7 +462,7 @@ private List<String> getEnvironments(JWTIssuer jwtIssuer) {
                 environmentsList.add(jwtIssuer.getEnvironments(i));
             }
         } else {
-            environmentsList.add(Constants.DEFAULT_ENVIRONMENT_TOKEN_ISSUER);
+            environmentsList.add(Constants.DEFAULT_ALL_ENVIRONMENTS_TOKEN_ISSUER);
         }
         return environmentsList;
     }

diff --git a/helm-charts/README.md b/helm-charts/README.md
@@ -39,6 +39,7 @@ A Helm chart for APK components
 | wso2.apk.idp.signing.secretName | string | `""` | IDP jwt signing certificate secret name |
 | wso2.apk.idp.signing.fileName | string | `""` | IDP jwt signing certificate file name |
 | wso2.apk.dp.enabled | bool | `true` | Enable the deployment of the Data Plane |
+| wso2.apk.dp.environment | string | `Default` | Environment of the Data Plane |
 | wso2.apk.dp.gateway.listener.hostname | string | `"gw.wso2.com"` | Gateway Listener Hostname |
 | wso2.apk.dp.gateway.listener.secretName | string | `""` | Gateway Listener Certificate Secret Name |
 | wso2.apk.dp.gateway.autoscaling.enabled | bool | `false` | Enable autoscaling for Gateway |

diff --git a/helm-charts/templates/data-plane/gateway-components/common-log-conf.yaml b/helm-charts/templates/data-plane/gateway-components/common-log-conf.yaml
@@ -7,6 +7,9 @@ metadata:
 data:
   config.toml: | 
     [commoncontroller]
+      {{- if .Values.wso2.apk.dp.environment }}
+      environment = "{{ .Values.wso2.apk.dp.environment }}"
+      {{- end }}
     [commoncontroller.server]
       label = "ratelimiter"
     {{ if and .Values.wso2.apk.dp.commonController.configs .Values.wso2.apk.dp.commonController.configs.apiNamespaces }}

diff --git a/helm-charts/templates/data-plane/gateway-components/log-conf.yaml b/helm-charts/templates/data-plane/gateway-components/log-conf.yaml
@@ -7,6 +7,9 @@ metadata:
 data:
   config.toml: | 
     [adapter]
+      {{- if .Values.wso2.apk.dp.environment }}
+      environment = "{{ .Values.wso2.apk.dp.environment }}"
+      {{- end }}
     {{ if and .Values.wso2.apk.dp.adapter.configs .Values.wso2.apk.dp.adapter.configs.apiNamespaces }}
     [adapter.operator]
       namespaces = [{{ include "commaJoinedQuotedList" .Values.wso2.apk.dp.adapter.configs.apiNamespaces}}]

diff --git a/helm-charts/values.yaml.template b/helm-charts/values.yaml.template
@@ -243,6 +243,8 @@ wso2:
     dp:
      # -- Enable the deployment of the Data Plane
       enabled: true
+      # -- Environment Name of the Data Plane
+      environment: "Development"
       gateway:
         listener:
           # -- Gateway Listener Hostname

diff --git a/test/cucumber-tests/src/test/java/org/wso2/apk/integration/api/BaseSteps.java b/test/cucumber-tests/src/test/java/org/wso2/apk/integration/api/BaseSteps.java
@@ -229,7 +229,7 @@ public void waitForNextMinuteStrictly() throws InterruptedException {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime nextMinute = now.plusMinutes(1).withSecond(0).withNano(0);
         long secondsToWait = now.until(nextMinute, ChronoUnit.SECONDS);
-        Thread.sleep((secondsToWait+2) * 1000);
+        Thread.sleep((secondsToWait+1) * 1000);
         logger.info("Current time: " + LocalDateTime.now());
     }