PLT-6076 Adding viper libs for config file changes (#5871)

* Adding viper libs for config file changes

* Removing the old fsnotify lib

* updating some missing libs

1 files changed, 87 insertions, 26 deletions

diff --git a/vendor/github.com/xenolf/lego/providers/dns/dnsimple/dnsimple_test.go b/vendor/github.com/xenolf/lego/providers/dns/dnsimple/dnsimple_test.go
index 4926b3df9..ee65dd42b 100644
--- a/vendor/github.com/xenolf/lego/providers/dns/dnsimple/dnsimple_test.go
+++ b/vendor/github.com/xenolf/lego/providers/dns/dnsimple/dnsimple_test.go
@@ -9,61 +9,122 @@ import (
 )
 
 var (
-	dnsimpleLiveTest bool
-	dnsimpleEmail    string
-	dnsimpleAPIKey   string
-	dnsimpleDomain   string
+	dnsimpleLiveTest   bool
+	dnsimpleOauthToken string
+	dnsimpleDomain     string
+	dnsimpleBaseUrl    string
 )
 
 func init() {
-	dnsimpleEmail = os.Getenv("DNSIMPLE_EMAIL")
-	dnsimpleAPIKey = os.Getenv("DNSIMPLE_API_KEY")
+	dnsimpleOauthToken = os.Getenv("DNSIMPLE_OAUTH_TOKEN")
 	dnsimpleDomain = os.Getenv("DNSIMPLE_DOMAIN")
-	if len(dnsimpleEmail) > 0 && len(dnsimpleAPIKey) > 0 && len(dnsimpleDomain) > 0 {
+	dnsimpleBaseUrl = "https://api.sandbox.dnsimple.com"
+
+	if len(dnsimpleOauthToken) > 0 && len(dnsimpleDomain) > 0 {
+		baseUrl := os.Getenv("DNSIMPLE_BASE_URL")
+
+		if baseUrl != "" {
+			dnsimpleBaseUrl = baseUrl
+		}
+
 		dnsimpleLiveTest = true
 	}
 }
 
 func restoreDNSimpleEnv() {
-	os.Setenv("DNSIMPLE_EMAIL", dnsimpleEmail)
-	os.Setenv("DNSIMPLE_API_KEY", dnsimpleAPIKey)
+	os.Setenv("DNSIMPLE_OAUTH_TOKEN", dnsimpleOauthToken)
+	os.Setenv("DNSIMPLE_BASE_URL", dnsimpleBaseUrl)
 }
 
+//
+// NewDNSProvider
+//
+
 func TestNewDNSProviderValid(t *testing.T) {
-	os.Setenv("DNSIMPLE_EMAIL", "")
-	os.Setenv("DNSIMPLE_API_KEY", "")
-	_, err := NewDNSProviderCredentials("example@example.com", "123")
+	defer restoreDNSimpleEnv()
+
+	os.Setenv("DNSIMPLE_OAUTH_TOKEN", "123")
+	provider, err := NewDNSProvider()
+
+	assert.NotNil(t, provider)
+	assert.Equal(t, "lego", provider.client.UserAgent)
 	assert.NoError(t, err)
-	restoreDNSimpleEnv()
 }
-func TestNewDNSProviderValidEnv(t *testing.T) {
-	os.Setenv("DNSIMPLE_EMAIL", "example@example.com")
-	os.Setenv("DNSIMPLE_API_KEY", "123")
-	_, err := NewDNSProvider()
+
+func TestNewDNSProviderValidWithBaseUrl(t *testing.T) {
+	defer restoreDNSimpleEnv()
+
+	os.Setenv("DNSIMPLE_OAUTH_TOKEN", "123")
+	os.Setenv("DNSIMPLE_BASE_URL", "https://api.dnsimple.test")
+	provider, err := NewDNSProvider()
+
+	assert.NotNil(t, provider)
 	assert.NoError(t, err)
-	restoreDNSimpleEnv()
+
+	assert.Equal(t, provider.client.BaseURL, "https://api.dnsimple.test")
 }
 
-func TestNewDNSProviderMissingCredErr(t *testing.T) {
-	os.Setenv("DNSIMPLE_EMAIL", "")
-	os.Setenv("DNSIMPLE_API_KEY", "")
-	_, err := NewDNSProvider()
-	assert.EqualError(t, err, "DNSimple credentials missing")
-	restoreDNSimpleEnv()
+func TestNewDNSProviderInvalidWithMissingOauthToken(t *testing.T) {
+	if dnsimpleLiveTest {
+		t.Skip("skipping test in live mode")
+	}
+
+	defer restoreDNSimpleEnv()
+
+	provider, err := NewDNSProvider()
+
+	assert.Nil(t, provider)
+	assert.EqualError(t, err, "DNSimple OAuth token missing")
 }
 
+//
+// NewDNSProviderCredentials
+//
+
+func TestNewDNSProviderCredentialsValid(t *testing.T) {
+	provider, err := NewDNSProviderCredentials("123", "")
+
+	assert.NotNil(t, provider)
+	assert.Equal(t, "lego", provider.client.UserAgent)
+	assert.NoError(t, err)
+}
+
+func TestNewDNSProviderCredentialsValidWithBaseUrl(t *testing.T) {
+	provider, err := NewDNSProviderCredentials("123", "https://api.dnsimple.test")
+
+	assert.NotNil(t, provider)
+	assert.NoError(t, err)
+
+	assert.Equal(t, provider.client.BaseURL, "https://api.dnsimple.test")
+}
+
+func TestNewDNSProviderCredentialsInvalidWithMissingOauthToken(t *testing.T) {
+	provider, err := NewDNSProviderCredentials("", "")
+
+	assert.Nil(t, provider)
+	assert.EqualError(t, err, "DNSimple OAuth token missing")
+}
+
+//
+// Present
+//
+
 func TestLiveDNSimplePresent(t *testing.T) {
 	if !dnsimpleLiveTest {
 		t.Skip("skipping live test")
 	}
 
-	provider, err := NewDNSProviderCredentials(dnsimpleEmail, dnsimpleAPIKey)
+	provider, err := NewDNSProviderCredentials(dnsimpleOauthToken, dnsimpleBaseUrl)
 	assert.NoError(t, err)
 
 	err = provider.Present(dnsimpleDomain, "", "123d==")
 	assert.NoError(t, err)
 }
 
+//
+// Cleanup
+//
+
 func TestLiveDNSimpleCleanUp(t *testing.T) {
 	if !dnsimpleLiveTest {
 		t.Skip("skipping live test")
@@ -71,7 +132,7 @@ func TestLiveDNSimpleCleanUp(t *testing.T) {
 
 	time.Sleep(time.Second * 1)
 
-	provider, err := NewDNSProviderCredentials(dnsimpleEmail, dnsimpleAPIKey)
+	provider, err := NewDNSProviderCredentials(dnsimpleOauthToken, dnsimpleBaseUrl)
 	assert.NoError(t, err)
 
 	err = provider.CleanUp(dnsimpleDomain, "", "123d==")