Skip to content

Commit

Permalink
remote: Rename mas to azure (#7114)
Browse files Browse the repository at this point in the history 
MAS wasn't obvious it was Azure so renamed it to Azure
  • Loading branch information
@stack72
stack72 authored Jun 10, 2016
1 parent 6be1e50 commit 32e1a32
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 60 deletions.
12 changes: 6 additions & 6 deletions state/remote/mas.go → state/remote/azure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand All @@ -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)
}
12 changes: 6 additions & 6 deletions state/remote/mas_test.go → state/remote/azure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"github.com/jen20/riviera/storage"
)

func TestMASClient_impl(t *testing.T) {
var _ Client = new(MASClient)
func TestAzureClient_impl(t *testing.T) {
var _ Client = new(AzureClient)
}

func TestMASClient(t *testing.T) {
// This test creates a bucket in MAS and populates it.
// It may incur costs, so it will only run if MAS credential environment
func TestAzureClient(t *testing.T) {
// This test creates a bucket in Azure and populates it.
// It may incur costs, so it will only run if Azure credential environment
// variables are present.

config := map[string]string{
Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion state/remote/remote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions website/source/docs/state/remote/mas.html.md → ...te/source/docs/state/remote/azure.html.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
layout: "remotestate"
page_title: "Remote State Backend: mas"
sidebar_current: "docs-state-remote-mas"
page_title: "Remote State Backend: azure"
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/).

Expand All @@ -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"
Expand All @@ -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"
Expand Down
84 changes: 42 additions & 42 deletions website/source/layouts/remotestate.erb
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
<% wrap_layout :inner do %>
<% content_for :sidebar do %>
<div class="docs-sidebar hidden-print affix-top" role="complementary">
<ul class="nav docs-sidenav">
<li<%= sidebar_current("docs-state") %>>
<a href="/docs/state/index.html">&laquo; Documentation Home</a>
</li>
<div class="docs-sidebar hidden-print affix-top" role="complementary">
<ul class="nav docs-sidenav">
<li<%= sidebar_current("docs-state") %>>
<a href="/docs/state/index.html">&laquo; Documentation Home</a>
</li>

<li<%= sidebar_current("docs-state-remote_index") %>>
<a href="/docs/state/remote/index.html">Remote State</a>
</li>
<li<%= sidebar_current("docs-state-remote_index") %>>
<a href="/docs/state/remote/index.html">Remote State</a>
</li>

<li<%= sidebar_current(/^docs-state-remote-/) %>>
<a href="#">Backends</a>
<ul class="nav nav-visible">
<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-consul") %>>
<a href="/docs/state/remote/consul.html">consul</a>
</li>
<li<%= sidebar_current("docs-state-remote-etcd") %>>
<a href="/docs/state/remote/etcd.html">etcd</a>
</li>
<li<%= sidebar_current("docs-state-remote-gcs") %>>
<a href="/docs/state/remote/gcs.html">gcs</a>
</li>
<li<%= sidebar_current("docs-state-remote-http") %>>
<a href="/docs/state/remote/http.html">http</a>
</li>
<li<%= sidebar_current("docs-state-remote-s3") %>>
<a href="/docs/state/remote/s3.html">s3</a>
</li>
<li<%= sidebar_current("docs-state-remote-swift") %>>
<a href="/docs/state/remote/swift.html">swift</a>
</li>
</ul>
</li>
</ul>
</div>
<li<%= sidebar_current(/^docs-state-remote-/) %>>
<a href="#">Backends</a>
<ul class="nav nav-visible">
<li<%= sidebar_current("docs-state-remote-artifactory") %>>
<a href="/docs/state/remote/artifactory.html">artifactory</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>
<li<%= sidebar_current("docs-state-remote-etcd") %>>
<a href="/docs/state/remote/etcd.html">etcd</a>
</li>
<li<%= sidebar_current("docs-state-remote-gcs") %>>
<a href="/docs/state/remote/gcs.html">gcs</a>
</li>
<li<%= sidebar_current("docs-state-remote-http") %>>
<a href="/docs/state/remote/http.html">http</a>
</li>
<li<%= sidebar_current("docs-state-remote-s3") %>>
<a href="/docs/state/remote/s3.html">s3</a>
</li>
<li<%= sidebar_current("docs-state-remote-swift") %>>
<a href="/docs/state/remote/swift.html">swift</a>
</li>
</ul>
</li>
</ul>
</div>
<% end %>
<%= yield %>
Expand Down

0 comments on commit 32e1a32

Please sign in to comment.