More yml commands, environment edit command, ...

Author: svrnm

USAGE.md

@@ -172,12 +172,13 @@ Afterwards you can use `act.sh -E <name>` to call the given controller.
 
 | Command | Description | Example |
 | ------- | ----------- | ------- |
-| source | Load environment variables |  |
+| source | Load environment variables | `act.sh environment source myaccount` |
 | get | Retrieve an environment. Provide the name of the environment as parameter. | `act.sh environment get myaccount` |
 | delete | Delete an environment. Provide the name of the environment as parameter. | `act.sh environment delete myaccount` |
 | add | Add a new environment. To change the default environment, run with `-d` | `act.sh environment add -d` |
 | list | List all your environments | `act.sh environment list ` |
 | export | Export an environment into a postman environment | `act.sh environment export > output.json` |
+| edit |  | `act.sh environment edit myaccount` |
 
 
 ## eum

act.sh

@@ -8,7 +8,6 @@ function controller_call {
   debug "$@"
   while getopts "X:d:F:B" opt "$@";
   do
-    debug "${opt}"
     case "${opt}" in
       X)
 	METHOD=${OPTARG}
@@ -22,11 +21,12 @@ function controller_call {
       B)
         USE_BASIC_AUTH=1
       ;;
+      *)
+        debug "Invalid flag ${OPTARG} for controller_call"
+      ;;
     esac
   done
 
-  debug "ASDF"
-
   shiftOptInd
   shift $SHIFTS
 

commands.yml

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+function environment_edit {
+  if [ -x "${EDITOR}" ] || [ -x "`which "${EDITOR}"`" ] ; then
+    ${EDITOR} "${HOME}/.appdynamics/act/config.$1.sh"
+  else
+    error "No editor found. Please set \$EDITOR."
+  fi
+}
+
+register environment_edit Open an environment file in your editor
+describe environment_edit << EOF
+EOF
+
+example environment_edit << EOF
+myaccount
+EOF

commands/controller/call.sh

@@ -13,6 +13,6 @@ describe environment_source << EOF
 Load environment variables
 EOF
 
-example environment_get << EOF
+example environment_source << EOF
 myaccount
 EOF

commands/environment/edit.sh

@@ -3,7 +3,7 @@
 function _help {
   if [ "$1" = "" ] ; then
     read -r -d '' COMMAND_RESULT <<- EOM
-Usage: $SCRIPTNAME [-H <controller-host>] [-C <controller-credentials>] [-D <output-verbosity>] [-P <plugin-directory>] [-A <application-name>] <namespace> <command>\n
+Usage: ${USAGE_DESCRIPTION}\n
 
 You can use the following options on a global level:\n
 
@@ -54,4 +54,4 @@ EOM
   fi
 }
 
-register _help Display the global usage information
+register _help Display the global help.

commands/environment/source.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+function _usage {
+    # shellcheck disable=SC2034
+    read -r -d '' COMMAND_RESULT <<- EOM
+Usage: ${USAGE_DESCRIPTION}\n
+'${SCRIPTNAME} help' will list available namespaces and subcommands.
+See '${SCRIPTNAME} help <namespace>' to read about a specific namespace and the available subcommands
+EOM
+}
+
+register _usage Display usage information.

commands/help.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 function _version {
-  COMMAND_RESULT="$ACT_VERSION ~ $ACT_LAST_COMMIT"
+  # shellcheck disable=SC2034
+  COMMAND_RESULT="$ACT_VERSION ~ $ACT_LAST_COMMIT (${GLOBAL_COMMANDS_COUNTER} commands)"
 }
 
 register _version Print the current version of $SCRIPTNAME

commands/usage.sh

@@ -3,6 +3,7 @@
 function apiCall {
   local OPTS
   local OPTIONAL_OPTIONS=""
+  local OPTS_TYPES=()
   local METHOD="GET"
 
   while getopts "X:d:" opt "$@";
@@ -37,19 +38,21 @@ function apiCall {
   OLDIFS=$IFS
   IFS="{{"
   for MATCH in $PAYLOAD ; do
-    if [[ $MATCH =~ ([a-zA-Z])(\??)\}\} ]]; then
+    if [[ $MATCH =~ ([a-zA-Z])(:[a-zA-Z0-9_-]+)?(\??)\}\} ]]; then
       OPT=${BASH_REMATCH[1]}:
-      if [ "${BASH_REMATCH[2]}" = "?" ] ; then
+      OPTS_TYPES+=(${BASH_REMATCH[1]}${BASH_REMATCH[2]})
+      if [ "${BASH_REMATCH[3]}" = "?" ] ; then
         OPTIONAL_OPTIONS=${OPTIONAL_OPTIONS}${OPT}
       fi
       OPTS="${OPTS}${OPT}"
     fi
   done;
 
   for MATCH in $ENDPOINT ; do
-    if [[ $MATCH =~ ([a-zA-Z])(\??)\}\} ]]; then
+    if [[ $MATCH =~ ([a-zA-Z])(:[a-zA-Z0-9_-]+)?(\??)\}\} ]]; then
       OPT=${BASH_REMATCH[1]}:
-      if [ "${BASH_REMATCH[2]}" = "?" ] ; then
+      OPTS_TYPES+=(${BASH_REMATCH[1]}${BASH_REMATCH[2]})
+      if [ "${BASH_REMATCH[3]}" = "?" ] ; then
         OPTIONAL_OPTIONS=${OPTIONAL_OPTIONS}${OPT}
       fi
       OPTS="${OPTS}${OPT}"
@@ -58,6 +61,7 @@ function apiCall {
   IFS=$OLDIFS
 
   debug "Identified Options: ${OPTS}"
+  debug "Identified Types: ${OPTS_TYPES[*]}"
   debug "Optional Options: $OPTIONAL_OPTIONS"
 
   if [ -n "$OPTS" ] ; then
@@ -67,18 +71,18 @@ function apiCall {
       debug "Applying $opt with $ARG"
       # PAYLOAD=${PAYLOAD//\$\{${opt}\}/$OPTARG}
       # ENDPOINT=${ENDPOINT//\$\{${opt}\}/$OPTARG}
-      while [[ $PAYLOAD =~ \{\{$opt\??\}\} ]] ; do
+      while [[ $PAYLOAD =~ \{\{$opt(:[a-zA-Z0-9_-]+)?\??\}\} ]] ; do
         PAYLOAD=${PAYLOAD//${BASH_REMATCH[0]}/$OPTARG}
       done;
-      while [[ $ENDPOINT =~ \{\{$opt\??\}\} ]] ; do
+      while [[ $ENDPOINT =~ \{\{$opt(:[a-zA-Z0-9_-]+)?\??\}\} ]] ; do
         ENDPOINT=${ENDPOINT//${BASH_REMATCH[0]}/$ARG}
       done;
     done
     shiftOptInd
     shift $SHIFTS
   fi
 
-  while [[ $PAYLOAD =~ \{\{([a-zA-Z])(\??)\}\} ]] ; do
+  while [[ $PAYLOAD =~ \{\{([a-zA-Z])(:[a-zA-Z0-9_-]+)?(\??)\}\} ]] ; do
     if [ -z "$1" ] && [[ "${OPTIONAL_OPTIONS}" != *"${BASH_REMATCH[1]}"* ]] ; then
       local MISSING=${BASH_REMATCH:2:1}
       if [ "${MISSING}" == "a" ] && [ -n "${CONFIG_CONTROLLER_DEFAULT_APPLICATION}" ] ; then
@@ -92,13 +96,22 @@ function apiCall {
     shift
   done
 
-  while [[ $ENDPOINT =~ \{\{([a-zA-Z])(\??)\}\} ]] ; do
+  while [[ $ENDPOINT =~ \{\{([a-zA-Z])(:[a-zA-Z0-9_-]+)?(\??)\}\} ]] ; do
     if [ -z "$1" ] && [[ "${OPTIONAL_OPTIONS}" != *"${BASH_REMATCH[1]}"* ]] ; then
       local MISSING=${BASH_REMATCH:2:1}
       if [ "${MISSING}" == "a" ] && [ -n "${CONFIG_CONTROLLER_DEFAULT_APPLICATION}" ] ; then
+        debug "Using default application for -a: ${CONFIG_CONTROLLER_DEFAULT_APPLICATION}"
         ENDPOINT=${ENDPOINT//'{{a}}'/${CONFIG_CONTROLLER_DEFAULT_APPLICATION}}
       else
-        error "Please provide an argument for paramater -${BASH_REMATCH:2:1}"
+        ERROR_MESSAGE="Please provide an argument for parameter -${MISSING}"
+        for TYPE in "${OPTS_TYPES[@]}" ;
+        do
+          if [[ "${TYPE}" == ${MISSING}:* ]] ; then
+            TYPE=${TYPE//_/ }
+            ERROR_MESSAGE="Missing ${TYPE#*:}: ${ERROR_MESSAGE}"
+          fi
+        done;
+        error "${ERROR_MESSAGE}"
         return;
       fi
     fi

commands/version.sh

@@ -27,7 +27,7 @@ COLOR_RESET="\033[0m"
 
 GLOBAL_COMMANDS=""
 GLOBAL_HELP=""
-GLOBAL_LONG_HELP_COUNTER=0
+declare -i GLOBAL_COMMANDS_COUNTER=0
 declare -a GLOBAL_LONG_HELP_STRINGS
 declare -a GLOBAL_LONG_HELP_COMMANDS
 declare -a GLOBAL_EXAMPLE_COMMANDS
@@ -41,6 +41,7 @@ declare -i VERBOSITY_COUNTER
 
 # register namespace_command help
 function register {
+  GLOBAL_COMMANDS_COUNTER+=1
   GLOBAL_COMMANDS="$GLOBAL_COMMANDS $1"
   GLOBAL_HELP="$GLOBAL_HELP\n$*"
 }
@@ -88,6 +89,7 @@ else
 fi
 
 # Parse global options
+USAGE_DESCRIPTION="$SCRIPTNAME [-H <controller-host>] [-C <controller-credentials>] [-D <output-verbosity>] [-E <environment>] [-J <cookie-location>] [-P <plugin-directory>] [-F <controller-info-xml>] [-A <application-name>] [-O] [-v[vv]] <namespace> <command>"
 read -r -d '' AVAILABLE_GLOBAL_OPTIONS <<- EOM
 |-H <controller-host>          |specify the host of the controller you want to connect to|
 |-C <controller-credentials>   |provide the credentials for the controller. Format: user@tenant:password|
@@ -191,17 +193,21 @@ debug "CONFIG_USER_PLUGIN_DIRECTORY=$CONFIG_USER_PLUGIN_DIRECTORY"
 
 recursiveSource "${CONFIG_USER_PLUGIN_DIRECTORY}"
 
+
+
 NAMESPACE=$1
 
 COMMAND_RESULT=""
 
+if [ "$#" -eq 0 ] ; then
+  _usage
 # Check if the namespace is used
-if [ "${GLOBAL_COMMANDS/${NAMESPACE}_}" != "$GLOBAL_COMMANDS" ] ; then
+elif [ "${GLOBAL_COMMANDS/${NAMESPACE}_}" != "$GLOBAL_COMMANDS" ] ; then
   debug "${NAMESPACE} has commands"
   COMMAND=$2
-  if [ "$COMMAND" == "" ] || [ "$COMMAND" == "help" ]; then
+  if [ "$COMMAND" == "" ] || [ "$COMMAND" == "help" ] ; then
     debug "Will display help for $NAMESPACE"
-    _help ${NAMESPACE}
+    echo _help ${NAMESPACE}
   elif [ "${GLOBAL_COMMANDS/${NAMESPACE}_${COMMAND}}" != "$GLOBAL_COMMANDS" ] ; then
     debug "${NAMESPACE}_${COMMAND} is a valid command"
     shift 2