Add App Engine Application support

google/appengine_operation.go

@@ -0,0 +1,83 @@
+package google
+
+import (
+	"fmt"
+	"log"
+	"regexp"
+	"strconv"
+	"time"
+
+	"github.com/hashicorp/terraform/helper/resource"
+
+	"google.golang.org/api/appengine/v1"
+)
+
+var (
+	appEngineOperationIdRegexp = regexp.MustCompile(fmt.Sprintf("apps/%s/operations/(.*)", ProjectRegex))
+)
+
+type AppEngineOperationWaiter struct {
+	Service *appengine.APIService
+	Op      *appengine.Operation
+	AppId   string
+}
+
+func (w *AppEngineOperationWaiter) RefreshFunc() resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		matches := appEngineOperationIdRegexp.FindStringSubmatch(w.Op.Name)
+		if len(matches) != 2 {
+			return nil, "", fmt.Errorf("Expected %d results of parsing operation name, got %d from %s", 2, len(matches), w.Op.Name)
+		}
+		op, err := w.Service.Apps.Operations.Get(w.AppId, matches[1]).Do()
+		if err != nil {
+			return nil, "", err
+		}
+
+		log.Printf("[DEBUG] Got %v when asking for operation %q", op.Done, w.Op.Name)
+		return op, strconv.FormatBool(op.Done), nil
+	}
+}
+
+func (w *AppEngineOperationWaiter) Conf() *resource.StateChangeConf {
+	return &resource.StateChangeConf{
+		Pending: []string{"false"},
+		Target:  []string{"true"},
+		Refresh: w.RefreshFunc(),
+	}
+}
+
+// AppEngineOperationError wraps appengine.Status and implements the
+// error interface so it can be returned.
+type AppEngineOperationError appengine.Status
+
+func (e AppEngineOperationError) Error() string {
+	return e.Message
+}
+
+func appEngineOperationWait(client *appengine.APIService, op *appengine.Operation, appId, activity string) error {
+	return appEngineOperationWaitTime(client, op, appId, activity, 4)
+}
+
+func appEngineOperationWaitTime(client *appengine.APIService, op *appengine.Operation, appId, activity string, timeoutMin int) error {
+	w := &AppEngineOperationWaiter{
+		Service: client,
+		Op:      op,
+		AppId:   appId,
+	}
+
+	state := w.Conf()
+	state.Delay = 10 * time.Second
+	state.Timeout = time.Duration(timeoutMin) * time.Minute
+	state.MinTimeout = 2 * time.Second
+	opRaw, err := state.WaitForState()
+	if err != nil {
+		return fmt.Errorf("Error waiting for %s: %s", activity, err)
+	}
+
+	resultOp := opRaw.(*appengine.Operation)
+	if resultOp.Error != nil {
+		return AppEngineOperationError(*resultOp.Error)
+	}
+
+	return nil
+}

google/config.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/jwt"
+	appengine "google.golang.org/api/appengine/v1"
 	"google.golang.org/api/bigquery/v2"
 	"google.golang.org/api/cloudbilling/v1"
 	"google.golang.org/api/cloudfunctions/v1"
@@ -76,6 +77,7 @@ type Config struct {
 	clientBigQuery               *bigquery.Service
 	clientCloudFunctions         *cloudfunctions.Service
 	clientCloudIoT               *cloudiot.Service
+	clientAppEngine              *appengine.APIService
 
 	bigtableClientFactory *BigtableClientFactory
 }
@@ -315,6 +317,13 @@ func (c *Config) loadAndValidate() error {
 	}
 	c.clientCloudIoT.UserAgent = userAgent
 
+	log.Printf("[INFO] Instantiating App Engine Client...")
+	c.clientAppEngine, err = appengine.New(client)
+	if err != nil {
+		return err
+	}
+	c.clientAppEngine.UserAgent = userAgent
+
 	return nil
 }