From edc4a277d614cce34de9094186d294e813a89e71 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 9 Dec 2014 18:43:56 -0800 Subject: [PATCH] provider/atlas: fix required token --- builtin/providers/atlas/provider.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/providers/atlas/provider.go b/builtin/providers/atlas/provider.go index ad17cc063..9e343d5d5 100644 --- a/builtin/providers/atlas/provider.go +++ b/builtin/providers/atlas/provider.go @@ -18,19 +18,19 @@ const ( func Provider() terraform.ResourceProvider { return &schema.Provider{ Schema: map[string]*schema.Schema{ + "token": &schema.Schema{ + Type: schema.TypeString, + Required: true, + DefaultFunc: envDefaultFunc("ATLAS_TOKEN", nil), + Description: descriptions["token"], + }, + "address": &schema.Schema{ Type: schema.TypeString, Optional: true, DefaultFunc: envDefaultFunc("ATLAS_ADDRESS", defaultAtlasServer), Description: descriptions["address"], }, - - "token": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - DefaultFunc: envDefaultFunc("ATLAS_TOKEN", ""), - Description: descriptions["token"], - }, }, ResourcesMap: map[string]*schema.Resource{ @@ -55,7 +55,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { return client, nil } -func envDefaultFunc(k, alt string) schema.SchemaDefaultFunc { +func envDefaultFunc(k string, alt interface{}) schema.SchemaDefaultFunc { return func() (interface{}, error) { if v := os.Getenv(k); v != "" { return v, nil