changes rampage API to JSON payload

dcos-labs · Jun 13, 2016 · f9eedb5 · f9eedb5
1 parent 10e9610
commit f9eedb5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -80,6 +80,18 @@ To test it locally, run:
 
     $ MARATHON_URL=http://localhost:8080 drax
 
-And invoke like so (to destroy tasks of app `/dummy`)
+And invoke like so (to destroy tasks of app `/dummy`):
+
+    $ cat rp.json
+    {
+     "level" : "1",
+     "app" : "dummy"
+    }
+    $ http POST localhost:7777/rampage < rp.json
+    HTTP/1.1 200 OK
+    Content-Length: 117
+    Content-Type: application/javascript
+    Date: Mon, 13 Jun 2016 13:05:31 GMT
+
+    {"success":true,"goners":["dummy.59dca877-3165-11e6-aad0-1e9bbbc1653f","dummy.e96ffce3-3164-11e6-aad0-1e9bbbc1653f"]}
 
-    $ http -f POST localhost:7777/rampage -- level=1 app=dummy
diff --git a/api.go b/api.go
@@ -18,16 +18,19 @@ type NOUN_Stats struct{}
 type NOUN_Rampage struct{}
 
 // JSON payloads
+type RampageParams struct {
+	Level string `json:"level"`
+	AppID string `json:"app"`
+}
 type StatsResult struct {
 	TasksKilled uint64 `json:"gone"`
 }
-
 type RampageResult struct {
 	Success  bool     `json:"success"`
 	TaskList []string `json:"goners"`
 }
 
-// Handles /stats API calls
+// Handles /stats API calls (GET only)
 func (n NOUN_Stats) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	log.WithFields(log.Fields{"handle": "/stats"}).Info("Reporting on runtime statistics ...")
 	// extract $RUNS parameter from /stats?runs=$RUNS in the following:
@@ -45,14 +48,18 @@ func (n NOUN_Stats) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprint(w, string(jsonsr))
 }
 
-// Handles /rampage API calls
+// Handles /rampage API calls (POST only)
 func (n NOUN_Rampage) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "POST" {
 		err := r.ParseForm()
 		if err != nil {
 			http.Error(w, "Can't parse rampage params", 500)
 		} else {
-			levelParam := r.Form.Get("level")
+			ok, rp := parseRampageParams(r)
+			if !ok {
+				http.Error(w, "Can't decode rampage params", 500)
+			}
+			levelParam := rp.Level
 			if levelParam != "" {
 				log.WithFields(log.Fields{"handle": "/rampage"}).Info("Got level param ", levelParam)
 				if level, err := strconv.Atoi(levelParam); err == nil {
@@ -64,7 +71,7 @@ func (n NOUN_Rampage) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			case DL_BASIC:
 				killTasks(w, r)
 			case DL_ADVANCED:
-				appParam := r.Form.Get("app")
+				appParam := rp.AppID
 				if appParam != "" {
 					log.WithFields(log.Fields{"handle": "/rampage"}).Info("Got app param ", appParam)
 					killTasksOfApp(w, r, appParam)
@@ -83,6 +90,18 @@ func (n NOUN_Rampage) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// parseRampageParams parses the parameters for a rampage from an HTTP request
+func parseRampageParams(r *http.Request) (bool, *RampageParams) {
+	decoder := json.NewDecoder(r.Body)
+	rp := &RampageParams{}
+	err := decoder.Decode(rp)
+	if err != nil {
+		return false, nil
+	} else {
+		return true, rp
+	}
+}
+
 // killTasks will identify tasks of any apps (but not framework services)
 // and randomly kill off a few of them
 func killTasks(w http.ResponseWriter, r *http.Request) {