From 8e4347120a10c48813e698d23b2ab85fbe1dd6cb Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 18 Aug 2020 10:55:51 -0400 Subject: [PATCH 1/8] Add registration code to configure script for ML Signed-off-by: Leanid Astrakou --- bin/configure.sh | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/bin/configure.sh b/bin/configure.sh index 870d91d75..7d81601b3 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -27,3 +27,39 @@ export NODE_PATH=../..:../../zlux-server-framework/node_modules:$NODE_PATH __UNTAGGED_READ_MODE=V6 $NODE_BIN initInstance.js APP_WORKSPACE_DIR=${INSTANCE_DIR}/workspace/app-server + +# Add static definition for zss +cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml +# +services: + - serviceId: zss + title: Zowe System Services Server + description: Zowe System Services Server (ZSS) is used for enabling low-level microservices and other privileged services + catalogUiTileId: zss + instanceBaseUrls: + - https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/ + homePageRelativeUrl: + routedServices: + - gatewayUrl: api/v1 + serviceRelativeUrl: api/v1/jobs + - gatewayUrl: api/v2 + serviceRelativeUrl: api/v2/jobs + apiInfo: + - apiId: com.ibm.jobs.v1 + gatewayUrl: api/v1 + version: 1.0.0 + swaggerUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/v2/api-docs + documentationUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/swagger-ui.html + - apiId: com.ibm.jobs.v2 + gatewayUrl: api/v2 + version: 2.0.0 + swaggerUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/v2/api-docs + documentationUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/swagger-ui.html +catalogUiTiles: + jobs: + title: Zowe System Services Server (ZSS) + description: Zowe System Services Server for enabling low-level microservices and other privileged services +EOF +iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/zss.yml +rm ${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml +chmod 770 $STATIC_DEF_CONFIG_DIR/zss.yml \ No newline at end of file From 78b6e3653df71f8b4fa5a80d2e239a853292fda7 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 18 Aug 2020 12:12:50 -0400 Subject: [PATCH 2/8] Removed sample data from jobs api Signed-off-by: Leanid Astrakou --- bin/configure.sh | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/bin/configure.sh b/bin/configure.sh index 7d81601b3..70a223215 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -28,7 +28,7 @@ __UNTAGGED_READ_MODE=V6 $NODE_BIN initInstance.js APP_WORKSPACE_DIR=${INSTANCE_DIR}/workspace/app-server -# Add static definition for zss +# Add static definition for zss. TODO: Needs routedServices + apiInfo cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml # services: @@ -37,26 +37,12 @@ services: description: Zowe System Services Server (ZSS) is used for enabling low-level microservices and other privileged services catalogUiTileId: zss instanceBaseUrls: - - https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/ + - https://${ZOWE_EXPLORER_HOST}:${ZOWE_ZSS_SERVER_PORT}/ homePageRelativeUrl: routedServices: - - gatewayUrl: api/v1 - serviceRelativeUrl: api/v1/jobs - - gatewayUrl: api/v2 - serviceRelativeUrl: api/v2/jobs - apiInfo: - - apiId: com.ibm.jobs.v1 - gatewayUrl: api/v1 - version: 1.0.0 - swaggerUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/v2/api-docs - documentationUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/swagger-ui.html - - apiId: com.ibm.jobs.v2 - gatewayUrl: api/v2 - version: 2.0.0 - swaggerUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/v2/api-docs - documentationUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/swagger-ui.html + apiInfo: catalogUiTiles: - jobs: + zss: title: Zowe System Services Server (ZSS) description: Zowe System Services Server for enabling low-level microservices and other privileged services EOF From 7764b4b909172f69eb113277d703117509a2881b Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Sun, 13 Sep 2020 22:22:59 -0400 Subject: [PATCH 3/8] Added some ZSS services Signed-off-by: Leanid Astrakou --- bin/configure.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/bin/configure.sh b/bin/configure.sh index 70a223215..f6cef6dc5 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -33,14 +33,71 @@ cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml # services: - serviceId: zss - title: Zowe System Services Server + title: Zowe System Services Server (ZSS) description: Zowe System Services Server (ZSS) is used for enabling low-level microservices and other privileged services catalogUiTileId: zss instanceBaseUrls: - https://${ZOWE_EXPLORER_HOST}:${ZOWE_ZSS_SERVER_PORT}/ homePageRelativeUrl: routedServices: + - gatewayUrl: /server/agent/environment # Displays ZSS host environment info + serviceRelativeUrl: /server/agent/environment + - gatewayUrl: /server/agent/services # Returns list of ZSS services + serviceRelativeUrl: /server/agent/services + - gatewayUrl: /plugins + serviceRelativeUrl: /plugins + - gatewayUrl: /datasetMetadata/ + serviceRelativeUrl: /datasetMetadata/ + - gatewayUrl: /datasetContents/ + serviceRelativeUrl: /datasetContents/ + - gatewayUrl: /security-mgmt/classes/ + serviceRelativeUrl: /security-mgmt/classes/ + - gatewayUrl: /security-mgmt/access/ + serviceRelativeUrl: /security-mgmt/access/ + - gatewayUrl: /security-mgmt/groups/ + serviceRelativeUrl: /security-mgmt/groups/ + - gatewayUrl: /security-mgmt/user-profiles/ + serviceRelativeUrl: /security-mgmt/user-profiles/ + - gatewayUrl: /saf-auth/ + serviceRelativeUrl: /saf-auth/ + - gatewayUrl: /VSAMdatasetContents/ + serviceRelativeUrl: /VSAMdatasetContents/ + - gatewayUrl: /unixfile/contents + serviceRelativeUrl: /unixfile/contents + - gatewayUrl: /unixfile/chmod/ + serviceRelativeUrl: /unixfile/chmod/ + - gatewayUrl: /unixfile/chtag/ + serviceRelativeUrl: /unixfile/chtag/ + - gatewayUrl: /unixfile/chown/ + serviceRelativeUrl: /unixfile/chown/ + - gatewayUrl: /unixfile/metadata/ + serviceRelativeUrl: /unixfile/metadata/ + - gatewayUrl: /unixfile/touch/ + serviceRelativeUrl: /unixfile/touch/ + - gatewayUrl: /unixfile/mkdir/ + serviceRelativeUrl: /unixfile/mkdir/ + - gatewayUrl: /unixfile/copy/ + serviceRelativeUrl: /unixfile/copy/ + - gatewayUrl: /unixfile/rename/ + serviceRelativeUrl: /unixfile/rename/ + - gatewayUrl: /login/ + serviceRelativeUrl: /login/ + - gatewayUrl: /logout/ + serviceRelativeUrl: /logout/ + - gatewayUrl: /ras/ + serviceRelativeUrl: /ras/ + - gatewayUrl: /password/ + serviceRelativeUrl: /password/ + - gatewayUrl: /omvs/ + serviceRelativeUrl: /omvs/ + - gatewayUrl: /unixfile/ + serviceRelativeUrl: /unixfile/ apiInfo: + - apiId: org.zowe.zss + gatewayUrl: server/agent/ + version: 1.15.0+20200901 + # swaggerUrl: TODO + # documentationUrl: TODO catalogUiTiles: zss: title: Zowe System Services Server (ZSS) From 8f74f03cbb7f788b8daebc3094c6d3ffbd3cc97f Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 15 Sep 2020 11:26:45 -0400 Subject: [PATCH 4/8] Addressed code review Signed-off-by: Leanid Astrakou --- bin/configure.sh | 66 +++++++----------------------------------------- 1 file changed, 9 insertions(+), 57 deletions(-) diff --git a/bin/configure.sh b/bin/configure.sh index f6cef6dc5..ca67694ea 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -33,75 +33,27 @@ cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml # services: - serviceId: zss - title: Zowe System Services Server (ZSS) - description: Zowe System Services Server (ZSS) is used for enabling low-level microservices and other privileged services + title: Zowe System Services (ZSS) + description: Zowe System Services is used for enabling low-level microservices and other privileged mainframe services, + like USS, MVS, authentication, and security management. catalogUiTileId: zss instanceBaseUrls: - https://${ZOWE_EXPLORER_HOST}:${ZOWE_ZSS_SERVER_PORT}/ homePageRelativeUrl: routedServices: - - gatewayUrl: /server/agent/environment # Displays ZSS host environment info - serviceRelativeUrl: /server/agent/environment - - gatewayUrl: /server/agent/services # Returns list of ZSS services - serviceRelativeUrl: /server/agent/services - - gatewayUrl: /plugins - serviceRelativeUrl: /plugins - - gatewayUrl: /datasetMetadata/ - serviceRelativeUrl: /datasetMetadata/ - - gatewayUrl: /datasetContents/ - serviceRelativeUrl: /datasetContents/ - - gatewayUrl: /security-mgmt/classes/ - serviceRelativeUrl: /security-mgmt/classes/ - - gatewayUrl: /security-mgmt/access/ - serviceRelativeUrl: /security-mgmt/access/ - - gatewayUrl: /security-mgmt/groups/ - serviceRelativeUrl: /security-mgmt/groups/ - - gatewayUrl: /security-mgmt/user-profiles/ - serviceRelativeUrl: /security-mgmt/user-profiles/ - - gatewayUrl: /saf-auth/ - serviceRelativeUrl: /saf-auth/ - - gatewayUrl: /VSAMdatasetContents/ - serviceRelativeUrl: /VSAMdatasetContents/ - - gatewayUrl: /unixfile/contents - serviceRelativeUrl: /unixfile/contents - - gatewayUrl: /unixfile/chmod/ - serviceRelativeUrl: /unixfile/chmod/ - - gatewayUrl: /unixfile/chtag/ - serviceRelativeUrl: /unixfile/chtag/ - - gatewayUrl: /unixfile/chown/ - serviceRelativeUrl: /unixfile/chown/ - - gatewayUrl: /unixfile/metadata/ - serviceRelativeUrl: /unixfile/metadata/ - - gatewayUrl: /unixfile/touch/ - serviceRelativeUrl: /unixfile/touch/ - - gatewayUrl: /unixfile/mkdir/ - serviceRelativeUrl: /unixfile/mkdir/ - - gatewayUrl: /unixfile/copy/ - serviceRelativeUrl: /unixfile/copy/ - - gatewayUrl: /unixfile/rename/ - serviceRelativeUrl: /unixfile/rename/ - - gatewayUrl: /login/ - serviceRelativeUrl: /login/ - - gatewayUrl: /logout/ - serviceRelativeUrl: /logout/ - - gatewayUrl: /ras/ - serviceRelativeUrl: /ras/ - - gatewayUrl: /password/ - serviceRelativeUrl: /password/ - - gatewayUrl: /omvs/ - serviceRelativeUrl: /omvs/ - - gatewayUrl: /unixfile/ - serviceRelativeUrl: /unixfile/ + - gatewayUrl: api/v1 + serviceRelativeUrl: apiInfo: - apiId: org.zowe.zss - gatewayUrl: server/agent/ + gatewayUrl: api/v1 version: 1.15.0+20200901 # swaggerUrl: TODO # documentationUrl: TODO catalogUiTiles: zss: - title: Zowe System Services Server (ZSS) - description: Zowe System Services Server for enabling low-level microservices and other privileged services + title: Zowe System Services (ZSS) + description: Zowe System Services is used for enabling low-level microservices and other privileged mainframe services, + like USS, MVS, authentication, and security management. EOF iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/zss.yml rm ${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml From c7796693ffa39f9d5a0f2b0868fa8a2af4db4a23 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 15 Sep 2020 11:27:47 -0400 Subject: [PATCH 5/8] Todo for doc Signed-off-by: Leanid Astrakou --- bin/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/configure.sh b/bin/configure.sh index ca67694ea..9e9254c7e 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -28,7 +28,7 @@ __UNTAGGED_READ_MODE=V6 $NODE_BIN initInstance.js APP_WORKSPACE_DIR=${INSTANCE_DIR}/workspace/app-server -# Add static definition for zss. TODO: Needs routedServices + apiInfo +# Add static definition for zss. TODO: Needs documentation cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml # services: From d28cb73603350911ee405ab22c4e8be3b50a6a37 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 15 Sep 2020 11:37:25 -0400 Subject: [PATCH 6/8] https --> http Signed-off-by: Leanid Astrakou --- bin/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/configure.sh b/bin/configure.sh index 9e9254c7e..352c8a1af 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -38,7 +38,7 @@ services: like USS, MVS, authentication, and security management. catalogUiTileId: zss instanceBaseUrls: - - https://${ZOWE_EXPLORER_HOST}:${ZOWE_ZSS_SERVER_PORT}/ + - http://${ZOWE_EXPLORER_HOST}:${ZOWE_ZSS_SERVER_PORT}/ homePageRelativeUrl: routedServices: - gatewayUrl: api/v1 From ddc1ad2cf1c2b7770d1029979555e98968e540af Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Wed, 16 Sep 2020 13:04:38 -0400 Subject: [PATCH 7/8] Made version a variable Signed-off-by: Leanid Astrakou --- bin/configure.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/configure.sh b/bin/configure.sh index 352c8a1af..4134f62e8 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -28,14 +28,17 @@ __UNTAGGED_READ_MODE=V6 $NODE_BIN initInstance.js APP_WORKSPACE_DIR=${INSTANCE_DIR}/workspace/app-server +date_stamp=$(date +%Y%m%d) +version_num=`grep "version" ${INSTANCE_DIR}/workspace/manifest.json | head -1 | sed -e 's/"//g' | sed -e 's/.*: *//g' | sed -e 's/,.*//g'` +version="${version_num}+${date_stamp}" + # Add static definition for zss. TODO: Needs documentation cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml # services: - serviceId: zss title: Zowe System Services (ZSS) - description: Zowe System Services is used for enabling low-level microservices and other privileged mainframe services, - like USS, MVS, authentication, and security management. + description: Zowe System Services is used for enabling low-level microservices and other privileged mainframe services, like USS, MVS, authentication, and security management. catalogUiTileId: zss instanceBaseUrls: - http://${ZOWE_EXPLORER_HOST}:${ZOWE_ZSS_SERVER_PORT}/ @@ -46,14 +49,13 @@ services: apiInfo: - apiId: org.zowe.zss gatewayUrl: api/v1 - version: 1.15.0+20200901 + version: ${version} # swaggerUrl: TODO # documentationUrl: TODO catalogUiTiles: zss: title: Zowe System Services (ZSS) - description: Zowe System Services is used for enabling low-level microservices and other privileged mainframe services, - like USS, MVS, authentication, and security management. + description: Zowe System Services is used for enabling low-level microservices and other privileged mainframe services, like USS, MVS, authentication, and security management. EOF iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/zss.yml rm ${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml From 997ceb9010292c7897a000aefb099460b3f23a8d Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Wed, 16 Sep 2020 13:13:38 -0400 Subject: [PATCH 8/8] Removed date Signed-off-by: Leanid Astrakou --- bin/configure.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/configure.sh b/bin/configure.sh index 4134f62e8..674a341bb 100644 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -28,9 +28,7 @@ __UNTAGGED_READ_MODE=V6 $NODE_BIN initInstance.js APP_WORKSPACE_DIR=${INSTANCE_DIR}/workspace/app-server -date_stamp=$(date +%Y%m%d) -version_num=`grep "version" ${INSTANCE_DIR}/workspace/manifest.json | head -1 | sed -e 's/"//g' | sed -e 's/.*: *//g' | sed -e 's/,.*//g'` -version="${version_num}+${date_stamp}" +version=`grep "version" ${INSTANCE_DIR}/workspace/manifest.json | head -1 | sed -e 's/"//g' | sed -e 's/.*: *//g' | sed -e 's/,.*//g'` # Add static definition for zss. TODO: Needs documentation cat <${STATIC_DEF_CONFIG_DIR}/zss.ebcidic.yml