Skip to content

optim egctl get httpserver to show port and https #1248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

optim egctl get httpserver to show port and https #1248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57abb46
optim egctl get httpserver
suchen-sci Mar 26, 2024
e125bae
more general print table
suchen-sci Mar 26, 2024
4a60223
fix typo
suchen-sci Mar 26, 2024
735347c
fix sort algorithm
suchen-sci Mar 26, 2024
0c61721
refactor egctl get print table to support more general cases
suchen-sci Mar 26, 2024
417aed6
rename spec for clearity
suchen-sci May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/client/resources/customdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func getCustomDataBatchYaml(args *general.ArgInfo) (string, error) {
return fmt.Sprintf("name: %s\nkind: CustomData\n\n%s", args.Name, yamlStr), nil
}

func editCustomDataItem(cmd *cobra.Command, args *general.ArgInfo) error {
func editCustomDataItem(_ *cobra.Command, args *general.ArgInfo) error {
getErr := func(err error) error {
return general.ErrorMsg(general.EditCmd, err, fmt.Sprintf("%s %s %s", CustomData().Kind, args.Name, args.Other))
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/resources/customdatakind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@ func DeleteCustomDataKind(cmd *cobra.Command, names []string, all bool) error {

// ApplyCustomDataKind applies the custom data kind.
func ApplyCustomDataKind(cmd *cobra.Command, s *general.Spec) error {
checkKindExist := func(cmd *cobra.Command, name string) bool {
checkKindExist := func(_ *cobra.Command, name string) bool {
_, err := httpGetCustomDataKind(name)
return err == nil
}

createOrUpdate := func(cmd *cobra.Command, yamlDoc []byte, exist bool) error {
createOrUpdate := func(_ *cobra.Command, yamlDoc []byte, exist bool) error {
if exist {
_, err := handleReq(http.MethodPut, makePath(general.CustomDataKindURL), yamlDoc)
return err
Expand Down
77 changes: 58 additions & 19 deletions cmd/client/resources/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ type ObjectNamespaceFlags struct {

var globalAPIResources []*api.APIResource

// MetaSpec is the meta spec of an object.
// It contains the basic information of an object and extra information for httpserver.
type MetaSpec struct {
supervisor.MetaSpec `json:",inline"`

// httpserver only
Port int `json:"port"`
HTTPS bool `json:"https"`
}

// ObjectAPIResources returns the object api resources.
func ObjectAPIResources() ([]*api.APIResource, error) {
if globalAPIResources != nil {
Expand Down Expand Up @@ -217,7 +227,7 @@ func GetObject(cmd *cobra.Command, args *general.ArgInfo, kind string, flags *Ob
}

if flags.AllNamespace {
err := unmarshalPrintNamespaceMetaSpec(body, func(m *supervisor.MetaSpec) bool {
err := unmarshalPrintNamespaceMetaSpec(body, func(m *MetaSpec) bool {
return m.Kind == kind
})
if err != nil {
Expand All @@ -226,7 +236,7 @@ func GetObject(cmd *cobra.Command, args *general.ArgInfo, kind string, flags *Ob
return nil
}

err = unmarshalPrintMetaSpec(body, !args.ContainName(), func(m *supervisor.MetaSpec) bool {
err = unmarshalPrintMetaSpec(body, !args.ContainName(), func(m *MetaSpec) bool {
return m.Kind == kind
})
if err != nil {
Expand All @@ -235,7 +245,7 @@ func GetObject(cmd *cobra.Command, args *general.ArgInfo, kind string, flags *Ob
return nil
}

func unmarshalPrintMetaSpec(body []byte, list bool, filter func(*supervisor.MetaSpec) bool) error {
func unmarshalPrintMetaSpec(body []byte, list bool, filter func(*MetaSpec) bool) error {
metas, err := unmarshalMetaSpec(body, list)
if err != nil {
return err
Expand All @@ -250,7 +260,7 @@ func unmarshalPrintMetaSpec(body []byte, list bool, filter func(*supervisor.Meta
return nil
}

func unmarshalPrintNamespaceMetaSpec(body []byte, filter func(*supervisor.MetaSpec) bool) error {
func unmarshalPrintNamespaceMetaSpec(body []byte, filter func(*MetaSpec) bool) error {
allMetas, err := unmarshalNamespaceMetaSpec(body)
if err != nil {
return err
Expand All @@ -272,61 +282,90 @@ func unmarshalPrintNamespaceMetaSpec(body []byte, filter func(*supervisor.MetaSp
return nil
}

func unmarshalMetaSpec(body []byte, listBody bool) ([]*supervisor.MetaSpec, error) {
func unmarshalMetaSpec(body []byte, listBody bool) ([]*MetaSpec, error) {
if listBody {
metas := []*supervisor.MetaSpec{}
metas := []*MetaSpec{}
err := codectool.Unmarshal(body, &metas)
return metas, err
}
meta := &supervisor.MetaSpec{}
meta := &MetaSpec{}
err := codectool.Unmarshal(body, meta)
return []*supervisor.MetaSpec{meta}, err
return []*MetaSpec{meta}, err
}

func unmarshalNamespaceMetaSpec(body []byte) (map[string][]*supervisor.MetaSpec, error) {
res := map[string][]*supervisor.MetaSpec{}
func unmarshalNamespaceMetaSpec(body []byte) (map[string][]*MetaSpec, error) {
res := map[string][]*MetaSpec{}
err := codectool.Unmarshal(body, &res)
return res, err
}

func getAgeFromMetaSpec(meta *supervisor.MetaSpec) string {
func getAgeFromMetaSpec(meta *MetaSpec) string {
createdAt, err := time.Parse(time.RFC3339, meta.CreatedAt)
if err != nil {
return "unknown"
}
return general.DurationMostSignificantUnit(time.Since(createdAt))
}

func printNamespaceMetaSpec(metas map[string][]*supervisor.MetaSpec) {
func printNamespaceMetaSpec(metas map[string][]*MetaSpec) {
// Output:
// NAME KIND NAMESPACE PORT HTTPS AGE
// ...
//
// NAME KIND NAMESPACE AGE
// ...
tableHTTPServer := [][]string{}
tableHTTPServer = append(tableHTTPServer, []string{"NAME", "KIND", "NAMESPACE", "PORT", "HTTPS", "AGE"})
table := [][]string{}
table = append(table, []string{"NAME", "KIND", "NAMESPACE", "AGE"})

defaults := metas[DefaultNamespace]
for _, meta := range defaults {
table = append(table, []string{meta.Name, meta.Kind, DefaultNamespace, getAgeFromMetaSpec(meta)})
if meta.Kind == "HTTPServer" {
tableHTTPServer = append(tableHTTPServer, []string{meta.Name, meta.Kind, DefaultNamespace, strconv.Itoa(meta.Port), strconv.FormatBool(meta.HTTPS), getAgeFromMetaSpec(meta)})
} else {
table = append(table, []string{meta.Name, meta.Kind, DefaultNamespace, getAgeFromMetaSpec(meta)})
}
}

for namespace, metas := range metas {
if namespace == DefaultNamespace {
continue
}
for _, meta := range metas {
table = append(table, []string{meta.Name, meta.Kind, namespace, getAgeFromMetaSpec(meta)})
if meta.Kind == "HTTPServer" {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is common for each object to have its representation, so a well-designed framework is needed to handle the difference.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated, please check

tableHTTPServer = append(tableHTTPServer, []string{meta.Name, meta.Kind, namespace, strconv.Itoa(meta.Port), strconv.FormatBool(meta.HTTPS), getAgeFromMetaSpec(meta)})
} else {
table = append(table, []string{meta.Name, meta.Kind, namespace, getAgeFromMetaSpec(meta)})
}
}
}
general.PrintTable(tableHTTPServer)
fmt.Println("")
general.PrintTable(table)
}

func printMetaSpec(metas []*supervisor.MetaSpec) {
func printMetaSpec(metas []*MetaSpec) {
// Output:
// NAME KIND PORT HTTPS AGE
// ...
//
// NAME KIND AGE
// ...
tableHTTPServer := [][]string{}
tableHTTPServer = append(tableHTTPServer, []string{"NAME", "KIND", "PORT", "HTTPS", "AGE"})

table := [][]string{}
table = append(table, []string{"NAME", "KIND", "AGE"})
for _, meta := range metas {
table = append(table, []string{meta.Name, meta.Kind, getAgeFromMetaSpec(meta)})
if meta.Kind == "HTTPServer" {
tableHTTPServer = append(tableHTTPServer, []string{meta.Name, meta.Kind, strconv.Itoa(meta.Port), strconv.FormatBool(meta.HTTPS), getAgeFromMetaSpec(meta)})
} else {
table = append(table, []string{meta.Name, meta.Kind, getAgeFromMetaSpec(meta)})
}
}
general.PrintTable(tableHTTPServer)
fmt.Println("")
general.PrintTable(table)
}

Expand Down Expand Up @@ -480,7 +519,7 @@ func DeleteObject(cmd *cobra.Command, kind string, names []string, all bool) err
if err != nil {
return getErr(err)
}
metas = general.Filter(metas, func(m *supervisor.MetaSpec) bool {
metas = general.Filter(metas, func(m *MetaSpec) bool {
return m.Kind == kind
})

Expand Down Expand Up @@ -514,12 +553,12 @@ func DeleteObject(cmd *cobra.Command, kind string, names []string, all bool) err

// ApplyObject applies an object.
func ApplyObject(cmd *cobra.Command, s *general.Spec) error {
checkObjExist := func(cmd *cobra.Command, name string) bool {
checkObjExist := func(_ *cobra.Command, name string) bool {
_, err := httpGetObject(name, nil)
return err == nil
}

createOrUpdate := func(cmd *cobra.Command, s *general.Spec, exist bool) error {
createOrUpdate := func(_ *cobra.Command, s *general.Spec, exist bool) error {
if exist {
_, err := handleReq(http.MethodPut, makePath(general.ObjectItemURL, s.Name), []byte(s.Doc()))
return err
Expand Down