From b09f121f8629caac67db3726699341a63e35eac5 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@google.com>
Date: Mon, 11 Sep 2017 15:40:51 +0200
Subject: [PATCH] state/remote: The "gcs" client has been superseeded by the
 "gcs" backend.

---
 state/remote/gcs_test.go | 69 ----------------------------------------
 state/remote/remote.go   |  1 -
 2 files changed, 70 deletions(-)
 delete mode 100644 state/remote/gcs_test.go

diff --git a/state/remote/gcs_test.go b/state/remote/gcs_test.go
deleted file mode 100644
index 402093917..000000000
--- a/state/remote/gcs_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package remote
-
-import (
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	storage "google.golang.org/api/storage/v1"
-)
-
-func TestGCSClient_impl(t *testing.T) {
-	var _ Client = new(GCSClient)
-}
-
-func TestGCSClient(t *testing.T) {
-	// This test creates a bucket in GCS and populates it.
-	// It may incur costs, so it will only run if GCS credential environment
-	// variables are present.
-
-	projectID := os.Getenv("GOOGLE_PROJECT")
-	if projectID == "" {
-		t.Skipf("skipping; GOOGLE_PROJECT must be set")
-	}
-
-	bucketName := fmt.Sprintf("terraform-remote-gcs-test-%x", time.Now().Unix())
-	keyName := "testState"
-	testData := []byte(`testing data`)
-
-	config := make(map[string]string)
-	config["bucket"] = bucketName
-	config["path"] = keyName
-
-	client, err := gcsFactory(config)
-	if err != nil {
-		t.Fatalf("Error for valid config: %v", err)
-	}
-
-	gcsClient := client.(*GCSClient)
-	nativeClient := gcsClient.clientStorage
-
-	// Be clear about what we're doing in case the user needs to clean
-	// this up later.
-	if _, err := nativeClient.Buckets.Get(bucketName).Do(); err == nil {
-		fmt.Printf("Bucket %s already exists - skipping buckets.insert call.", bucketName)
-	} else {
-		// Create a bucket.
-		if res, err := nativeClient.Buckets.Insert(projectID, &storage.Bucket{Name: bucketName}).Do(); err == nil {
-			fmt.Printf("Created bucket %v at location %v\n\n", res.Name, res.SelfLink)
-		} else {
-			t.Skipf("Failed to create test GCS bucket, so skipping")
-		}
-	}
-
-	// Ensure we can perform a PUT request with the encryption header
-	err = gcsClient.Put(testData)
-	if err != nil {
-		t.Logf("WARNING: Failed to send test data to GCS bucket. (error was %s)", err)
-	}
-
-	defer func() {
-		// Delete the test bucket in the project
-		if err := gcsClient.clientStorage.Buckets.Delete(bucketName).Do(); err != nil {
-			t.Logf("WARNING: Failed to delete the test GCS bucket. It has been left in your GCE account and may incur storage charges. (error was %s)", err)
-		}
-	}()
-
-	testClient(t, client)
-}
diff --git a/state/remote/remote.go b/state/remote/remote.go
index 132b77f70..15fcafbc6 100644
--- a/state/remote/remote.go
+++ b/state/remote/remote.go
@@ -47,7 +47,6 @@ func NewClient(t string, conf map[string]string) (Client, error) {
 var BuiltinClients = map[string]Factory{
 	"artifactory": artifactoryFactory,
 	"etcd":        etcdFactory,
-	"gcs":         gcsFactory,
 	"http":        httpFactory,
 	"local":       fileFactory,
 	"manta":       mantaFactory,