Add commands for deleting and importing analytics searches

Author: svrnm

USAGE.md

@@ -96,9 +96,10 @@ These commands allow you to import and export email/http saved analytics searche
 
 | Command | Description | Example |
 | ------- | ----------- | ------- |
-| get | Get an analytics search by id. Provide the id as parameter (-i) | `act.sh analyticssearch get -i 6` |
-| list | List all analytics searches. This command requires no further arguments | `act.sh analyticssearch list ` |
-| import | Import an analytics search. Provide a json file as parameter. | `act.sh analyticssearch import search.json` |
+| delete | Delete an analytics search by id. Provide the id as parameter (-i). | `act.sh analyticssearch delete -i 6` |
+| get | Get an analytics search by id. Provide the id as parameter (-i). | `act.sh analyticssearch get -i 6` |
+| import | Import an analytics search. Provide a json string or a file (with @ as prefix) as parameter (-d). | `act.sh analyticssearch import -d search.json` |
+| list | List all analytics searches. This command requires no further arguments. | `act.sh analyticssearch list ` |
 
 
 ## application

act.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 ACT_VERSION="v0.5.0"
-ACT_LAST_COMMIT="5a6d252f76898b17bc683271831c6e1ff8d4bc83"
+ACT_LAST_COMMIT="6630a07da02f01b8a872b194aba2f3927ef35c8d"
 USER_CONFIG="$HOME/.appdynamics/act/config.sh"
 GLOBAL_CONFIG="/etc/appdynamics/act/config.sh"
 CONFIG_CONTROLLER_COOKIE_LOCATION="/tmp/appdynamics-controller-cookie.txt"
@@ -103,10 +103,14 @@ rde analyticsschema_list "List all analytics schemas." "This command requires no
 doc analyticssearch << EOF
 These commands allow you to import and export email/http saved analytics searches.
 EOF
+analyticssearch_delete() { apiCall -X POST '/controller/restui/analyticsSavedSearches/deleteAnalyticsSavedSearch/{{i:analytics_search_id}}' "$@" ; }
+rde analyticssearch_delete "Delete an analytics search by id." "Provide the id as parameter (-i)." "-i 6"
 analyticssearch_get() { apiCall '/controller/restui/analyticsSavedSearches/getAnalyticsSavedSearchById/{{i:analytics_search_id}}' "$@" ; }
-rde analyticssearch_get "Get an analytics search by id." "Provide the id as parameter (-i)" "-i 6"
+rde analyticssearch_get "Get an analytics search by id." "Provide the id as parameter (-i)." "-i 6"
+analyticssearch_import() { apiCall -X POST -d '{{d:analytics_search}}' '/controller/restui/analyticsSavedSearches/createAnalyticsSavedSearch' "$@" ; }
+rde analyticssearch_import "Import an analytics search." "Provide a json string or a file (with @ as prefix) as parameter (-d)." "-d search.json"
 analyticssearch_list() { apiCall '/controller/restui/analyticsSavedSearches/getAllAnalyticsSavedSearches' "$@" ; }
-rde analyticssearch_list "List all analytics searches." "This command requires no further arguments" ""
+rde analyticssearch_list "List all analytics searches." "This command requires no further arguments." ""
 doc application << EOF
 The applications API lets you retrieve information about the monitored environment as modeled in AppDynamics.
 EOF
@@ -1490,33 +1494,6 @@ EOF
 example event_list << EOF
 -a 15 -t BEFORE_NOW -d 60 -s ALL -e ALL
 EOF
-analyticssearch_import() {
-  FILE="$*"
-  if [ -r "${FILE}" ] ; then
-    DATA="$(<${FILE})"
-    regex='("id" *: *[0-9]+,)'
-    if [[ ${DATA} =~ $regex ]]; then
-      DATA=${DATA/${BASH_REMATCH[0]}/}
-    fi
-    if [[ $DATA == '['* ]]
-    then
-      COMMAND_RESULT=""
-      error "File contains multiple saved searches. Please provide only a single element."
-    else
-      controller_call -X POST -d "${DATA}" '/controller/restui/analyticsSavedSearches/createAnalyticsSavedSearch'
-    fi
-  else
-    COMMAND_RESULT=""
-    error "File not found or not readable: $FILE"
-  fi
-}
-register analyticssearch_import Import an analytics search. Provide a json file as parameter.
-describe analyticssearch_import << EOF
-Import an analytics search. Provide a json file as parameter.
-EOF
-example analyticssearch_import << EOF
-search.json
-EOF
 recursiveSource() {
   if [ -d "$*" ]; then
     debug "Sourcing plugins from $*"

commands.yml

@@ -101,16 +101,29 @@ analyticssearch:
   description: These commands allow you to import and export email/http saved analytics searches.
   get:
     title: Get an analytics search by id.
-    description: Provide the id as parameter (-i)
+    description: Provide the id as parameter (-i).
     example: -i 6
     method: GET
     endpoint: /controller/restui/analyticsSavedSearches/getAnalyticsSavedSearchById/{{i:analytics_search_id}}
   list:
     title: List all analytics searches.
-    description: This command requires no further arguments
+    description: This command requires no further arguments.
     example:
     method: GET
     endpoint: /controller/restui/analyticsSavedSearches/getAllAnalyticsSavedSearches
+  delete:
+    title: Delete an analytics search by id.
+    description: Provide the id as parameter (-i).
+    example: -i 6
+    method: POST
+    endpoint: /controller/restui/analyticsSavedSearches/deleteAnalyticsSavedSearch/{{i:analytics_search_id}}
+  import:
+    title: Import an analytics search.
+    description: Provide a json string or a file (with @ as prefix) as parameter (-d).
+    example: -d search.json
+    method: POST
+    endpoint: /controller/restui/analyticsSavedSearches/createAnalyticsSavedSearch
+    payload: {{d:analytics_search}}
 analyticsmetric:
   title: Analytics metrics
   description: Manage custom analytics metrics

commands/analyticssearch/import.sh

@@ -299,6 +299,36 @@
             "description": "This command requires no further arguments"
 					}
 				}]},{"name": "analyticssearch","item": [{
+					"name": "Delete an analytics search by id.",
+					"request": {
+						"method": "POST",
+						"header": [
+              {
+								"key": "Content-Type",
+								"value": "application/json;charset=UTF-8",
+								"type": "text"
+							},
+              {
+								"key": "X-CSRF-TOKEN",
+								"value": "{{X-CSRF-TOKEN}}",
+								"type": "text"
+							}
+            ],
+						"body": {
+							"mode": "raw",
+							"raw": ""
+						},
+						"url": {
+							"raw": "{{controller_host}}/controller/restui/analyticsSavedSearches/deleteAnalyticsSavedSearch/{{i:analytics_search_id}}",
+              "host": [
+								"{{controller_host}}"
+							],
+							"path": ["controller","restui","analyticsSavedSearches","deleteAnalyticsSavedSearch","{{analytics_search_id}}"],
+              "query": []
+						},
+            "description": "Provide the id as parameter (-i)."
+					}
+				},{
 					"name": "Get an analytics search by id.",
 					"request": {
 						"method": "GET",
@@ -326,7 +356,37 @@
 							"path": ["controller","restui","analyticsSavedSearches","getAnalyticsSavedSearchById","{{analytics_search_id}}"],
               "query": []
 						},
-            "description": "Provide the id as parameter (-i)"
+            "description": "Provide the id as parameter (-i)."
+					}
+				},{
+					"name": "Import an analytics search.",
+					"request": {
+						"method": "POST",
+						"header": [
+              {
+								"key": "Content-Type",
+								"value": "application/json;charset=UTF-8",
+								"type": "text"
+							},
+              {
+								"key": "X-CSRF-TOKEN",
+								"value": "{{X-CSRF-TOKEN}}",
+								"type": "text"
+							}
+            ],
+						"body": {
+							"mode": "raw",
+							"raw": "{{analytics_search}}"
+						},
+						"url": {
+							"raw": "{{controller_host}}/controller/restui/analyticsSavedSearches/createAnalyticsSavedSearch",
+              "host": [
+								"{{controller_host}}"
+							],
+							"path": ["controller","restui","analyticsSavedSearches","createAnalyticsSavedSearch"],
+              "query": []
+						},
+            "description": "Provide a json string or a file (with @ as prefix) as parameter (-d)."
 					}
 				},{
 					"name": "List all analytics searches.",
@@ -356,7 +416,7 @@
 							"path": ["controller","restui","analyticsSavedSearches","getAllAnalyticsSavedSearches"],
               "query": []
 						},
-            "description": "This command requires no further arguments"
+            "description": "This command requires no further arguments."
 					}
 				}]},{"name": "application","item": [{
 					"name": "Create a new application.",