extension: choose language first, supported categories per launage

Signed-off-by: mathetake <[email protected]>

Author: mathetake

pkg/cmd/extension/init/cmd.go

@@ -27,10 +27,16 @@ import (
 
 var (
 	// extension categories supported by the `init` command.
-	supportedCategories = options{
-		{Value: extension.EnvoyHTTPFilter.String(), DisplayText: "HTTP Filter"},
-		{Value: extension.EnvoyNetworkFilter.String(), DisplayText: "Network Filter"},
-		{Value: extension.EnvoyAccessLogger.String(), DisplayText: "Access Logger"},
+	supportedCategories = map[string]options{
+		extension.LanguageRust.String(): {
+			{Value: extension.EnvoyHTTPFilter.String(), DisplayText: "HTTP Filter"},
+			{Value: extension.EnvoyNetworkFilter.String(), DisplayText: "Network Filter"},
+			{Value: extension.EnvoyAccessLogger.String(), DisplayText: "Access Logger"},
+		},
+		extension.LanguageTinyGo.String(): {
+			{Value: extension.EnvoyHTTPFilter.String(), DisplayText: "HTTP Filter"},
+			{Value: extension.EnvoyNetworkFilter.String(), DisplayText: "Network Filter"},
+		},
 	}
 	// programming languages supported by the `init` command.
 	supportedLanguages = options{
@@ -119,9 +125,14 @@ Scaffold a new Envoy extension in a language of your choice.`,
 			return scaffold.Scaffold(opts)
 		},
 	}
-	cmd.PersistentFlags().StringVar(&params.Category.Value, "category", "", "Choose extension category. "+hintOneOf(supportedCategories.Values()...))
-	cmd.PersistentFlags().StringVar(&params.Language.Value, "language", "", "Choose programming language. "+hintOneOf(supportedLanguages.Values()...))
-	cmd.PersistentFlags().StringVar(&params.Name.Value, "name", "", `Choose extension name, e.g. "mycompany.filters.http.custom_metrics"`)
+	cmd.PersistentFlags().StringVar(&params.Language.Value,
+		"language", "",
+		"Choose programming language. "+hintOneOf(supportedLanguages.Values()...))
+	cmd.PersistentFlags().StringVar(&params.Category.Value,
+		"category", "",
+		"Choose extension category. "+hintOneOf(supportedCategories[params.Language.Value].Values()...))
+	cmd.PersistentFlags().StringVar(&params.Name.Value,
+		"name", "", `Choose extension name, e.g. "mycompany.filters.http.custom_metrics"`)
 	return cmd
 }
 

pkg/cmd/extension/init/cmd_test.go

@@ -75,14 +75,14 @@ var _ = Describe("getenvoy extension init", func() {
 				Expect(stderr.String()).To(Equal(given.expectedStdErr))
 			},
 			Entry("extension category is missing", give(testCase{
-				args: []string{},
+				args: []string{"--language", "rust"},
 				expectedStdErr: `Error: extension category cannot be empty
 
 Run 'getenvoy extension init --help' for usage.
 `,
 			})),
 			Entry("extension category is not valid", give(testCase{
-				args: []string{"--category", "invalid.category"},
+				args: []string{"--language", "rust", "--category", "invalid.category"},
 				expectedStdErr: `Error: "invalid.category" is not a supported extension category
 
 Run 'getenvoy extension init --help' for usage.

pkg/cmd/extension/init/params.go

@@ -43,10 +43,10 @@ func (p *param) IsValid() bool {
 
 // params represents all parameters to be filled in by a user.
 type params struct {
-	Category  param
-	Language  param
-	OutputDir param
-	Name      param
+	Category  *param
+	Language  *param
+	OutputDir *param
+	Name      *param
 }
 
 func (o *params) Validate() error {
@@ -85,32 +85,38 @@ func (o *params) DefaultName() {
 
 //nolint:gocyclo
 func newParams() *params {
+	language := &param{
+		Title: "Language",
+		Validator: func(value string) error {
+			if value == "" {
+				return errors.New("programming language cannot be empty")
+			}
+			if !supportedLanguages.Contains(value) {
+				return errors.Errorf("%q is not a supported programming language", value)
+			}
+			return nil
+		},
+	}
 	return &params{
-		Category: param{
+		Category: &param{
 			Title: "Category",
 			Validator: func(value string) error {
+				if err := language.Validate(); err != nil {
+					// fmt.Println(err)
+					return err
+				}
+
 				if value == "" {
 					return errors.New("extension category cannot be empty")
 				}
-				if !supportedCategories.Contains(value) {
+				if !supportedCategories[language.Value].Contains(value) {
 					return errors.Errorf("%q is not a supported extension category", value)
 				}
 				return nil
 			},
 		},
-		Language: param{
-			Title: "Language",
-			Validator: func(value string) error {
-				if value == "" {
-					return errors.New("programming language cannot be empty")
-				}
-				if !supportedLanguages.Contains(value) {
-					return errors.Errorf("%q is not a supported programming language", value)
-				}
-				return nil
-			},
-		},
-		OutputDir: param{
+		Language: language,
+		OutputDir: &param{
 			Title: "Output directory",
 			Validator: func(value string) error {
 				outputDir, err := scaffold.NormalizeOutputPath(value)
@@ -137,7 +143,7 @@ func newParams() *params {
 				return nil
 			},
 		},
-		Name: param{
+		Name: &param{
 			Title: "Extension name",
 			Validator: func(value string) error {
 				if value == "" {

pkg/cmd/extension/init/wizard.go

@@ -59,16 +59,16 @@ type promptOpts struct {
 // Fill runs the interactive UI to help a user to fill in parameters.
 func (w *wizard) Fill(params *params) error {
 	w.out.Println(uiutil.Underline("What kind of extension would you like to create?"))
-	if err := w.choose(&params.Category, supportedCategories, w.newCategorySelector); err != nil {
+	if err := w.choose(params.Language, supportedLanguages, w.newLanguageSelector); err != nil {
 		return err
 	}
-	if err := w.choose(&params.Language, supportedLanguages, w.newLanguageSelector); err != nil {
+	if err := w.choose(params.Category, supportedCategories[params.Language.Value], w.newCategorySelector); err != nil {
 		return err
 	}
-	if err := w.prompt(&params.OutputDir, w.newOutputDirPrompt, promptOpts{}); err != nil {
+	if err := w.prompt(params.OutputDir, w.newOutputDirPrompt, promptOpts{}); err != nil {
 		return err
 	}
-	if err := w.prompt(&params.Name, w.newNamePrompt, promptOpts{init: params.DefaultName}); err != nil {
+	if err := w.prompt(params.Name, w.newNamePrompt, promptOpts{init: params.DefaultName}); err != nil {
 		return err
 	}
 	w.out.Println("Great! Let me help you with that!")

pkg/cmd/extension/init/wizard_test.go

@@ -75,8 +75,8 @@ var _ = Describe("interactive mode", func() {
 					return testCase{
 						noColors: true,
 						expected: fmt.Sprintf(`What kind of extension would you like to create?
-* Category HTTP Filter
 * Language Rust
+* Category HTTP Filter
 * Output directory %s
 * Extension name mycompany.filters.http.custom_metrics
 Great! Let me help you with that!
@@ -88,8 +88,8 @@ Great! Let me help you with that!
 					return testCase{
 						noColors: false,
 						expected: "\x1b[4mWhat kind of extension would you like to create?\x1b[0m\n" +
-							"\x1b[32m✔\x1b[0m \x1b[3mCategory\x1b[0m \x1b[2mHTTP Filter\x1b[0m\n" +
 							"\x1b[32m✔\x1b[0m \x1b[3mLanguage\x1b[0m \x1b[2mRust\x1b[0m\n" +
+							"\x1b[32m✔\x1b[0m \x1b[3mCategory\x1b[0m \x1b[2mHTTP Filter\x1b[0m\n" +
 							fmt.Sprintf("\x1b[32m✔\x1b[0m \x1b[3mOutput directory\x1b[0m \x1b[2m%s\x1b[0m\n", tmpDir) +
 							"\x1b[32m✔\x1b[0m \x1b[3mExtension name\x1b[0m \x1b[2mmycompany.filters.http.custom_metrics\x1b[0m\n" +
 							"Great! Let me help you with that!\n" +