14807: Accept .../instances/_/drain?instance_id=X.

Azure Instance IDs contain slashes, so they don't work well as path
parameters.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go
index b7ea15933b0d8c42aefd86993d1036fe0f39038d..814dba917faae2ac4ee8c5b45c00782501e3d02b 100644 (file)
--- a/lib/dispatchcloud/dispatcher.go
+++ b/lib/dispatchcloud/dispatcher.go
@@ -212,6 +212,9 @@ func (disp *dispatcher) apiInstanceRun(w http.ResponseWriter, r *http.Request) {
 func (disp *dispatcher) apiInstanceIdleBehavior(w http.ResponseWriter, r *http.Request, want worker.IdleBehavior) {
        params, _ := r.Context().Value(httprouter.ParamsKey).(httprouter.Params)
        id := cloud.InstanceID(params.ByName("instance_id"))
+       if qp := r.FormValue("instance_id"); qp != "" {
+               id = cloud.InstanceID(qp)
+       }
        err := disp.pool.SetIdleBehavior(id, want)
        if err != nil {
                httpserver.Error(w, err.Error(), http.StatusNotFound)