fix: z/OSMF static definition file processing (v2) (#3975)

Signed-off-by: Pablo Carle <[email protected]> Co-authored-by: Pablo Carle <[email protected]>
zowe · Feb 3, 2025 · 85aa6a7 · 85aa6a7
1 parent 51a1fc5
commit 85aa6a7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 55 deletions.
diff --git a/.github/workflows/service-registration.yml b/.github/workflows/service-registration.yml
@@ -33,7 +33,7 @@ jobs:
                 run: >
                     ./gradlew runStartUpCheck --info --scan
             -   name: Store results
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 if: always()
                 with:
                     name: CITests-${{ env.JOB_ID }}

diff --git a/discovery-package/src/main/resources/bin/configure.sh b/discovery-package/src/main/resources/bin/configure.sh
diff --git a/discovery-package/src/main/resources/manifest.yaml b/discovery-package/src/main/resources/manifest.yaml
@@ -21,7 +21,6 @@ build:
 commands:
   start: bin/start.sh
   validate: bin/validate.sh
-  configure: bin/configure.sh
 # if we need to automatically tag file encoding on z/OS during installation
 autoEncoding:
   # tag all files

diff --git a/discovery-package/src/main/resources/zosmf-static-definition.yaml.template b/discovery-package/src/main/resources/zosmf-static-definition.yaml.template
@@ -8,7 +8,7 @@ services:
       title: z/OSMF
       description: IBM z/OS Management Facility REST API service
       instanceBaseUrls:
-        - %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/
+        - ${ZOSMF_SCHEME:-https}://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/
       homePageRelativeUrl:  # Home page is at the same URL
       routedServices:
         - gatewayUrl: api/v1
@@ -29,7 +29,7 @@ services:
       description: 'IBM z/OS Management Facility REST API service. Once configured you can access z/OSMF via the API gateway: https://${ZOWE_EXPLORER_HOST}:${GATEWAY_PORT}/ibmzosmf/api/v1/info'
       catalogUiTileId: zosmf
       instanceBaseUrls:
-        - %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/
+        - ${ZOSMF_SCHEME:-https}://${ZOSMF_HOST}:${ZOSMF_PORT}/
       homePageRelativeUrl:  # Home page is at the same URL
       routedServices:
         - gatewayUrl: api/v1
@@ -40,7 +40,7 @@ services:
         - apiId: ibm.zosmf
           gatewayUrl: api/v1
           documentationUrl: https://www.ibm.com/support/knowledgecenter/en/SSLTBW_2.4.0/com.ibm.zos.v2r4.izua700/IZUHPINFO_RESTServices.htm
-          swaggerUrl: %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/api/docs
+          swaggerUrl: ${ZOSMF_SCHEME:-https}://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/api/docs
       customMetadata:
           apiml:
               enableUrlEncodedCharacters: true