commit 6a12af6ee2c000e869b1b3c6591d2364e6fbefe9
author Brad Fitzpatrick <bradfitz@golang.org> Sun Jul 19 10:26:22 2015 -0700
committer Brad Fitzpatrick <bradfitz@golang.org> Mon Jul 20 00:31:48 2015 +0000
tree 98486c57834b8272c12defcbeb7c3fde6023d019
parent 2f8733f50c8466666d77987186a8cdd8185449ca

cmd/gomote: remove the old create-VMs-directly model; always use coordinator

Fixes golang/go#11711

Change-Id: I1c05de286393a610b74595f57487ebd341b6e599
Reviewed-on: https://go-review.googlesource.com/12393
Reviewed-by: Andrew Gerrand <adg@golang.org>

cmd/gomote/create.go

diff --git a/cmd/gomote/create.go b/cmd/gomote/create.go
index e30980f..08badf2 100644
--- a/cmd/gomote/create.go
+++ b/cmd/gomote/create.go
@@ -7,13 +7,10 @@
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"sort"
 	"strings"
-	"time"
 
-	"golang.org/x/build/buildlet"
 	"golang.org/x/build/dashboard"
 )
 
@@ -37,8 +34,10 @@
 		}
 		os.Exit(1)
 	}
-	var timeout time.Duration
-	fs.DurationVar(&timeout, "timeout", 60*time.Minute, "how long the VM will live before being deleted.")
+	// TODO(bradfitz): restore this option, and send it to the coordinator:
+	// For now, comment it out so it's not misleading.
+	// var timeout time.Duration
+	// fs.DurationVar(&timeout, "timeout", 60*time.Minute, "how long the VM will live before being deleted.")
 
 	fs.Parse(args)
 	if fs.NArg() != 1 {
@@ -63,36 +62,11 @@
 		}
 	}
 
-	if *user == "" {
-		instPrefix := fmt.Sprintf("mote-%s-", username())
-		instName, err := nextName(instPrefix + builderType)
-		if err != nil {
-			return err
-		}
-		client, err := buildlet.StartNewVM(projTokenSource(), instName, builderType, buildlet.VMOpts{
-			Zone:        *zone,
-			ProjectID:   *proj,
-			TLS:         userKeyPair(),
-			DeleteIn:    timeout,
-			Description: fmt.Sprintf("gomote buildlet for %s", username()),
-			OnInstanceRequested: func() {
-				log.Printf("Sent create request. Waiting for operation.")
-			},
-			OnInstanceCreated: func() {
-				log.Printf("Instance created.")
-			},
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create VM: %v", err)
-		}
-		fmt.Printf("%s\t%s\n", strings.TrimPrefix(instName, instPrefix), client.URL())
-	} else {
-		cc := coordinatorClient()
-		client, err := cc.CreateBuildlet(builderType)
-		if err != nil {
-			return fmt.Errorf("failed to create buildlet: %v", err)
-		}
-		fmt.Println(client.RemoteName())
+	cc := coordinatorClient()
+	client, err := cc.CreateBuildlet(builderType)
+	if err != nil {
+		return fmt.Errorf("failed to create buildlet: %v", err)
 	}
+	fmt.Println(client.RemoteName())
 	return nil
 }