Fix for mac os and validation error messages when no parameters are specified (OWLS-86060) (#2062)

ankedia · web-flow · commit fa08b82a7aaa · 2020-11-20T08:48:09.000-05:00
* Fix for mac os and validation error messages when no parameters are specified (OWLS-86060)

* Fix error message

* Provide usage information when validation fails.

* Fix error message when domain resource not found.

* Validate that domain resource exists before validating server/cluster name in config map.

* Fix error message as per review comment.

* Fixed error message.
diff --git a/kubernetes/samples/scripts/domain-lifecycle/helper.sh b/kubernetes/samples/scripts/domain-lifecycle/helper.sh
@@ -257,10 +257,7 @@ function getSortedListOfServers {
   local sortedServers=()
   local otherServers=()
 
-  getConfigMap "${domainUid}" "${domainNamespace}" configMap
-  topology=$(echo "${configMap}" | jq '.data["topology.yaml"]')
-  jsonTopology=$(python -c \
-    'import sys, yaml, json; print json.dumps(yaml.safe_load('"${topology}"'), indent=4)')
+  getTopology "${domainUid}" "${domainNamespace}" jsonTopology
   clusterTopology=$(echo ${jsonTopology} | jq -r '.domain | .configuredClusters[] | select (.name == '\"${clusterName}\"')')
   dynaCluster=$(echo ${clusterTopology} | jq .dynamicServersConfig)
   if [ "${dynaCluster}" == "null" ]; then
@@ -509,10 +506,7 @@ function validateServerAndFindCluster {
 
   eval $__isValidServer=false
   eval $__clusterName=UNKNOWN
-  getConfigMap "${domainUid}" "${domainNamespace}" configMap
-  topology=$(echo "${configMap}" | jq '.data["topology.yaml"]')
-  jsonTopology=$(python -c \
-    'import sys, yaml, json; print json.dumps(yaml.safe_load('"${topology}"'), indent=4)')
+  getTopology "${domainUid}" "${domainNamespace}" jsonTopology
   adminServer=$(echo $jsonTopology | jq -r .domain.adminServerName)
   if [ "${serverName}" == "${adminServer}" ]; then
     printError "Server '${serverName}' is administration server. The '${script}' script doesn't support starting or stopping administration server."
@@ -578,12 +572,7 @@ function validateClusterName {
   local clusterName=$3
   local __isValidCluster=$4
 
-  getConfigMap "${domainUid}" "${domainNamespace}" configMap
-  configMap=$(${kubernetesCli} get cm ${domainUid}-weblogic-domain-introspect-cm \
-    -n ${domainNamespace} -o json)
-  topology=$(echo "${configMap}" | jq '.data["topology.yaml"]')
-  jsonTopology=$(python -c \
-    'import sys, yaml, json; print json.dumps(yaml.safe_load('"${topology}"'), indent=4)')
+  getTopology "${domainUid}" "${domainNamespace}" jsonTopology
   clusters=($(echo $jsonTopology | jq -cr .domain.configuredClusters[].name))
   if  checkStringInArray "${clusterName}" "${clusters[@]}" ; then
     eval $__isValidCluster=true
@@ -592,20 +581,31 @@ function validateClusterName {
   fi
 }
 
-function getConfigMap {
+function getTopology {
   local domainUid=$1
   local domainNamespace=$2
   local __result=$3 
 
-  configMap=$(${kubernetesCli} get cm ${domainUid}-weblogic-domain-introspect-cm \
-    -n ${domainNamespace} -o json --ignore-not-found)
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    configMap=$(${kubernetesCli} get cm ${domainUid}-weblogic-domain-introspect-cm \
+      -n ${domainNamespace} -o yaml --ignore-not-found)
+  else 
+    configMap=$(${kubernetesCli} get cm ${domainUid}-weblogic-domain-introspect-cm \
+      -n ${domainNamespace} -o json --ignore-not-found)
+  fi
   if [ -z "${configMap}" ]; then
     printError "Domain config map '${domainUid}-weblogic-domain-introspect-cm' not found. \
       This script requires that the introspector job for the specified domain ran \
       successfully and generated this config map. Exiting."
     exit 1
+  elif [[ "$OSTYPE" == "darwin"* ]]; then
+    jsonTopology=$(echo "${configMap}" | yq r - data.[topology.yaml] | yq r - -j)
+  else
+    topology=$(echo "${configMap}" | jq '.data["topology.yaml"]')
+    jsonTopology=$(python -c \
+    'import sys, yaml, json; print json.dumps(yaml.safe_load('"${topology}"'), indent=4)')
   fi
-  eval $__result="'${configMap}'"
+  eval $__result="'${jsonTopology}'"
 }
 
 
@@ -629,6 +629,12 @@ function validateJqAvailable {
   fi
 }
 
+function validateYqAvailable {
+  if [[ "$OSTYPE" == "darwin"* ]] && ! [ -x "$(command -v yq)" ]; then
+    validationError "yq is not installed"
+  fi
+}
+
 # try to execute python to see whether python is available
 function validatePythonAvailable {
   if ! [ -x "$(command -v python)" ]; then
@@ -643,14 +649,6 @@ function validateKubernetesCliAvailable {
   fi
 }
 
-#
-# Function to exit and print an error message
-# $1 - text of message
-function fail {
-  printError $*
-  exit 1
-}
-
 # Function to print an error message
 function printError {
   echo [`timestamp`][ERROR] $*
@@ -714,6 +712,7 @@ function validationError {
 #
 function failIfValidationErrors {
   if [ "$validateErrors" = true ]; then
-    fail 'The errors listed above must be resolved before the script can continue'
+    printError 'The errors listed above must be resolved before the script can continue. Please see usage information below.'
+    usage 1
   fi
 }
diff --git a/kubernetes/samples/scripts/domain-lifecycle/startCluster.sh b/kubernetes/samples/scripts/domain-lifecycle/startCluster.sh
@@ -77,25 +77,31 @@ function initialize {
 
   validateKubernetesCliAvailable
   validateJqAvailable
+  validateYqAvailable
 
   if [ -z "${clusterName}" ]; then
     validationError "Please specify cluster name using '-c' parameter e.g. '-c cluster-1'."
   fi
 
-  isValidCluster=""
-  validateClusterName "${domainUid}" "${domainNamespace}" "${clusterName}" isValidCluster
-
-  if [ "${isValidCluster}" != 'true' ]; then
-    validationError "cluster ${clusterName} is not part of domain ${domainUid} in namespace ${domainNamespace}."
-  fi
-
   failIfValidationErrors
+
 }
 
 initialize
 
 # Get the domain in json format
-domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json)
+domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json --ignore-not-found)
+if [ -z "${domainJson}" ]; then
+  printError "Unable to get domain resource for domain '${domainUid}' in namespace '${domainNamespace}'. Please make sure the 'domain_uid' and 'namespace' specified by the '-d' and '-n' arguments are correct. Exiting."
+  exit 1
+fi
+
+isValidCluster=""
+validateClusterName "${domainUid}" "${domainNamespace}" "${clusterName}" isValidCluster
+if [ "${isValidCluster}" != 'true' ]; then
+  printError "cluster ${clusterName} is not part of domain ${domainUid} in namespace ${domainNamespace}. Please make sure that cluster name is correct."
+  exit 1
+fi
 
 getDomainPolicy "${domainJson}" domainStartPolicy
 # Fail if effective start policy of domain is NEVER or ADMIN_ONLY
diff --git a/kubernetes/samples/scripts/domain-lifecycle/startDomain.sh b/kubernetes/samples/scripts/domain-lifecycle/startDomain.sh
@@ -67,13 +67,20 @@ function initialize {
 
   validateKubernetesCliAvailable
   validateJqAvailable
+  validateYqAvailable
+
   failIfValidationErrors
 }
 
 initialize
 
 # Get the domain in json format
-domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json)
+domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json --ignore-not-found)
+
+if [ -z "${domainJson}" ]; then
+  printError "Domain resource for domain '${domainUid}' not found in namespace '${domainNamespace}'. Exiting."
+  exit 1
+fi
 
 getDomainPolicy "${domainJson}" serverStartPolicy
 
diff --git a/kubernetes/samples/scripts/domain-lifecycle/startServer.sh b/kubernetes/samples/scripts/domain-lifecycle/startServer.sh
@@ -120,6 +120,7 @@ function initialize {
 
   validateKubernetesCliAvailable
   validateJqAvailable
+  validateYqAvailable
 
   # Validate that server name parameter is specified.
   if [ -z "${serverName}" ]; then
@@ -132,9 +133,9 @@ function initialize {
 initialize
 
 # Get the domain in json format
-domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json)
-if [ $? -ne 0 ]; then
-  printError "Unable to get domain resource. Please make sure 'domain_uid' and 'namespace' provided with '-d' and '-n' arguments are correct."
+domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json --ignore-not-found)
+if [ -z "${domainJson}" ]; then
+  printError "Unable to get domain resource for domain '${domainUid}' in namespace '${domainNamespace}'. Please make sure the 'domain_uid' and 'namespace' specified by the '-d' and '-n' arguments are correct. Exiting."
   exit 1
 fi
 
diff --git a/kubernetes/samples/scripts/domain-lifecycle/stopCluster.sh b/kubernetes/samples/scripts/domain-lifecycle/stopCluster.sh
@@ -75,25 +75,30 @@ function initialize {
 
   validateKubernetesCliAvailable
   validateJqAvailable
+  validateYqAvailable
 
   if [ -z "${clusterName}" ]; then
     validationError "Please specify cluster name using '-c' parameter e.g. '-c cluster-1'."
   fi
 
-  isValidCluster=""
-  validateClusterName "${domainUid}" "${domainNamespace}" "${clusterName}" isValidCluster
-
-  if [ "${isValidCluster}" != 'true' ]; then
-    validationError "cluster ${clusterName} is not part of domain ${domainUid} in namespace ${domainNamespace}. "
-  fi
-
   failIfValidationErrors
 }
 
 initialize
 
 # Get the domain in json format
-domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json)
+domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json --ignore-not-found)
+if [ -z "${domainJson}" ]; then
+  printError "Unable to get domain resource for domain '${domainUid}' in namespace '${domainNamespace}'. Please make sure the 'domain_uid' and 'namespace' specified by the '-d' and '-n' arguments are correct. Exiting."
+  exit 1
+fi
+
+isValidCluster=""
+validateClusterName "${domainUid}" "${domainNamespace}" "${clusterName}" isValidCluster
+if [ "${isValidCluster}" != 'true' ]; then
+  printError "cluster ${clusterName} is not part of domain ${domainUid} in namespace ${domainNamespace}. Please make sure that cluster name is correct."
+  exit 1
+fi
 
 # Get server start policy for this server
 getClusterPolicy "${domainJson}" "${clusterName}" startPolicy
diff --git a/kubernetes/samples/scripts/domain-lifecycle/stopDomain.sh b/kubernetes/samples/scripts/domain-lifecycle/stopDomain.sh
@@ -66,13 +66,19 @@ function initialize {
 
   validateKubernetesCliAvailable
   validateJqAvailable
+  validateYqAvailable
   failIfValidationErrors
 }
 
 initialize
 
 # Get the domain in json format
-domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json)
+domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json --ignore-not-found)
+
+if [ -z "${domainJson}" ]; then
+  printError "Domain resource for domain '${domainUid}' not found in namespace '${domainNamespace}'. Exiting."
+  exit 1
+fi
 
 getDomainPolicy "${domainJson}" serverStartPolicy
 
diff --git a/kubernetes/samples/scripts/domain-lifecycle/stopServer.sh b/kubernetes/samples/scripts/domain-lifecycle/stopServer.sh
@@ -116,6 +116,7 @@ function initialize {
 
   validateKubernetesCliAvailable
   validateJqAvailable
+  validateYqAvailable
 
   # Validate that server name parameter is specified.
   if [ -z "${serverName}" ]; then
@@ -127,17 +128,20 @@ function initialize {
 
 initialize
 
+# Get the domain in json format
+domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json --ignore-not-found)
+if [ -z "${domainJson}" ]; then
+  printError "Unable to get domain resource for domain '${domainUid}' in namespace '${domainNamespace}'. Please make sure the 'domain_uid' and 'namespace' specified by the '-d' and '-n' arguments are correct. Exiting."
+  exit 1
+fi
+
 # Validate that specified server is either part of a cluster or is an independent managed server
 validateServerAndFindCluster "${domainUid}" "${domainNamespace}" "${serverName}" isValidServer clusterName
 if [ "${isValidServer}" != 'true' ]; then
   printError "Server ${serverName} is not part of any cluster and it's not an independent managed server. Please make sure that server name specified is correct."
   exit 1
 fi
 
-
-# Get the domain in json format
-domainJson=$(${kubernetesCli} get domain ${domainUid} -n ${domainNamespace} -o json)
-
 getEffectivePolicy "${domainJson}" "${serverName}" "${clusterName}" effectivePolicy
 if [ -n "${clusterName}" ]; then
   # Server is part of a cluster, check currently started servers
