houshengbo commented on a change in pull request #262: Adjust the code to
reflect latest API gateway version.
URL:
https://github.com/apache/incubator-openwhisk-wskdeploy/pull/262#discussion_r136365132
##########
File path: deployers/whiskclient.go
##########
@@ -25,175 +25,175 @@ import (
"os"
"strings"
+ "errors"
"github.com/apache/incubator-openwhisk-client-go/whisk"
"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
"github.com/apache/incubator-openwhisk-wskdeploy/utils"
- "errors"
- "log"
+ "log"
)
const (
- DEPLOYMENTFILE = "deployment.yml"
- MANIDESTFILE = "manifest.yml"
- COMMANDLINE = "wskdeploy command line"
- DEFAULTVALUE = "default value"
- WSKPROPS = ".wskprops"
- WHISKPROPERTY = "whisk.properties"
- INTERINPUT = "interactve input"
+ DEPLOYMENTFILE = "deployment.yml"
+ MANIDESTFILE = "manifest.yml"
+ COMMANDLINE = "wskdeploy command line"
+ DEFAULTVALUE = "default value"
+ WSKPROPS = ".wskprops"
+ WHISKPROPERTY = "whisk.properties"
+ INTERINPUT = "interactve input"
)
type PropertyValue struct {
- Value string
- Source string
+ Value string
+ Source string
}
-var GetPropertyValue = func (prop PropertyValue, newValue string, source
string) PropertyValue {
- if len(prop.Value) == 0 && len(newValue) > 0 {
- prop.Value = newValue
- prop.Source = source
- }
- return prop
+var GetPropertyValue = func(prop PropertyValue, newValue string, source
string) PropertyValue {
+ if len(prop.Value) == 0 && len(newValue) > 0 {
+ prop.Value = newValue
+ prop.Source = source
+ }
+ return prop
}
-var GetWskPropFromWskprops = func (pi whisk.Properties, proppath string)
(*whisk.Wskprops, error) {
- return whisk.GetWskPropFromWskprops(pi, proppath)
+var GetWskPropFromWskprops = func(pi whisk.Properties, proppath string)
(*whisk.Wskprops, error) {
+ return whisk.GetWskPropFromWskprops(pi, proppath)
}
-var GetWskPropFromWhiskProperty = func (pi whisk.Properties) (*whisk.Wskprops,
error) {
- return whisk.GetWskPropFromWhiskProperty(pi)
+var GetWskPropFromWhiskProperty = func(pi whisk.Properties) (*whisk.Wskprops,
error) {
+ return whisk.GetWskPropFromWhiskProperty(pi)
}
-var GetCommandLineFlags = func () (string, string, string) {
- return utils.Flags.ApiHost, utils.Flags.Auth, utils.Flags.Namespace
+var GetCommandLineFlags = func() (string, string, string) {
+ return utils.Flags.ApiHost, utils.Flags.Auth, utils.Flags.Namespace
}
-var CreateNewClient = func (httpClient *http.Client, config_input
*whisk.Config) (*whisk.Client, error) {
- return whisk.NewClient(http.DefaultClient, clientConfig)
+var CreateNewClient = func(httpClient *http.Client, config_input
*whisk.Config) (*whisk.Client, error) {
+ return whisk.NewClient(http.DefaultClient, clientConfig)
}
func NewWhiskClient(proppath string, deploymentPath string, manifestPath
string, isInteractive bool) (*whisk.Client, *whisk.Config) {
- credential := PropertyValue {}
- namespace := PropertyValue {}
- apiHost := PropertyValue {}
-
- // First, we look up the above variables in the deployment file.
- if utils.FileExists(deploymentPath) {
- mm := parsers.NewYAMLParser()
- deployment := mm.ParseDeployment(deploymentPath)
- credential.Value = deployment.Application.Credential
- credential.Source = DEPLOYMENTFILE
- namespace.Value = deployment.Application.Namespace
- namespace.Source = DEPLOYMENTFILE
- apiHost.Value = deployment.Application.ApiHost
- apiHost.Source = DEPLOYMENTFILE
- }
-
- if len(credential.Value) == 0 || len(namespace.Value) == 0 ||
len(apiHost.Value) == 0 {
- if utils.FileExists(manifestPath) {
- mm := parsers.NewYAMLParser()
- manifest := mm.ParseManifest(manifestPath)
- credential = GetPropertyValue(credential,
manifest.Package.Credential, MANIDESTFILE)
- namespace = GetPropertyValue(namespace,
manifest.Package.Namespace, MANIDESTFILE)
- apiHost = GetPropertyValue(apiHost, manifest.Package.ApiHost,
MANIDESTFILE)
- }
- }
-
- // If the variables are not correctly assigned, we look up auth key and
api host in the command line. The namespace
- // is currently not available in command line, which can be added later.
- apihost, auth, ns := GetCommandLineFlags()
- credential = GetPropertyValue(credential, auth, COMMANDLINE)
- namespace = GetPropertyValue(namespace, ns, COMMANDLINE)
- apiHost = GetPropertyValue(apiHost, apihost, COMMANDLINE)
-
- // Third, we need to look up the variables in .wskprops file.
- pi := whisk.PropertiesImp {
- OsPackage: whisk.OSPackageImp{},
- }
-
- wskprops, _ := GetWskPropFromWskprops(pi, proppath)
- credential = GetPropertyValue(credential, wskprops.AuthKey, WSKPROPS)
- namespace = GetPropertyValue(namespace, wskprops.Namespace, WSKPROPS)
- apiHost = GetPropertyValue(apiHost, wskprops.APIHost, WSKPROPS)
-
- // Fourth, we look up the variables in whisk.properties on a local
openwhisk deployment.
- if len(credential.Value) == 0 || len(apiHost.Value) == 0 {
- // No need to keep the default value for namespace, since both of auth
and apihost are not set after .wskprops.
- // whisk.property will set the default value as well.
- apiHost.Value = ""
- }
- whiskproperty, _ := GetWskPropFromWhiskProperty(pi)
- credential = GetPropertyValue(credential, whiskproperty.AuthKey,
WHISKPROPERTY)
- namespace = GetPropertyValue(namespace, whiskproperty.Namespace,
WHISKPROPERTY)
- apiHost = GetPropertyValue(apiHost, whiskproperty.APIHost, WHISKPROPERTY)
-
- // If we still can not find the variables we need, check if it is
interactive mode. If so, we accept the input
- // from the user. The namespace will be set to a default value, when the
code reaches this line, because WSKPROPS
- // has a default value for namespace.
- if len(apiHost.Value) == 0 && isInteractive == true {
- host, err := promptForValue("\nPlease provide the hostname for
OpenWhisk [default value is openwhisk.ng.bluemix.net]: ")
- utils.Check(err)
- if host == "" {
- host = "openwhisk.ng.bluemix.net"
- }
- apiHost.Value = host
- apiHost.Source = INTERINPUT
- }
-
- if len(credential.Value) == 0 && isInteractive == true {
- cred, err := promptForValue("\nPlease provide an authentication token:
")
- utils.Check(err)
- credential.Value = cred
- credential.Source = INTERINPUT
-
- // The namespace is always associated with the credential. Both of
them should be picked up from the same source.
- if len(namespace.Value) == 0 || namespace.Value ==
whisk.DEFAULT_NAMESPACE {
- ns, err := promptForValue("\nPlease provide a namespace [default
value is guest]: ")
- utils.Check(err)
-
- source := INTERINPUT
- if ns == "" {
- ns = whisk.DEFAULT_NAMESPACE
- source = DEFAULTVALUE
- }
-
- namespace.Value = ns
- namespace.Source = source
- }
- }
-
- var baseURL *url.URL
- baseURL, err := utils.GetURLBase(apiHost.Value)
- if err != nil {
- utils.Check(err)
- }
-
- if len(credential.Value) == 0 {
- errStr := "Missing authentication key"
- err = whisk.MakeWskError(errors.New(errStr),
whisk.EXIT_CODE_ERR_GENERAL, whisk.DISPLAY_MSG, whisk.DISPLAY_USAGE)
- utils.Check(err)
- }
-
- log.Println("The URL is " + baseURL.String() + ", selected from " +
apiHost.Source)
- log.Println("The auth key is set, selected from " + credential.Source)
- log.Println("The namespace is " + namespace.Value + ", selected from " +
namespace.Source)
- clientConfig = &whisk.Config{
- AuthToken: credential.Value, //Authtoken
- Namespace: namespace.Value, //Namespace
- BaseURL: baseURL,
- Host: apiHost.Value,
- Version: "v1",
- Insecure: true, // true if you want to ignore certificate signing
-
- }
-
- // Setup network client
- client, err := CreateNewClient(http.DefaultClient, clientConfig)
- utils.Check(err)
- return client, clientConfig
+ credential := PropertyValue{}
+ namespace := PropertyValue{}
+ apiHost := PropertyValue{}
+
+ // First, we look up the above variables in the deployment file.
+ if utils.FileExists(deploymentPath) {
+ mm := parsers.NewYAMLParser()
+ deployment := mm.ParseDeployment(deploymentPath)
+ credential.Value = deployment.Application.Credential
+ credential.Source = DEPLOYMENTFILE
+ namespace.Value = deployment.Application.Namespace
+ namespace.Source = DEPLOYMENTFILE
+ apiHost.Value = deployment.Application.ApiHost
+ apiHost.Source = DEPLOYMENTFILE
+ }
+
+ if len(credential.Value) == 0 || len(namespace.Value) == 0 ||
len(apiHost.Value) == 0 {
+ if utils.FileExists(manifestPath) {
+ mm := parsers.NewYAMLParser()
+ manifest := mm.ParseManifest(manifestPath)
+ credential = GetPropertyValue(credential,
manifest.Package.Credential, MANIDESTFILE)
+ namespace = GetPropertyValue(namespace,
manifest.Package.Namespace, MANIDESTFILE)
+ apiHost = GetPropertyValue(apiHost,
manifest.Package.ApiHost, MANIDESTFILE)
+ }
+ }
+
+ // If the variables are not correctly assigned, we look up auth key and
api host in the command line. The namespace
+ // is currently not available in command line, which can be added later.
+ apihost, auth, ns := GetCommandLineFlags()
+ credential = GetPropertyValue(credential, auth, COMMANDLINE)
+ namespace = GetPropertyValue(namespace, ns, COMMANDLINE)
+ apiHost = GetPropertyValue(apiHost, apihost, COMMANDLINE)
+
+ // Third, we need to look up the variables in .wskprops file.
+ pi := whisk.PropertiesImp{
+ OsPackage: whisk.OSPackageImp{},
+ }
+
+ wskprops, _ := GetWskPropFromWskprops(pi, proppath)
+ credential = GetPropertyValue(credential, wskprops.AuthKey, WSKPROPS)
+ namespace = GetPropertyValue(namespace, wskprops.Namespace, WSKPROPS)
+ apiHost = GetPropertyValue(apiHost, wskprops.APIHost, WSKPROPS)
+
+ // Fourth, we look up the variables in whisk.properties on a local
openwhisk deployment.
+ if len(credential.Value) == 0 || len(apiHost.Value) == 0 {
+ // No need to keep the default value for namespace, since both
of auth and apihost are not set after .wskprops.
+ // whisk.property will set the default value as well.
+ apiHost.Value = ""
+ }
+ whiskproperty, _ := GetWskPropFromWhiskProperty(pi)
+ credential = GetPropertyValue(credential, whiskproperty.AuthKey,
WHISKPROPERTY)
+ namespace = GetPropertyValue(namespace, whiskproperty.Namespace,
WHISKPROPERTY)
+ apiHost = GetPropertyValue(apiHost, whiskproperty.APIHost,
WHISKPROPERTY)
+
+ // If we still can not find the variables we need, check if it is
interactive mode. If so, we accept the input
+ // from the user. The namespace will be set to a default value, when
the code reaches this line, because WSKPROPS
+ // has a default value for namespace.
+ if len(apiHost.Value) == 0 && isInteractive == true {
+ host, err := promptForValue("\nPlease provide the hostname for
OpenWhisk [default value is openwhisk.ng.bluemix.net]: ")
+ utils.Check(err)
+ if host == "" {
+ host = "openwhisk.ng.bluemix.net"
+ }
+ apiHost.Value = host
+ apiHost.Source = INTERINPUT
+ }
+
+ if len(credential.Value) == 0 && isInteractive == true {
+ cred, err := promptForValue("\nPlease provide an authentication
token: ")
+ utils.Check(err)
+ credential.Value = cred
+ credential.Source = INTERINPUT
+
+ // The namespace is always associated with the credential. Both
of them should be picked up from the same source.
+ if len(namespace.Value) == 0 || namespace.Value ==
whisk.DEFAULT_NAMESPACE {
+ ns, err := promptForValue("\nPlease provide a namespace
[default value is guest]: ")
+ utils.Check(err)
+
+ source := INTERINPUT
+ if ns == "" {
+ ns = whisk.DEFAULT_NAMESPACE
+ source = DEFAULTVALUE
+ }
+
+ namespace.Value = ns
+ namespace.Source = source
+ }
+ }
+
+ var baseURL *url.URL
+ baseURL, err := utils.GetURLBase(apiHost.Value)
+ if err != nil {
+ utils.Check(err)
+ }
+
+ if len(credential.Value) == 0 {
+ errStr := "Missing authentication key"
+ err = whisk.MakeWskError(errors.New(errStr),
whisk.EXIT_CODE_ERR_GENERAL, whisk.DISPLAY_MSG, whisk.DISPLAY_USAGE)
+ utils.Check(err)
+ }
+
+ log.Println("The URL is " + baseURL.String() + ", selected from " +
apiHost.Source)
+ log.Println("The auth key is set, selected from " + credential.Source)
Review comment:
Do not use log, we are getting rid of. Use fmt.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
