Zowe Suite v2.0.0

.github/workflows/build-core.yml

@@ -64,7 +64,7 @@ jobs:
       - name: '[Prep 2] Setup Node'
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: '[Prep 3] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2

bin/init/plugins-init.sh

@@ -38,9 +38,6 @@ for installed_component in $(echo "${ZWE_INSTALLED_COMPONENTS}" | sed "s/,/ /g")
         # NOTE: relativeTo does not need to be handled here because this process occurs every start so the results should be "portable" by update on restart
 
         INSTALL_NO_NODE=$1 ../install-app.sh "$fullpath" "${plugins_dir}"
-        if [ -n $2 ]; then
-          check_zss_pc_bit "$fullpath"
-        fi
       else
         echo "Deregistering plugin ${fullpath}"
         ../uninstall-app.sh "$fullpath" "${plugins_dir}"

bin/utils/plugin-utils.sh

@@ -42,63 +42,3 @@ hasApp2App() {
   fi
 }
 
-check_zss_pc_bit() {
-  appfw_plugin_path=${1}
-
-  services=$(read_json "${appfw_plugin_path}/pluginDefinition.json" ".dataServices" 2>/dev/null)
-  if [ -n "${services}" ]; then
-    echo "Checking ZSS services in plugin path=${1}"
-    service_iterator_index=0
-    service_type=$(read_json "${appfw_plugin_path}/pluginDefinition.json" ".dataServices[${service_iterator_index}].type" 2>/dev/null)
-    while [ -n "${service_type}" ]; do
-      if [ "${service_type}" = "service" ]; then
-        libraryName31=$(read_json "${appfw_plugin_path}/pluginDefinition.json" ".dataServices[${service_iterator_index}].libraryName31" 2>/dev/null)
-        libraryName64=$(read_json "${appfw_plugin_path}/pluginDefinition.json" ".dataServices[${service_iterator_index}].libraryName64" 2>/dev/null)
-        libraryName=$(read_json "${appfw_plugin_path}/pluginDefinition.json" ".dataServices[${service_iterator_index}].libraryName" 2>/dev/null)
-        if [ -n "${libraryName31}" ]; then
-          test_or_set_pc_bit "${appfw_plugin_path}/lib/${libraryName31}"
-          if [ "$?" = "1" ]; then
-            break
-          fi
-        fi
-        if [ -n "${libraryName64}" ]; then
-          test_or_set_pc_bit "${appfw_plugin_path}/lib/${libraryName64}"
-          if [ "$?" = "1" ]; then
-            break
-          fi
-        fi
-        if [ -n "${libraryName}" ]; then
-          test_or_set_pc_bit "${appfw_plugin_path}/lib/${libraryName}"
-          if [ "$?" = "1" ]; then
-            break
-          fi
-        fi
-      fi
-      service_iterator_index=`expr $service_iterator_index + 1`
-      service_type=$(read_json "${appfw_plugin_path}/pluginDefinition.json" ".dataServices[${service_iterator_index}].type 2>/dev/null")
-    done
-  fi
-}
-
-
-
-test_or_set_pc_bit() {
-  path="${1}"
-
-  testpc=`extattr $path | sed -n '3 p'`
-  if [ "$testpc" = "Program controlled = YES" ]; then
-    # normal
-    return 0
-  else
-    echo "Plugin ZSS API not program controlled. Attempting to add PC bit." 
-    extattr +p $path
-    testpc2=$(extattr $path | sed -n '3 p')
-    if [ "$testpc2" = "Program controlled = YES" ]; then
-      echo "PC bit set successfully."
-      return 0
-    else
-      echo "PC bit not set. This must be set such as by executing 'extattr +p $COMPONENT_HOME/lib/sys.so' as a user with sufficient privilege."
-      return 1
-    fi
-  fi
-}

lib/zluxArgs.js

@@ -78,7 +78,7 @@ if (!userInput.config) {
 }
 let configJSON = DEFAULT_CONFIG;
 //Overall config is a result of a heirarchy of overrides from defaults.
-//CLI args > CLI -D arg > Env vars > JSON file > builtin defaults
+//CLI args > CLI -D arg > Env vars > YAML file > builtin defaults
 const userConfig = yamlConfig.getConfig(userInput.config, haInstanceId, componentOrder);
 //Config JSON overrides hardcoded defaults
 configJSON = mergeUtils.deepAssign(configJSON, userConfig || {});

manifest.yaml

@@ -1,10 +1,8 @@
 ---
 name: app-server
-# Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/.
 id: org.zowe.zlux.app-server
 # Without the v
 version: "{{build.version}}"
-# Component version is defined in gradle.properties for Gradle project
 # Human readable component name
 title: Application Server
 # Human readable component description
@@ -14,6 +12,8 @@ keywords:
   - zlux
   - appfw
 license: EPL-2.0
+schemas:
+  configs: schemas/zowe-schema.json
 repository:
   type: git
   url: https://github.com/zowe/zlux-app-server.git