GH2883 Cloud gateway service functionality

Signed-off-by: alexandr cumarav <[email protected]>
zowe · Sep 5, 2023 · e30e2c1 · e30e2c1
1 parent 5f54de5
commit e30e2c1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 55 deletions.
diff --git a/cloud-gateway-package/src/main/resources/bin/start.sh b/cloud-gateway-package/src/main/resources/bin/start.sh
@@ -99,6 +99,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CLOUD_GATEWAY_CODE} java \
     -Dapiml.logs.location=${ZWE_zowe_logDirectory} \
     -Dapiml.zoweManifest=${ZWE_zowe_runtimeDirectory}/manifest.json \
     -Dserver.address=0.0.0.0 \
+    -Dapiml.service.apimlId=${ZWE_configs_apimlId:-} \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST:-"https://${ZWE_haInstance_hostname:-localhost}:${ZWE_components_discovery_port:-7553}/eureka/"} \
     -Dserver.ssl.enabled=${ZWE_configs_server_ssl_enabled:-true} \
     -Dserver.maxConnectionsPerRoute=${ZWE_configs_server_maxConnectionsPerRoute:-100} \

diff --git a/cloud-gateway-service/build.gradle b/cloud-gateway-service/build.gradle
@@ -82,7 +82,6 @@ dependencies {
     implementation libs.spring.expression
     implementation libs.bcpkix
     implementation libs.nimbusJoseJwt
-    implementation libs.janino
 
     compileOnly libs.lombok
     annotationProcessor libs.lombok

diff --git a/cloud-gateway-service/src/main/resources/application.yml b/cloud-gateway-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ apiml:
         id: cloud-gateway
         port: 10023
         hostname: localhost
-        scheme: https  # "https" or "http"
+        scheme: https
         corsEnabled: true
         ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin
         forwardClientCertEnabled: false
@@ -49,7 +49,6 @@ server:
     main:
         allow-circular-references: true
 
-logbackServiceName: ZWEACG1
 
 logging:
     level:

diff --git a/cloud-gateway-service/src/main/resources/logback.xml b/cloud-gateway-service/src/main/resources/logback.xml
diff --git a/cloud-gateway-service/src/test/resources/application.yml b/cloud-gateway-service/src/test/resources/application.yml
@@ -9,8 +9,8 @@ apiml:
         id: cloud-gateway
         port: 10023
         hostname: localhost
-        scheme: https
         corsEnabled: true
+        scheme: https
         ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin
         forwardClientCertEnabled: false
     cloudGateway: