backend/atlas: accept ATLAS_ADDRESS env var for address

This is required for on-premise TFE.
This commit is contained in:
Mitchell Hashimoto 2017-03-16 23:03:11 -07:00
parent 2082359220
commit 23dd2a0ee5
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
2 changed files with 38 additions and 1 deletions

View File

@ -110,8 +110,8 @@ func (b *Backend) init() {
"address": &schema.Schema{ "address": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Default: defaultAtlasServer,
Description: schemaDescriptions["address"], Description: schemaDescriptions["address"],
DefaultFunc: schema.EnvDefaultFunc("ATLAS_ADDRESS", defaultAtlasServer),
}, },
}, },

View File

@ -1,12 +1,49 @@
package atlas package atlas
import ( import (
"os"
"testing" "testing"
"github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/config"
"github.com/hashicorp/terraform/terraform"
) )
func TestImpl(t *testing.T) { func TestImpl(t *testing.T) {
var _ backend.Backend = new(Backend) var _ backend.Backend = new(Backend)
var _ backend.CLI = new(Backend) var _ backend.CLI = new(Backend)
} }
func TestConfigure_envAddr(t *testing.T) {
defer os.Setenv("ATLAS_ADDRESS", os.Getenv("ATLAS_ADDRESS"))
os.Setenv("ATLAS_ADDRESS", "http://foo.com")
b := &Backend{}
err := b.Configure(terraform.NewResourceConfig(config.TestRawConfig(t, map[string]interface{}{
"name": "foo/bar",
})))
if err != nil {
t.Fatalf("err: %s", err)
}
if b.stateClient.Server != "http://foo.com" {
t.Fatalf("bad: %#v", b.stateClient)
}
}
func TestConfigure_envToken(t *testing.T) {
defer os.Setenv("ATLAS_TOKEN", os.Getenv("ATLAS_TOKEN"))
os.Setenv("ATLAS_TOKEN", "foo")
b := &Backend{}
err := b.Configure(terraform.NewResourceConfig(config.TestRawConfig(t, map[string]interface{}{
"name": "foo/bar",
})))
if err != nil {
t.Fatalf("err: %s", err)
}
if b.stateClient.AccessToken != "foo" {
t.Fatalf("bad: %#v", b.stateClient)
}
}