From b79834e859b4830b47b219458815c5046e9a363f Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Mon, 25 Aug 2014 10:08:40 -0700 Subject: [PATCH] providers/mailgun: smtp_password is required, no need for pub api key --- builtin/providers/mailgun/config.go | 2 +- builtin/providers/mailgun/provider.go | 7 +------ builtin/providers/mailgun/resource_mailgun_domain.go | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/builtin/providers/mailgun/config.go b/builtin/providers/mailgun/config.go index e58b5fcf38..4c9d6d2799 100644 --- a/builtin/providers/mailgun/config.go +++ b/builtin/providers/mailgun/config.go @@ -8,7 +8,7 @@ import ( ) type Config struct { - APIKey string `mapstructure:"api_key"` + APIKey string `mapstructure:"api_key"` } // Client() returns a new client for accessing mailgun. diff --git a/builtin/providers/mailgun/provider.go b/builtin/providers/mailgun/provider.go index 245c6d438c..25d29b343b 100644 --- a/builtin/providers/mailgun/provider.go +++ b/builtin/providers/mailgun/provider.go @@ -13,12 +13,7 @@ func Provider() *schema.Provider { Schema: map[string]*schema.Schema{ "api_key": &schema.Schema{ Type: schema.TypeString, - Optional: false, - }, - - "public_api_key": &schema.Schema{ - Type: schema.TypeString, - Optional: false, + Required: true, }, }, diff --git a/builtin/providers/mailgun/resource_mailgun_domain.go b/builtin/providers/mailgun/resource_mailgun_domain.go index 59f821fc50..e4b9cc6cb5 100644 --- a/builtin/providers/mailgun/resource_mailgun_domain.go +++ b/builtin/providers/mailgun/resource_mailgun_domain.go @@ -30,7 +30,6 @@ func resourceMailgunDomain() *schema.Resource { "smtp_password": &schema.Schema{ Type: schema.TypeString, - Computed: true, ForceNew: true, Required: true, },