provider_test tweak #1 [issues/95-support-for-netrc-authent]

heroku/config.go

@@ -1,11 +1,10 @@
 package heroku
 
 import (
-	"log"
-	"net/http"
-
 	"github.com/hashicorp/terraform/helper/logging"
 	heroku "github.com/heroku/heroku-go/v3"
+	"log"
+	"net/http"
 )
 
 type Config struct {
@@ -16,7 +15,7 @@ type Config struct {
 	Api *heroku.Service
 }
 
-// Client returns a new Service for accessing Heroku.
+// Client returns a new Config for accessing Heroku.
 func (c *Config) loadAndInitialize() error {
 	var debugHTTP = false
 	if logging.IsDebugOrHigher() {

heroku/provider.go

@@ -83,17 +83,17 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		h.Set(k, v)
 	}
 
-	// Read from netrc file first. If not available fall back to original authentication
-	// TODO: do we need to read from netrc during a test run?
 	err := readNetrcFile(&config, h)
 	if err != nil {
 		return nil, err
 	}
 
-	config = Config{
-		Email:   d.Get("email").(string),
-		APIKey:  d.Get("api_key").(string),
-		Headers: h,
+	if email, ok := d.GetOk("email"); ok {
+		config.Email = email.(string)
+	}
+
+	if apiKey, ok := d.GetOk("api_key"); ok {
+		config.APIKey = apiKey.(string)
 	}
 
 	log.Println("[INFO] Initializing Heroku client")

heroku/provider_test.go

@@ -89,8 +89,8 @@ func TestProviderConfigureUseNetrc(t *testing.T) {
 	}
 	configuration := meta.(*Config)
 
-	assert.Equal(t, "email_login", configuration)
-	//assert.Equal(t, "api_key", configuration.APIKey)
+	assert.Equal(t, "email_login", configuration.Email)
+	assert.Equal(t, "api_key", configuration.APIKey)
 }
 
 func testAccPreCheck(t *testing.T) {