Merge remote-tracking branch 'upstream/master' into b-aws-sg-rule-self

* upstream/master:
  Correct syntax error in group membership test.
  Add beta compute client

builtin/providers/aws/resource_aws_iam_group_membership_test.go

@@ -59,7 +59,7 @@ func testAccCheckAWSGroupMembershipDestroy(s *terraform.State) error {
 		for _, u := range resp.Users {
 			for _, i := range users {
 				if i == *u.UserName {
-					return fmt.Errorf("Error: User (s) still a member of Group (%s)", i, *resp.Group.GroupName)
+					return fmt.Errorf("Error: User (%s) still a member of Group (%s)", i, *resp.Group.GroupName)
 				}
 			}
 		}

builtin/providers/google/config.go

@@ -14,6 +14,7 @@ import (
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/jwt"
 	"google.golang.org/api/compute/v1"
+	computeBeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/dns/v1"
 	"google.golang.org/api/storage/v1"
 )
@@ -26,6 +27,7 @@ type Config struct {
 	Region      string
 
 	clientCompute *compute.Service
+	clientComputeBeta *computeBeta.Service
 	clientDns     *dns.Service
 	clientStorage *storage.Service
 }
@@ -110,6 +112,13 @@ func (c *Config) loadAndValidate() error {
 	}
 	c.clientCompute.UserAgent = userAgent
 
+	log.Printf("[INFO] Instantiating Beta GCE client...")
+	c.clientComputeBeta, err = computeBeta.New(client)
+	if err != nil {
+		return err
+	}
+	c.clientComputeBeta.UserAgent = userAgent
+
 	log.Printf("[INFO] Instantiating Google Cloud DNS client...")
 	c.clientDns, err = dns.New(client)
 	if err != nil {