From 52b5cb09027c6fd3b64cdfabc8580e3b01eb695f Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Mon, 28 Oct 2019 19:34:02 +0800 Subject: [PATCH] Remove UID from CLI output (#1361) --- pkg/fission-cli/cmd/environment/get.go | 6 +++--- pkg/fission-cli/cmd/environment/list.go | 6 +++--- pkg/fission-cli/function.go | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkg/fission-cli/cmd/environment/get.go b/pkg/fission-cli/cmd/environment/get.go index f83c179c..cf5566d6 100644 --- a/pkg/fission-cli/cmd/environment/get.go +++ b/pkg/fission-cli/cmd/environment/get.go @@ -49,9 +49,9 @@ func (opts *GetSubCommand) do(flags cli.Input) error { w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0) - fmt.Fprintf(w, "%v\t%v\t%v\n", "NAME", "UID", "IMAGE") - fmt.Fprintf(w, "%v\t%v\t%v\n", - env.Metadata.Name, env.Metadata.UID, env.Spec.Runtime.Image) + fmt.Fprintf(w, "%v\t%v\n", "NAME", "IMAGE") + fmt.Fprintf(w, "%v\t%v\n", + env.Metadata.Name, env.Spec.Runtime.Image) w.Flush() return nil diff --git a/pkg/fission-cli/cmd/environment/list.go b/pkg/fission-cli/cmd/environment/list.go index 0dbe67a4..47ab02d8 100644 --- a/pkg/fission-cli/cmd/environment/list.go +++ b/pkg/fission-cli/cmd/environment/list.go @@ -45,10 +45,10 @@ func (opts *ListSubCommand) do(flags cli.Input) error { util.CheckErr(err, "list environments") w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0) - fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "UID", "IMAGE", "BUILDER_IMAGE", "POOLSIZE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY", "EXTNET", "GRACETIME") + fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "IMAGE", "BUILDER_IMAGE", "POOLSIZE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY", "EXTNET", "GRACETIME") for _, env := range envs { - fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", - env.Metadata.Name, env.Metadata.UID, env.Spec.Runtime.Image, env.Spec.Builder.Image, env.Spec.Poolsize, + fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", + env.Metadata.Name, env.Spec.Runtime.Image, env.Spec.Builder.Image, env.Spec.Poolsize, env.Spec.Resources.Requests.Cpu(), env.Spec.Resources.Limits.Cpu(), env.Spec.Resources.Requests.Memory(), env.Spec.Resources.Limits.Memory(), env.Spec.AllowAccessToExternalNetwork, env.Spec.TerminationGracePeriod) diff --git a/pkg/fission-cli/function.go b/pkg/fission-cli/function.go index 71c1e52c..8928430c 100644 --- a/pkg/fission-cli/function.go +++ b/pkg/fission-cli/function.go @@ -464,9 +464,8 @@ func fnGetMeta(c *cli.Context) error { util.CheckErr(err, "get function") w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0) - fmt.Fprintf(w, "%v\t%v\t%v\n", "NAME", "UID", "ENV") - fmt.Fprintf(w, "%v\t%v\t%v\n", - f.Metadata.Name, f.Metadata.UID, f.Spec.Environment.Name) + fmt.Fprintf(w, "%v\t%v\n", "NAME", "ENV") + fmt.Fprintf(w, "%v\t%v\n", f.Metadata.Name, f.Spec.Environment.Name) w.Flush() return err } @@ -707,12 +706,12 @@ func fnList(c *cli.Context) error { w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0) - fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "UID", "ENV", "EXECUTORTYPE", "MINSCALE", "MAXSCALE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY", "TARGETCPU") + fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "ENV", "EXECUTORTYPE", "MINSCALE", "MAXSCALE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY", "TARGETCPU") for _, f := range fns { mincpu := f.Spec.Resources.Requests.Cpu mincpu().Value() - fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", - f.Metadata.Name, f.Metadata.UID, f.Spec.Environment.Name, + fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", + f.Metadata.Name, f.Spec.Environment.Name, f.Spec.InvokeStrategy.ExecutionStrategy.ExecutorType, f.Spec.InvokeStrategy.ExecutionStrategy.MinScale, f.Spec.InvokeStrategy.ExecutionStrategy.MaxScale,