Merge pull request #91 from ovh/dev/aamstutz/wasm-support

feat: Add ability to use go-ovh in a WebAssembly binary

Author: amstuta

ovh/configuration.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"os/user"
+	"runtime"
 	"strings"
 
 	"golang.org/x/oauth2/clientcredentials"
@@ -66,6 +67,12 @@ func expandConfigPaths() []interface{} {
 // loadINI builds a ini.File from the configuration paths provided in configPaths.
 // It's a helper for loadConfig.
 func loadINI() (*ini.File, error) {
+	// Don't try to load configuration from the
+	// filesystem when compiling for WebAssembly
+	if runtime.GOARCH == "wasm" && runtime.GOOS == "js" {
+		return ini.Empty(), nil
+	}
+
 	paths := expandConfigPaths()
 	if len(paths) == 0 {
 		return ini.Empty(), nil
@@ -195,12 +202,20 @@ func getConfigValue(cfg *ini.File, section, name, def string) string {
 		return fromEnv
 	}
 
+	if !cfg.HasSection(section) {
+		return def
+	}
+
 	// Attempt to load from configuration
 	fromSection := cfg.Section(section)
 	if fromSection == nil {
 		return def
 	}
 
+	if !fromSection.HasKey(name) {
+		return def
+	}
+
 	fromSectionKey := fromSection.Key(name)
 	if fromSectionKey == nil {
 		return def

ovh/configuration_test.go

@@ -143,7 +143,7 @@ func TestMissingParam(t *testing.T) {
 
 	client.endpoint = ""
 	err := client.loadConfig("")
-	td.CmpString(t, err, `unknown endpoint '', consider checking 'Endpoints' list or using an URL`)
+	td.CmpNoError(t, err)
 
 	client.AppKey = ""
 	err = client.loadConfig("ovh-eu")

ovh/ovh_test.go

@@ -401,10 +401,10 @@ func TestGetResponseUnmarshalNumber(t *testing.T) {
 func TestConstructors(t *testing.T) {
 	assert, require := td.AssertRequire(t)
 
-	// Error: missing Endpoint
+	// Missing Endpoint, defaulting to ovh-eu
 	client, err := NewClient("", MockApplicationKey, MockApplicationSecret, MockConsumerKey)
-	assert.Nil(client)
-	assert.String(err, `unknown endpoint '', consider checking 'Endpoints' list or using an URL`)
+	assert.NotNil(client)
+	assert.CmpNoError(err)
 
 	// Error: missing ApplicationKey
 	client, err = NewClient("ovh-eu", "", MockApplicationSecret, MockConsumerKey)
@@ -449,10 +449,10 @@ func TestConstructors(t *testing.T) {
 func TestConstructorsOAuth2(t *testing.T) {
 	assert, require := td.AssertRequire(t)
 
-	// Error: missing Endpoint
+	// Missing Endpoint: defaulting to ovh-eu
 	client, err := NewOAuth2Client("", "aaaaaaaa", "bbbbbbbbbbbbbbbbbbbbbbbbbbbb")
-	assert.Nil(client)
-	assert.String(err, `unknown endpoint '', consider checking 'Endpoints' list or using an URL`)
+	assert.NotNil(client)
+	assert.CmpNoError(err)
 
 	// Error: missing Client ID
 	client, err = NewOAuth2Client("ovh-eu", "", "MockApplicationSecret")
@@ -489,10 +489,10 @@ func TestConstructorsOAuth2(t *testing.T) {
 func TestConstructorsAccessToken(t *testing.T) {
 	assert, require := td.AssertRequire(t)
 
-	// Error: missing Endpoint
+	// Missing Endpoint: defaulting to ovh-eu
 	client, err := NewAccessTokenClient("", "aaaaaaaa")
-	assert.Nil(client)
-	assert.String(err, `unknown endpoint '', consider checking 'Endpoints' list or using an URL`)
+	assert.NotNil(client)
+	assert.CmpNoError(err)
 
 	// Next: success cases
 	expected := td.Struct(&Client{