DeleteHosts should wait for the operation result

Author: 0405ysj

pkg/client/client.go

@@ -158,7 +158,15 @@ func (c *clientImpl) DeleteHosts(names []string) error {
 		wg.Add(1)
 		go func(name string) {
 			defer wg.Done()
-			if err := c.httpHelper.NewDeleteRequest("/hosts/" + name).JSONResDo(nil); err != nil {
+			var op apiv1.Operation
+			if err := c.httpHelper.NewDeleteRequest("/hosts/" + name).JSONResDo(&op); err != nil {
+				mu.Lock()
+				defer mu.Unlock()
+				merr = multierror.Append(merr, fmt.Errorf("delete host %q failed: %w", name, err))
+				return
+			}
+			ins := &apiv1.HostInstance{}
+			if err := c.waitForOperation(&op, ins); err != nil {
 				mu.Lock()
 				defer mu.Unlock()
 				merr = multierror.Append(merr, fmt.Errorf("delete host %q failed: %w", name, err))

pkg/client/client_test.go

@@ -19,7 +19,6 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
-	"regexp"
 	"testing"
 
 	apiv1 "github.com/google/cloud-android-orchestration/api/v1"
@@ -28,19 +27,17 @@ import (
 )
 
 func TestDeleteHosts(t *testing.T) {
-	existingNames := map[string]struct{}{"bar": {}, "baz": {}}
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "DELETE" {
-			panic("unexpected method: " + r.Method)
-		}
-		re := regexp.MustCompile(`^/hosts/(.*)$`)
-		matches := re.FindStringSubmatch(r.URL.Path)
-		if len(matches) != 2 {
-			panic("unexpected path: " + r.URL.Path)
-		}
-		if _, ok := existingNames[matches[1]]; ok {
-			writeOK(w, "")
-		} else {
+		switch ep := r.Method + " " + r.URL.Path; ep {
+		case "DELETE /hosts/bar":
+			writeOK(w, apiv1.Operation{Name: "deletingbar"})
+		case "DELETE /hosts/baz":
+			writeOK(w, apiv1.Operation{Name: "deletingbaz"})
+		case "POST /operations/deletingbar/:wait":
+			writeOK(w, apiv1.HostInstance{Name: "bar"})
+		case "POST /operations/deletingbaz/:wait":
+			writeOK(w, apiv1.HostInstance{Name: "baz"})
+		default:
 			writeErr(w, 404)
 		}
 	}))