Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix utility function uses the wrong flag text to get value (#1368)

Browse Source 
The utility function GetMetadata uses wrong flag text to get the resource namespace and could cause the wrong results returned from the API server. This PR changes the function signature that allows users to pass in the flag text in order to get the correct value.
This commit is contained in:
Ta-Ching Chen
2019-11-01 00:59:50 +08:00
committed by GitHub
parent fe02bb1678
commit 2b616ec4e2
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/environment/create.go
+1 -1
View File
@@ -65,7 +65,7 @@ func (opts *CreateSubCommand) complete(flags cli.Input) error {
// run write the resource to a spec file or create a fission CRD with remote fission server.
// It also prints warning/error if necessary.
func (opts *CreateSubCommand) run(flags cli.Input) error {
m, err := cmd.GetMetadata(flags)
m, err := cmd.GetMetadata(cmd.RESOURCE_NAME, cmd.ENVIRONMENT_NAMESPACE, flags)
if err != nil {
return err
}
pkg/fission-cli/cmd/environment/delete.go
+3 -3
View File
@@ -21,7 +21,7 @@ import (
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
cmdutils "github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/util"
)
@@ -31,13 +31,13 @@ type DeleteSubCommand struct {
func Delete(flags cli.Input) error {
opts := DeleteSubCommand{
client: cmdutils.GetServer(flags),
client: cmd.GetServer(flags),
}
return opts.do(flags)
}
func (opts *DeleteSubCommand) do(flags cli.Input) error {
m, err := cmdutils.GetMetadata(flags)
m, err := cmd.GetMetadata(cmd.RESOURCE_NAME, cmd.ENVIRONMENT_NAMESPACE, flags)
if err != nil {
return err
}
pkg/fission-cli/cmd/environment/get.go
+3 -3
View File
@@ -23,7 +23,7 @@ import (
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
cmdutils "github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/util"
)
@@ -33,13 +33,13 @@ type GetSubCommand struct {
func Get(flags cli.Input) error {
opts := GetSubCommand{
client: cmdutils.GetServer(flags),
client: cmd.GetServer(flags),
}
return opts.do(flags)
}
func (opts *GetSubCommand) do(flags cli.Input) error {
m, err := cmdutils.GetMetadata(flags)
m, err := cmd.GetMetadata(cmd.RESOURCE_NAME, cmd.ENVIRONMENT_NAMESPACE, flags)
if err != nil {
return err
}
pkg/fission-cli/cmd/environment/list.go
+3 -3
View File
@@ -23,7 +23,7 @@ import (
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
cmdutils "github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/util"
)
@@ -33,13 +33,13 @@ type ListSubCommand struct {
func List(flags cli.Input) error {
opts := ListSubCommand{
client: cmdutils.GetServer(flags),
client: cmd.GetServer(flags),
}
return opts.do(flags)
}
func (opts *ListSubCommand) do(flags cli.Input) error {
envNamespace := flags.String(cmdutils.ENVIRONMENT_NAMESPACE)
envNamespace := flags.String(cmd.ENVIRONMENT_NAMESPACE)
envs, err := opts.client.EnvironmentList(envNamespace)
util.CheckErr(err, "list environments")
pkg/fission-cli/cmd/environment/update.go
+1 -1
View File
@@ -50,7 +50,7 @@ func (opts *UpdateSubCommand) do(flags cli.Input) error {
}
func (opts *UpdateSubCommand) complete(flags cli.Input) error {
m, err := cmd.GetMetadata(flags)
m, err := cmd.GetMetadata(cmd.RESOURCE_NAME, cmd.ENVIRONMENT_NAMESPACE, flags)
if err != nil {
return err
}
pkg/fission-cli/cmd/util.go
+5 -5
View File
@@ -125,14 +125,14 @@ func GetSpecDir(flags cli.Input) string {
return specDir
}
// GetMetadata returns a pointer to ObjectMeta which initialized with command line input.
func GetMetadata(flags cli.Input) (*metav1.ObjectMeta, error) {
name := flags.String(RESOURCE_NAME)
// GetMetadata returns a pointer to ObjectMeta that is populated with resource name and namespace given by the user.
func GetMetadata(nameFlagText string, namespaceFlagText string, flags cli.Input) (*metav1.ObjectMeta, error) {
name := flags.String(nameFlagText)
if len(name) == 0 {
return nil, errors.New("Need a resource name, use --name.")
return nil, errors.New("need a resource name, use --name")
}
ns := flags.String(ENVIRONMENT_NAMESPACE)
ns := flags.String(namespaceFlagText)
m := &metav1.ObjectMeta{
Name: name,