Replace function with ()

Author: svrnm

USAGE.md

@@ -16,7 +16,7 @@ action:
   import:
     title: Import actions.
     description: Provide an application id or name as parameter (-a) and a json string or a file (with @ as prefix) as parameter (-d)
-    example: -a 15 -F @actions.json
+    example: -a 15 -d @actions.json
     method: POST
     endpoint: /controller/actions/{{a:application}}
     form: file={{d:actions}}
@@ -448,6 +448,12 @@ server:
     example: -i 244
     method: GET
     endpoint: /controller/sim/v2/user/machines/{{m:machine}}
+  list:
+    title: List all machines.
+    description: No additional argument required.
+    example:
+    method: GET
+    endpoint: /controller/sim/v2/user/machines
 snapshot:
   title: Snapshot API
   description: List APM snapshots.
@@ -474,6 +480,7 @@ synthetic:
     method: POST
     endpoint: /controller/restui/synthetic/schedule/{{a:application}}/updateSchedule
     payload: {{d:synthetic_job}}
+    expand: true
   snapshot:
     title: Generate synthetic snapshot.
     description: Provide an EUM application (-a), a brower (-b) and an URL (-u) as parameter.

act.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function actiontemplate_delete {
+actiontemplate_delete() {
   local TYPE="httprequest"
   local ID=0
   while getopts "t:i:" opt "$@";

commands.yml

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function actiontemplate_import {
+actiontemplate_import() {
   local FILE=""
   local TYPE="httprequest"
   while getopts "t:" opt "$@";

commands/actiontemplate/delete.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function actiontemplate_list {
+actiontemplate_list() {
   local TYPE="httprequest"
   while getopts "t:" opt "$@";
   do

commands/actiontemplate/import.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function analyticssearch_import {
+analyticssearch_import() {
   FILE="$*"
   if [ -r "${FILE}" ] ; then
     DATA="$(<${FILE})"

commands/actiontemplate/list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function _config {
+_config() {
   environment_add -d "$@"
 }
 

commands/analyticssearch/import.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function controller_call {
+controller_call() {
   debug "Calling $CONFIG_CONTROLLER_HOST"
   local METHOD="GET"
   local FORM=""

commands/config.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function controller_isup {
+controller_isup() {
   local START
   local END
   declare -i END

commands/controller/call.sh

@@ -2,7 +2,7 @@
 
 CONTROLLER_LOGIN_STATUS=0
 
-function controller_login {
+controller_login() {
   debug "Login at ${CONFIG_CONTROLLER_HOST} with ${CONFIG_CONTROLLER_CREDENTIALS}"
   LOGIN_RESPONSE=$(httpClient -sI -c "${CONFIG_CONTROLLER_COOKIE_LOCATION}" --user "${CONFIG_CONTROLLER_CREDENTIALS}" "${CONFIG_CONTROLLER_HOST}/controller/auth?action=login")
   debug "RESPONSE: ${LOGIN_RESPONSE}"

commands/controller/isup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function controller_ping {
+controller_ping() {
   debug "Ping $CONFIG_CONTROLLER_HOST"
   local PING_RESPONSE=$(httpClient -sI $CONFIG_CONTROLLER_HOST  -w "RESPONSE=%{http_code} TIME_TOTAL=%{time_total}")
   debug "RESPONSE: ${PING_RESPONSE}"

commands/controller/login.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function controller_version {
+controller_version() {
   controller_call -X GET /controller/rest/serverstatus
   COMMAND_RESULT=`echo -e $COMMAND_RESULT | sed -n -e 's/.*Controller v\(.*\) Build.*/\1/p'`
 }

commands/controller/ping.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function dbmon_create {
+dbmon_create() {
   apiCall -X POST -d "{ \
                       \"name\": \"{{i}}\",\
                       \"username\": \"{{u}}\",\

commands/controller/version.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function dbmon_events {
+dbmon_events() {
   event_list -a '_dbmon' "$@"
 }
 

commands/dbmon/create.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function _doc {
+_doc() {
 read -r -d '' COMMAND_RESULT <<- EOM
 # Usage
 Below you will find a list of all available namespaces and commands available with

commands/dbmon/events.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function download_get {
+download_get() {
   local WORKING_DIRECTORY="."
   local DOWNLOAD_DRYRUN=0
   local DOWNLOAD_ALL_MATCHES=1
@@ -55,7 +55,7 @@ function download_get {
           output "Dry run."
         fi
       done
-      COMMAND_RESULT="Successfully downloaded `basename ${FILE}` to ${WORKING_DIRECTORY}"
+      COMMAND_RESULT="Successfully downloaded $(bashBasename ${FILE}) to ${WORKING_DIRECTORY}"
       cd "${OLD_DIRECTORY}" || exit
     fi
   else

commands/doc.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function download_list {
+download_list() {
   local FILES
   local DELIMITER='"filename":'
   local ENTRY
@@ -25,7 +25,7 @@ function download_list {
   output "Downloading list of available files. Please wait."
   FILES=$(httpClient -s https://download.appdynamics.com/download/downloadfilelatest/)
   #delimiter='"download_path":'
-  s=$FILES${DELIMITER}
+  local s=$FILES${DELIMITER}
   COMMAND_RESULT=""
   while [[ $s ]]; do
     ENTRY="${s%%"${DELIMITER}"*}\n\n"

commands/download/get.sh

@@ -2,7 +2,7 @@
 PORTAL_LOGIN_STATUS=0
 PORTAL_LOGIN_TOKEN=""
 
-function download_login {
+download_login() {
   if [ -n "$CONFIG_PORTAL_CREDENTIALS" ] ; then
     USERNAME=${CONFIG_PORTAL_CREDENTIALS%%:*}
     PASSWORD=${CONFIG_PORTAL_CREDENTIALS#*:}

commands/download/list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function environment_add {
+environment_add() {
   local FORCE=0
   local GLOBAL=0
   local SHOW=0

commands/download/login.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function environment_delete {
+environment_delete() {
   rm "${HOME}/.appdynamics/act/config.$1.sh"
   COMMAND_RESULT="${1} deleted"
 }

commands/environment/add.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function environment_edit {
+environment_edit() {
   if [ -x "${EDITOR}" ] || [ -x "`which "${EDITOR}"`" ] ; then
     ${EDITOR} "${HOME}/.appdynamics/act/config.$1.sh"
   else

commands/environment/delete.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function environment_export {
+environment_export() {
   environment_source "${1}";
 
   local USER_AND_ACCOUNT="${CONFIG_CONTROLLER_CREDENTIALS%%:*}"

commands/environment/edit.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function environment_get {
+environment_get() {
   COMMAND_RESULT=`cat "${HOME}/.appdynamics/act/config.$1.sh"`
 }
 

commands/environment/export.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-function environment_list {
+environment_list() {
   local BASE
   local TEMP
   COMMAND_RESULT="(default)"
   for file in "${HOME}/.appdynamics/act/config."*".sh"
   do
-    BASE=`basename "${file}"`
+    BASE=$(bashBasename "${file}")
     TEMP=${BASE#*.}
     COMMAND_RESULT="${COMMAND_RESULT} ${TEMP%.*}"
   done

commands/environment/get.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function environment_source {
+environment_source() {
   if [ "$1" == "" ] ; then
     source "${HOME}/.appdynamics/act/config.sh"
   else

commands/environment/list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function eum_getapps {
+eum_getapps() {
   apiCall  "/controller/restui/eumApplications/getAllEumApplicationsData?time-range=last_1_hour.BEFORE_NOW.-1.-1.60"
 }
 

commands/environment/source.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function event_list {
+event_list() {
   # Add some "ALL" magic
   local PREV=""
   local ARGS=()

commands/eum/getapps.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function federation_setup {
+federation_setup() {
 
   local FRIEND_CONTROLLER_CREDENTIALS=""
   local FRIEND_CONTROLLER_HOST=""

commands/event/list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function healthrule_copy {
+healthrule_copy() {
   local SOURCE_APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local TARGET_APPLICATION=""
   local TARGET_ENVIRONMENT=""

commands/federation/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function healthrule_import {
+healthrule_import() {
   local APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local FILE=""
   while getopts "a:" opt "$@";

commands/healthrule/copy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function _help {
+_help() {
   if [ "$1" = "" ] ; then
     read -r -d '' COMMAND_RESULT <<- EOM
 Usage: ${USAGE_DESCRIPTION}${EOL}

commands/healthrule/import.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function metric_get {
+metric_get() {
   local APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local START_TIME=-1
   local END_TIME=-1

commands/help.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function metric_list {
+metric_list() {
   local APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local METRIC_PATH=""
   while getopts "a:" opt "$@";

commands/metric/get.sh

@@ -2,7 +2,7 @@
 
 RECURSIVE_COMMAND_RESULT=""
 
-function metric_tree {
+metric_tree() {
   local APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local DEPTH=0
   declare -i DEPTH

commands/metric/list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function timerange_create {
+timerange_create() {
   local START_TIME=-1
   local END_TIME=-1
   local DURATION_IN_MINUTES=0

commands/metric/tree.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function timerange_delete {
+timerange_delete() {
   local TIMERANGE_ID=$*
   if [[ $TIMERANGE_ID =~ ^[0-9]+$ ]]; then
     controller_call -X POST -d "$TIMERANGE_ID" /controller/restui/user/deleteCustomRange

commands/server/list.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function timerange_list {
+timerange_list() {
   controller_call -X GET /controller/restui/user/getAllCustomTimeRanges
 }
 

commands/timerange/create.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function _usage {
+_usage() {
     # shellcheck disable=SC2034
     read -r -d '' COMMAND_RESULT <<- EOM
 Usage: ${USAGE_DESCRIPTION}${EOL}

commands/timerange/delete.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function _version {
+_version() {
   # shellcheck disable=SC2034
   COMMAND_RESULT="$ACT_VERSION ~ $ACT_LAST_COMMIT (${GLOBAL_COMMANDS_COUNTER} commands)"
 }