Skip to content

fix: show non-existent plugin config #847

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

Merged
IronCore864 merged 1 commit into from
Jul 21, 2022
Merged

fix: show non-existent plugin config #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions cmd/devstream/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ Examples:
Run: showStatusCMDFunc,
}

func showConfigCMDFunc(cmd *cobra.Command, args []string) {
func showConfigCMDFunc(_ *cobra.Command, _ []string) {
log.Debug("Show configuration information.")
if err := config.Show(); err != nil {
log.Fatal(err)
}
}

func showStatusCMDFunc(cmd *cobra.Command, args []string) {
func showStatusCMDFunc(_ *cobra.Command, _ []string) {
log.Debug("Show status information.")
if err := status.Show(configFile); err != nil {
log.Fatal(err)
Expand All @@ -61,7 +61,7 @@ func init() {
showCMD.AddCommand(showStatusCMD)

showConfigCMD.Flags().StringVarP(&plugin, "plugin", "p", "", "specify name with the plugin")
showConfigCMD.Flags().StringVarP(&template, "template", "t", "quickstart", "print a template config, e.g. quickstart/gitops/...")
showConfigCMD.Flags().StringVarP(&template, "template", "t", "", "print a template config, e.g. quickstart/gitops/...")
completion.FlagPluginsCompletion(showConfigCMD, "plugin")

showStatusCMD.Flags().StringVarP(&plugin, "plugin", "p", "", "specify name with the plugin")
Expand Down
18 changes: 12 additions & 6 deletions internal/pkg/show/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,21 @@ import (
"github.com/spf13/viper"
)

var templates = map[string]string{
"quickstart": QuickStart,
"gitops": GitOps,
}

//go:generate go run gen_embed_var.go
func Show() error {
// at first, check is template arg is set
template := viper.GetString("template")
if template == "quickstart" {
fmt.Println(QuickStart)
return nil
} else if template == "gitops" {
fmt.Println(GitOps)
return nil
if template != "" {
if tmpl, ok := templates[template]; ok {
fmt.Println(tmpl)
return nil
}
return fmt.Errorf("illegal template name : < %s >", template)
}

plugin := viper.GetString("plugin")
Expand Down