remote: Rename mas to azure (#7114)

MAS wasn't obvious it was Azure so renamed it to Azure

state/remote/azure.go

@@ -12,7 +12,7 @@ import (
 	riviera "github.com/jen20/riviera/azure"
 )
 
-func masFactory(conf map[string]string) (Client, error) {
+func azureFactory(conf map[string]string) (Client, error) {
 	storageAccountName, ok := conf["storage_account_name"]
 	if !ok {
 		return nil, fmt.Errorf("missing 'storage_account_name' configuration")
@@ -47,7 +47,7 @@ func masFactory(conf map[string]string) (Client, error) {
 
 	blobClient := storageClient.GetBlobService()
 
-	return &MASClient{
+	return &AzureClient{
 		blobClient:    &blobClient,
 		containerName: containerName,
 		keyName:       keyName,
@@ -125,13 +125,13 @@ func confOrEnv(conf map[string]string, confKey, envVar string) (string, bool) {
 	return value, value != ""
 }
 
-type MASClient struct {
+type AzureClient struct {
 	blobClient    *mainStorage.BlobStorageClient
 	containerName string
 	keyName       string
 }
 
-func (c *MASClient) Get() (*Payload, error) {
+func (c *AzureClient) Get() (*Payload, error) {
 	blob, err := c.blobClient.GetBlob(c.containerName, c.keyName)
 	if err != nil {
 		if storErr, ok := err.(mainStorage.AzureStorageServiceError); ok {
@@ -161,7 +161,7 @@ func (c *MASClient) Get() (*Payload, error) {
 	return payload, nil
 }
 
-func (c *MASClient) Put(data []byte) error {
+func (c *AzureClient) Put(data []byte) error {
 	return c.blobClient.CreateBlockBlobFromReader(
 		c.containerName,
 		c.keyName,
@@ -173,6 +173,6 @@ func (c *MASClient) Put(data []byte) error {
 	)
 }
 
-func (c *MASClient) Delete() error {
+func (c *AzureClient) Delete() error {
 	return c.blobClient.DeleteBlob(c.containerName, c.keyName, nil)
 }

state/remote/azure_test.go

@@ -12,13 +12,13 @@ import (
 	"github.com/jen20/riviera/storage"
 )
 
-func TestMASClient_impl(t *testing.T) {
+func TestAzureClient_impl(t *testing.T) {
-	var _ Client = new(MASClient)
+	var _ Client = new(AzureClient)
 }
 
-func TestMASClient(t *testing.T) {
+func TestAzureClient(t *testing.T) {
-	// This test creates a bucket in MAS and populates it.
+	// This test creates a bucket in Azure and populates it.
-	// It may incur costs, so it will only run if MAS credential environment
+	// It may incur costs, so it will only run if Azure credential environment
 	// variables are present.
 
 	config := map[string]string{
@@ -42,7 +42,7 @@ func TestMASClient(t *testing.T) {
 	setup(t, config)
 	defer teardown(t, config)
 
-	client, err := masFactory(config)
+	client, err := azureFactory(config)
 	if err != nil {
 		t.Fatalf("Error for valid config: %v", err)
 	}

state/remote/remote.go

@@ -37,11 +37,11 @@ func NewClient(t string, conf map[string]string) (Client, error) {
 // NewClient.
 var BuiltinClients = map[string]Factory{
 	"atlas":       atlasFactory,
+	"azure":       azureFactory,
 	"consul":      consulFactory,
 	"etcd":        etcdFactory,
 	"gcs":         gcsFactory,
 	"http":        httpFactory,
-	"mas":         masFactory,
 	"s3":          s3Factory,
 	"swift":       swiftFactory,
 	"artifactory": artifactoryFactory,

website/source/docs/state/remote/azure.html.md

@@ -1,12 +1,12 @@
 ---
 layout: "remotestate"
-page_title: "Remote State Backend: mas"
+page_title: "Remote State Backend: azure"
-sidebar_current: "docs-state-remote-mas"
+sidebar_current: "docs-state-remote-azure"
 description: |-
   Terraform can store the state remotely, making it easier to version and work with in a team.
 ---
 
-# mas
+# azure
 
 Stores the state as a given key in a given bucket on [Microsoft Azure Storage](https://azure.microsoft.com/en-us/documentation/articles/storage-introduction/).
 
@@ -18,7 +18,7 @@ Use of environment variables or config file is recommended.
 
 ```
 terraform remote config \
-  -backend=mas \
+  -backend=azure \
   -backend-config="storage_account_name=terraform123abc" \
   -backend-config="container_name=terraform-state" \
   -backend-config="key=prod.terraform.tfstate"
@@ -29,7 +29,7 @@ terraform remote config \
 ```hcl
 # setup remote state data source
 data "terraform_remote_state" "foo" {
-  backend = "mas"
+  backend = "azure"
   config {
     storage_account_name = "terraform123abc"
     container_name       = "terraform-state"

website/source/layouts/remotestate.erb

@@ -16,12 +16,12 @@
                 <li<%= sidebar_current("docs-state-remote-artifactory") %>>
                   <a href="/docs/state/remote/artifactory.html">artifactory</a>
                 </li>
-						<li<%= sidebar_current("docs-state-remote-mas") %>>
-							<a href="/docs/state/remote/mas.html">mas</a>
-						</li>
                 <li<%= sidebar_current("docs-state-remote-atlas") %>>
                   <a href="/docs/state/remote/atlas.html">atlas</a>
                 </li>
+                <li<%= sidebar_current("docs-state-remote-azure") %>>
+                  <a href="/docs/state/remote/azure.html">azure</a>
+                </li>
                 <li<%= sidebar_current("docs-state-remote-consul") %>>
                   <a href="/docs/state/remote/consul.html">consul</a>
                 </li>