From c054bd0939ef15ae4f3652100aeb0d09aec106e2 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@google.com>
Date: Fri, 8 Sep 2017 16:11:41 +0200
Subject: [PATCH] backend/remote-state/gcs: Rename "gcloud" to "gcs" for
 backwards compatibility.

---
 backend/init/init.go                                  | 4 ++--
 backend/remote-state/{gcloud => gcs}/backend.go       | 4 ++--
 backend/remote-state/{gcloud => gcs}/backend_state.go | 2 +-
 backend/remote-state/{gcloud => gcs}/backend_test.go  | 2 +-
 backend/remote-state/{gcloud => gcs}/client.go        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename backend/remote-state/{gcloud => gcs}/backend.go (96%)
 rename backend/remote-state/{gcloud => gcs}/backend_state.go (99%)
 rename backend/remote-state/{gcloud => gcs}/backend_test.go (98%)
 rename backend/remote-state/{gcloud => gcs}/client.go (99%)

diff --git a/backend/init/init.go b/backend/init/init.go
index 5684182394..3162122ba8 100644
--- a/backend/init/init.go
+++ b/backend/init/init.go
@@ -14,7 +14,7 @@ import (
 	backendAzure "github.com/hashicorp/terraform/backend/remote-state/azure"
 	backendconsul "github.com/hashicorp/terraform/backend/remote-state/consul"
 	backendetcdv3 "github.com/hashicorp/terraform/backend/remote-state/etcdv3"
-	backendGCloud "github.com/hashicorp/terraform/backend/remote-state/gcloud"
+	backendGCS "github.com/hashicorp/terraform/backend/remote-state/gcs"
 	backendinmem "github.com/hashicorp/terraform/backend/remote-state/inmem"
 	backendS3 "github.com/hashicorp/terraform/backend/remote-state/s3"
 	backendSwift "github.com/hashicorp/terraform/backend/remote-state/swift"
@@ -48,7 +48,7 @@ func init() {
 			`Warning: "azure" name is deprecated, please use "azurerm"`),
 		"azurerm": func() backend.Backend { return backendAzure.New() },
 		"etcdv3":  func() backend.Backend { return backendetcdv3.New() },
-		"gcloud":  func() backend.Backend { return backendGCloud.New() },
+		"gcs":     func() backend.Backend { return backendGCS.New() },
 	}
 
 	// Add the legacy remote backends that haven't yet been convertd to
diff --git a/backend/remote-state/gcloud/backend.go b/backend/remote-state/gcs/backend.go
similarity index 96%
rename from backend/remote-state/gcloud/backend.go
rename to backend/remote-state/gcs/backend.go
index ecfad13a33..57bee6c402 100644
--- a/backend/remote-state/gcloud/backend.go
+++ b/backend/remote-state/gcs/backend.go
@@ -1,5 +1,5 @@
-// Package gcloud implements remote storage of state on Google Cloud Storage (GCS).
-package gcloud
+// Package gcs implements remote storage of state on Google Cloud Storage (GCS).
+package gcs
 
 import (
 	"context"
diff --git a/backend/remote-state/gcloud/backend_state.go b/backend/remote-state/gcs/backend_state.go
similarity index 99%
rename from backend/remote-state/gcloud/backend_state.go
rename to backend/remote-state/gcs/backend_state.go
index 38ec7e2d6d..510ba09143 100644
--- a/backend/remote-state/gcloud/backend_state.go
+++ b/backend/remote-state/gcs/backend_state.go
@@ -1,4 +1,4 @@
-package gcloud
+package gcs
 
 import (
 	"fmt"
diff --git a/backend/remote-state/gcloud/backend_test.go b/backend/remote-state/gcs/backend_test.go
similarity index 98%
rename from backend/remote-state/gcloud/backend_test.go
rename to backend/remote-state/gcs/backend_test.go
index c86a5375fb..4bc8d6b1db 100644
--- a/backend/remote-state/gcloud/backend_test.go
+++ b/backend/remote-state/gcs/backend_test.go
@@ -1,4 +1,4 @@
-package gcloud
+package gcs
 
 import (
 	"testing"
diff --git a/backend/remote-state/gcloud/client.go b/backend/remote-state/gcs/client.go
similarity index 99%
rename from backend/remote-state/gcloud/client.go
rename to backend/remote-state/gcs/client.go
index d1eb42d6c1..a392c969f9 100644
--- a/backend/remote-state/gcloud/client.go
+++ b/backend/remote-state/gcs/client.go
@@ -1,4 +1,4 @@
-package gcloud
+package gcs
 
 import (
 	"encoding/json"