You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by lz...@apache.org on 2017/08/25 05:31:29 UTC
[incubator-openwhisk-client-go] branch master updated: Return the
configs even if the parameter is invalid (#30)
This is an automated email from the ASF dual-hosted git repository.
lz1982 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-go.git
The following commit(s) were added to refs/heads/master by this push:
new 8a672e5 Return the configs even if the parameter is invalid (#30)
8a672e5 is described below
commit 8a672e5f39dd0bbdf6ca9460782557d7f449103c
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Fri Aug 25 01:31:28 2017 -0400
Return the configs even if the parameter is invalid (#30)
---
whisk/wskprops.go | 28 +++++++----------
whisk/wskprops_test.go | 83 ++++++++++++++++++++++++++++++++++----------------
2 files changed, 68 insertions(+), 43 deletions(-)
diff --git a/whisk/wskprops.go b/whisk/wskprops.go
index 57f6644..09a0535 100644
--- a/whisk/wskprops.go
+++ b/whisk/wskprops.go
@@ -97,9 +97,6 @@ func convertWskpropsToConfig(dep *Wskprops) *Config {
func GetDefaultConfigFromProperties(pi Properties) (*Config, error) {
var config *Config
dep, e := GetDefaultWskProp(pi)
- if (e != nil) {
- return config, e
- }
config = convertWskpropsToConfig(dep)
return config, e
}
@@ -107,9 +104,6 @@ func GetDefaultConfigFromProperties(pi Properties) (*Config, error) {
func GetConfigFromWhiskProperties(pi Properties) (*Config, error) {
var config *Config
dep, e := GetWskPropFromWhiskProperty(pi)
- if (e != nil) {
- return config, e
- }
config = convertWskpropsToConfig(dep)
return config, e
}
@@ -117,9 +111,6 @@ func GetConfigFromWhiskProperties(pi Properties) (*Config, error) {
func GetConfigFromWskprops(pi Properties, path string) (*Config, error) {
var config *Config
dep, e := GetWskPropFromWskprops(pi, path)
- if (e != nil) {
- return config, e
- }
config = convertWskpropsToConfig(dep)
return config, e
}
@@ -160,7 +151,7 @@ type Properties interface {
}
type PropertiesImp struct {
- osPackage OSPackage
+ OsPackage OSPackage
}
func (pi PropertiesImp) GetPropsFromWskprops(path string) *Wskprops {
@@ -170,7 +161,7 @@ func (pi PropertiesImp) GetPropsFromWskprops(path string) *Wskprops {
if path != "" {
configPath = path
} else {
- configPath = pi.osPackage.Getenv(GOPATH, "")
+ configPath = pi.OsPackage.Getenv(GOPATH, "")
}
results, err := ReadProps(configPath + "/" + DEFAULT_LOCAL_CONFIG)
@@ -199,7 +190,7 @@ func (pi PropertiesImp) GetPropsFromWskprops(path string) *Wskprops {
func (pi PropertiesImp) GetPropsFromWhiskProperties() *Wskprops {
dep := GetDefaultWskprops(WHISK_PROPERTY)
- path := pi.osPackage.Getenv(OPENWHISK_HOME, "") + "/" + OPENWHISK_PROPERTIES
+ path := pi.OsPackage.Getenv(OPENWHISK_HOME, "") + "/" + OPENWHISK_PROPERTIES
results, err := ReadProps(path)
if err == nil {
@@ -275,22 +266,25 @@ func (osPackage OSPackageImp) Getenv(key string, defaultValue string) string {
func GetDefaultConfig() (*Config, error) {
pi := PropertiesImp{
- osPackage: OSPackageImp{},
+ OsPackage: OSPackageImp{},
}
return GetDefaultConfigFromProperties(pi)
}
func GetWhiskPropertiesConfig() (*Config, error) {
pi := PropertiesImp{
- osPackage: OSPackageImp{},
+ OsPackage: OSPackageImp{},
}
return GetConfigFromWhiskProperties(pi)
}
-func GetWskpropsConfig(path string) (*Config, error) {
- pi := PropertiesImp{
- osPackage: OSPackageImp{},
+func GetPropertiesImp() PropertiesImp {
+ return PropertiesImp{
+ OsPackage: OSPackageImp{},
}
+}
+func GetWskpropsConfig(path string) (*Config, error) {
+ pi := GetPropertiesImp()
return GetConfigFromWskprops(pi, path)
}
diff --git a/whisk/wskprops_test.go b/whisk/wskprops_test.go
index 4becded..10986ef 100644
--- a/whisk/wskprops_test.go
+++ b/whisk/wskprops_test.go
@@ -63,9 +63,10 @@ const (
EXPECTED_CERT_LOCAL_CONF = "EXPECTED_CERT_LOCAL_CONF"
EXPECTED_KEY_LOCAL_CONF = "EXPECTED_KEY_LOCAL_CONF"
- MISSING_AUTH = "Authentication key is missing"
- MISSING_URL = "OpenWhisk API URL is missing"
- INVALID_URL = "Invalid OpenWhisk API URL"
+ MISSING_AUTH__MESSAGE = "Authentication key is missing"
+ MISSING_URL_MESSAGE = "OpenWhisk API URL is missing"
+ INVALID_URL_MESSAGE = "Invalid OpenWhisk API URL"
+ INVALID_URL = "invalid_url"
)
type FakeOSPackage struct {
@@ -175,8 +176,9 @@ func TestGetPropsFromWhiskProperties(t *testing.T) {
},
}
pi := PropertiesImp{
- osPackage: fakeOSPackage,
+ OsPackage: fakeOSPackage,
}
+
dep := pi.GetPropsFromWhiskProperties()
assert.Equal(t, DEFAULT_NAMESPACE, dep.Namespace)
assert.Equal(t, "", dep.AuthKey)
@@ -197,7 +199,7 @@ func TestGetPropsFromWhiskProperties(t *testing.T) {
CreateFile(lines, OPENWHISK_PROPERTIES)
pi = PropertiesImp{
- osPackage: fakeOSPackage,
+ OsPackage: fakeOSPackage,
}
dep = pi.GetPropsFromWhiskProperties()
assert.Equal(t, DEFAULT_NAMESPACE, dep.Namespace)
@@ -219,7 +221,7 @@ func TestGetPropsFromWhiskProperties(t *testing.T) {
OPENWHISK_HOST + "=" + EXPECTED_OPENWHISK_HOST}
CreateFile(lines, OPENWHISK_PROPERTIES)
pi = PropertiesImp{
- osPackage: fakeOSPackage,
+ OsPackage: fakeOSPackage,
}
dep = pi.GetPropsFromWhiskProperties()
assert.Equal(t, DEFAULT_NAMESPACE, dep.Namespace)
@@ -250,7 +252,7 @@ func TestGetPropsFromWskprops(t *testing.T) {
},
}
pi := PropertiesImp{
- osPackage: fakeOSPackage,
+ OsPackage: fakeOSPackage,
}
dep := pi.GetPropsFromWskprops("")
@@ -311,7 +313,6 @@ func TestGetDefaultConfigFromProperties(t *testing.T) {
fakeProperties = FakePropertiesImp{
StoredValues_LOCAL_CONF: map[string]string {
- APIHOST: EXPECTED_HOST,
AUTH: EXPECTED_AUTH_API_KEY,
NAMESPACE: DEFAULT_NAMESPACE,
APIGW_ACCESS_TOKEN: EXPECTED_AUTH_API_KEY,
@@ -323,12 +324,22 @@ func TestGetDefaultConfigFromProperties(t *testing.T) {
}
config, err = GetDefaultConfigFromProperties(fakeProperties)
+ assert.Equal(t, DEFAULT_NAMESPACE, config.Namespace)
+ assert.Equal(t, EXPECTED_CERT, config.Cert)
+ assert.Equal(t, EXPECTED_KEY, config.Key)
+ assert.Equal(t, EXPECTED_AUTH_API_KEY, config.AuthToken)
+ assert.Equal(t, "", config.Host)
+ assert.Equal(t, "", config.BaseURL.String())
+ assert.Equal(t, EXPECTED_API_VERSION, config.Version)
+ assert.False(t, config.Verbose)
+ assert.False(t, config.Debug)
+ assert.True(t, config.Insecure)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), "OpenWhisk API URL is missing")
+ assert.Contains(t, err.Error(), MISSING_URL_MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_LOCAL_CONF: map[string]string {
- WHISK_APIHOST: "invalid_url",
+ WHISK_APIHOST: INVALID_URL,
APIHOST: EXPECTED_HOST,
AUTH: EXPECTED_AUTH_API_KEY,
NAMESPACE: DEFAULT_NAMESPACE,
@@ -341,8 +352,18 @@ func TestGetDefaultConfigFromProperties(t *testing.T) {
}
config, err = GetDefaultConfigFromProperties(fakeProperties)
+ assert.Equal(t, DEFAULT_NAMESPACE, config.Namespace)
+ assert.Equal(t, EXPECTED_CERT, config.Cert)
+ assert.Equal(t, EXPECTED_KEY, config.Key)
+ assert.Equal(t, EXPECTED_AUTH_API_KEY, config.AuthToken)
+ assert.Equal(t, "", config.Host)
+ assert.Equal(t, INVALID_URL, config.BaseURL.String())
+ assert.Equal(t, EXPECTED_API_VERSION, config.Version)
+ assert.False(t, config.Verbose)
+ assert.False(t, config.Debug)
+ assert.True(t, config.Insecure)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), "Invalid OpenWhisk API URL")
+ assert.Contains(t, err.Error(), INVALID_URL_MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_LOCAL_CONF: map[string]string {
@@ -358,8 +379,18 @@ func TestGetDefaultConfigFromProperties(t *testing.T) {
}
config, err = GetDefaultConfigFromProperties(fakeProperties)
+ assert.Equal(t, DEFAULT_NAMESPACE, config.Namespace)
+ assert.Equal(t, EXPECTED_CERT, config.Cert)
+ assert.Equal(t, EXPECTED_KEY, config.Key)
+ assert.Equal(t, "", config.AuthToken)
+ assert.Equal(t, EXPECTED_HOST, config.Host)
+ assert.Equal(t, EXPECTED_API_HOST, config.BaseURL.String())
+ assert.Equal(t, EXPECTED_API_VERSION, config.Version)
+ assert.False(t, config.Verbose)
+ assert.False(t, config.Debug)
+ assert.True(t, config.Insecure)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), "Authentication key is missing")
+ assert.Contains(t, err.Error(), MISSING_AUTH__MESSAGE)
}
func TestGetConfigFromWskprops(t *testing.T) {
@@ -405,7 +436,7 @@ func TestGetConfigFromWskprops(t *testing.T) {
config, err = GetConfigFromWskprops(fakeProperties, "")
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_URL)
+ assert.Contains(t, err.Error(), MISSING_URL_MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_LOCAL_CONF: map[string]string {
@@ -422,7 +453,7 @@ func TestGetConfigFromWskprops(t *testing.T) {
config, err = GetConfigFromWskprops(fakeProperties, "")
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_AUTH)
+ assert.Contains(t, err.Error(), MISSING_AUTH__MESSAGE)
}
func TestGetConfigFromWhiskProperties(t *testing.T) {
@@ -468,7 +499,7 @@ func TestGetConfigFromWhiskProperties(t *testing.T) {
config, err = GetConfigFromWhiskProperties(fakeProperties)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_URL)
+ assert.Contains(t, err.Error(), MISSING_URL_MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_WHISK: map[string]string {
@@ -485,7 +516,7 @@ func TestGetConfigFromWhiskProperties(t *testing.T) {
config, err = GetConfigFromWhiskProperties(fakeProperties)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_AUTH)
+ assert.Contains(t, err.Error(), MISSING_AUTH__MESSAGE)
}
func TestValidateWskprops(t *testing.T) {
@@ -501,7 +532,7 @@ func TestValidateWskprops(t *testing.T) {
Cert: "",
}
err := ValidateWskprops(&dep)
- assert.Contains(t, err.Error(), MISSING_URL)
+ assert.Contains(t, err.Error(), MISSING_URL_MESSAGE)
dep = Wskprops {
WHISKAPIURL: "invalid_path",
@@ -515,7 +546,7 @@ func TestValidateWskprops(t *testing.T) {
Cert: "",
}
err = ValidateWskprops(&dep)
- assert.Contains(t, err.Error(), INVALID_URL)
+ assert.Contains(t, err.Error(), INVALID_URL_MESSAGE)
dep = Wskprops {
WHISKAPIURL: "http://localhost/api",
@@ -529,7 +560,7 @@ func TestValidateWskprops(t *testing.T) {
Cert: "",
}
err = ValidateWskprops(&dep)
- assert.Contains(t, err.Error(), MISSING_AUTH)
+ assert.Contains(t, err.Error(), MISSING_AUTH__MESSAGE)
dep = Wskprops {
WHISKAPIURL: "http://localhost/api",
@@ -781,7 +812,7 @@ func TestGetWskPropFromWskprops(t *testing.T) {
assert.Equal(t, EXPECTED_CERT_LOCAL_CONF, dep.Cert)
assert.Equal(t, EXPECTED_KEY_LOCAL_CONF, dep.Key)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_URL)
+ assert.Contains(t, err.Error(), MISSING_URL_MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_LOCAL_CONF: missing_auth_local_conf_values,
@@ -797,7 +828,7 @@ func TestGetWskPropFromWskprops(t *testing.T) {
assert.Equal(t, EXPECTED_CERT_LOCAL_CONF, dep.Cert)
assert.Equal(t, EXPECTED_KEY_LOCAL_CONF, dep.Key)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_AUTH)
+ assert.Contains(t, err.Error(), MISSING_AUTH__MESSAGE)
}
func TestGetWskPropFromWhiskProperty(t *testing.T) {
@@ -831,7 +862,7 @@ func TestGetWskPropFromWhiskProperty(t *testing.T) {
for k,v := range valid_whisk_values {
invalid_url_whisk_values[k] = v
}
- invalid_url_whisk_values[WHISK_APIHOST] = "invalid_url"
+ invalid_url_whisk_values[WHISK_APIHOST] = INVALID_URL
fakeProperties := FakePropertiesImp{
StoredValues_WHISK: valid_whisk_values,
@@ -864,7 +895,7 @@ func TestGetWskPropFromWhiskProperty(t *testing.T) {
assert.Equal(t, EXPECTED_CERT_WHISK, dep.Cert)
assert.Equal(t, EXPECTED_KEY_WHISK, dep.Key)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_AUTH)
+ assert.Contains(t, err.Error(), MISSING_AUTH__MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_WHISK: missing_url_whisk_values,
@@ -881,7 +912,7 @@ func TestGetWskPropFromWhiskProperty(t *testing.T) {
assert.Equal(t, EXPECTED_CERT_WHISK, dep.Cert)
assert.Equal(t, EXPECTED_KEY_WHISK, dep.Key)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), MISSING_URL)
+ assert.Contains(t, err.Error(), MISSING_URL_MESSAGE)
fakeProperties = FakePropertiesImp{
StoredValues_WHISK: invalid_url_whisk_values,
@@ -893,10 +924,10 @@ func TestGetWskPropFromWhiskProperty(t *testing.T) {
assert.Equal(t, EXPECTED_AUTH_API_KEY_WHISK, dep.AuthAPIGWKey)
assert.Equal(t, EXPECTED_API_HOST_WHISK, dep.APIHost)
assert.Equal(t, EXPECTED_API_GW_SPACE_SUID_WHISK, dep.APIGWSpaceSuid)
- assert.Equal(t, "invalid_url", dep.WHISKAPIURL)
+ assert.Equal(t, INVALID_URL, dep.WHISKAPIURL)
assert.Equal(t, EXPECTED_API_VERSION_WHISK, dep.Apiversion)
assert.Equal(t, EXPECTED_CERT_WHISK, dep.Cert)
assert.Equal(t, EXPECTED_KEY_WHISK, dep.Key)
assert.NotEqual(t, nil, err)
- assert.Contains(t, err.Error(), INVALID_URL)
+ assert.Contains(t, err.Error(), INVALID_URL_MESSAGE)
}
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].