diff --git a/discovery-package/src/main/resources/bin/configure.sh b/discovery-package/src/main/resources/bin/configure.sh deleted file mode 100644 index 3790452fa4..0000000000 --- a/discovery-package/src/main/resources/bin/configure.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -################################################################################ -# This program and the accompanying materials are made available under the terms of the -# Eclipse Public License v2.0 which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-v20.html -# -# SPDX-License-Identifier: EPL-2.0 -# -# Copyright IBM Corporation 2021 -################################################################################ - -if [ -z "$ZWE_zowe_workspaceDirectory" ]; then - echo "Workspace directory is not defined" - exit 1 -fi - -INSTANCE_ID=$ZWE_haInstance_id - -if [ -z "$INSTANCE_ID" ]; then - SOURCE_FILE=$ZWE_zowe_workspaceDirectory/api-mediation/api-defs/discovery.zosmf_static_definition_yaml_template.yml -else - SOURCE_FILE=$ZWE_zowe_workspaceDirectory/api-mediation/api-defs/discovery.zosmf_static_definition_yaml_template.$INSTANCE_ID.yml -fi - -DEST_FILE="$ZWE_zowe_workspaceDirectory/api-mediation/api-defs/zosmf.temp" - -ZOSMF_SCHEME=https - -if [ "$ZWE_zowe_network_client_tls_attls" = "true" ]; then - ZOSMF_SCHEME=http -fi - -if [ -n "$JAVA_HOME" ]; then - PATH=$JAVA_HOME/bin:$PATH -elif [ -n "$ZWE_java_home" ]; then - PATH=$ZWE_java_home/bin:$PATH -else - echo "[discovery-configure.sh]: java_home not found, discovery service relying on PATH to find java" -fi - -if [ -e "$SOURCE_FILE" ]; then - # _BPXK_AUTOCVT is set on some systems and resulted in twice-converted files when run through chtag and sed - _BPXK_AUTOCVT="ON" sed -W filecodeset=ISO8859-1 -e "s|%ZOSMF_SCHEME%|${ZOSMF_SCHEME}|g" $SOURCE_FILE >$DEST_FILE # implicit EBCDIC out - iconv -f IBM-1047 -t ISO8859-1 $DEST_FILE >$SOURCE_FILE - _BPXK_AUTOCVT="OFF" chtag -tc ISO8859-1 $SOURCE_FILE - rm -f $DEST_FILE -else - echo "[discovery-configure.sh]: File $SOURCE_FILE not found" -fi diff --git a/discovery-package/src/main/resources/manifest.yaml b/discovery-package/src/main/resources/manifest.yaml index 8a85d86c50..9156595c70 100644 --- 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 index 1f3f0cf553..d2bd325871 100644 --- a/discovery-package/src/main/resources/zosmf-static-definition.yaml.template +++ b/discovery-package/src/main/resources/zosmf-static-definition.yaml.template @@ -9,7 +9,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}://${ZOSMF_HOST}:${ZOSMF_PORT}/ homePageRelativeUrl: # Home page is at the same URL routedServices: - gatewayUrl: api/v1 @@ -20,7 +20,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}://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/api/docs customMetadata: apiml: enableUrlEncodedCharacters: true