extension e2e: fix e2e tuples

mathetake · mathetake · commit 0bb6003bc5ee · 2020-09-22T14:18:14.000+09:00
Signed-off-by: mathetake &lt;takeshi@tetrate.io&gt;
diff --git a/pkg/cmd/extension/init/cmd.go b/pkg/cmd/extension/init/cmd.go
@@ -27,19 +27,19 @@ import (
 
 var (
 	// extension categories supported by the `init` command.
-	supportedCategories = map[string]options{
+	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"},
+			// {Value: extension.EnvoyNetworkFilter.String(), DisplayText: "Network Filter"},
 		},
 	}
 	// programming languages supported by the `init` command.
-	supportedLanguages = options{
+	SupportedLanguages = options{
 		{Value: extension.LanguageRust.String(), DisplayText: "Rust"},
 		{Value: extension.LanguageTinyGo.String(), DisplayText: "TinyGo"},
 	}
@@ -127,10 +127,10 @@ Scaffold a new Envoy extension in a language of your choice.`,
 	}
 	cmd.PersistentFlags().StringVar(&params.Language.Value,
 		"language", "",
-		"Choose programming language. "+hintOneOf(supportedLanguages.Values()...))
+		"Choose programming language. "+hintOneOf(SupportedLanguages.Values()...))
 	cmd.PersistentFlags().StringVar(&params.Category.Value,
 		"category", "",
-		"Choose extension category. "+hintOneOf(supportedCategories[params.Language.Value].Values()...))
+		"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
diff --git a/pkg/cmd/extension/init/params.go b/pkg/cmd/extension/init/params.go
@@ -91,7 +91,7 @@ func newParams() *params {
 			if value == "" {
 				return errors.New("programming language cannot be empty")
 			}
-			if !supportedLanguages.Contains(value) {
+			if !SupportedLanguages.Contains(value) {
 				return errors.Errorf("%q is not a supported programming language", value)
 			}
 			return nil
@@ -102,14 +102,13 @@ func newParams() *params {
 			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[language.Value].Contains(value) {
+				if !SupportedCategories[language.Value].Contains(value) {
 					return errors.Errorf("%q is not a supported extension category", value)
 				}
 				return nil
diff --git a/pkg/cmd/extension/init/wizard.go b/pkg/cmd/extension/init/wizard.go
@@ -59,10 +59,10 @@ 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.Language, supportedLanguages, w.newLanguageSelector); err != nil {
+	if err := w.choose(params.Language, SupportedLanguages, w.newLanguageSelector); err != nil {
 		return err
 	}
-	if err := w.choose(params.Category, supportedCategories[params.Language.Value], w.newCategorySelector); 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 {
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -54,6 +54,7 @@ var _ = BeforeEach(func() {
 })
 
 var _ = AfterEach(func() {
+	GetEnvoy("extension clean")
 	if tempDir != "" {
 		Expect(os.RemoveAll(tempDir)).To(Succeed())
 	}
diff --git a/test/e2e/getenvoy_extension_build_test.go b/test/e2e/getenvoy_extension_build_test.go
@@ -50,8 +50,8 @@ var _ = Describe("getenvoy extension build", func() {
 			By("running `extension init` command")
 			_, _, err := GetEnvoy("extension init").
 				Arg(outputDir).
-				Arg("--category").Arg(given.Category.String()).
-				Arg("--language").Arg(given.Language.String()).
+				Arg("--category").Arg(given.Category).
+				Arg("--language").Arg(given.Language).
 				Arg("--name").Arg(extensionName).
 				Exec()
 			Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/getenvoy_extension_examples_test.go b/test/e2e/getenvoy_extension_examples_test.go
@@ -47,8 +47,8 @@ var _ = Describe("getenvoy extension examples", func() {
 			By("running `extension init` command")
 			_, _, err := GetEnvoy("extension init").
 				Arg(outputDir).
-				Arg("--category").Arg(given.Category.String()).
-				Arg("--language").Arg(given.Language.String()).
+				Arg("--category").Arg(given.Category).
+				Arg("--language").Arg(given.Language).
 				Arg("--name").Arg(extensionName).
 				Exec()
 			Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/getenvoy_extension_init_test.go b/test/e2e/getenvoy_extension_init_test.go
@@ -53,8 +53,8 @@ var _ = Describe("getenvoy extension init", func() {
 		workspace, err := workspaces.GetWorkspaceAt(outputDir)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(workspace.GetExtensionDescriptor().Name).To(Equal(extensionName))
-		Expect(workspace.GetExtensionDescriptor().Category).To(Equal(given.Category))
-		Expect(workspace.GetExtensionDescriptor().Language).To(Equal(given.Language))
+		Expect(workspace.GetExtensionDescriptor().Category.String()).To(Equal(given.Category))
+		Expect(workspace.GetExtensionDescriptor().Language.String()).To(Equal(given.Language))
 	}
 
 	DescribeTable("should create extension in a new directory",
@@ -65,8 +65,8 @@ var _ = Describe("getenvoy extension init", func() {
 			By("running `extension init` command")
 			stdout, stderr, err := GetEnvoy("extension init").
 				Arg(outputDir).
-				Arg("--category").Arg(given.Category.String()).
-				Arg("--language").Arg(given.Language.String()).
+				Arg("--category").Arg(given.Category).
+				Arg("--language").Arg(given.Language).
 				Arg("--name").Arg(extensionName).
 				Exec()
 			Expect(err).NotTo(HaveOccurred())
@@ -91,8 +91,8 @@ var _ = Describe("getenvoy extension init", func() {
 
 			By("running `extension init` command")
 			stdout, stderr, err := GetEnvoy("extension init").
-				Arg("--category").Arg(given.Category.String()).
-				Arg("--language").Arg(given.Language.String()).
+				Arg("--category").Arg(given.Category).
+				Arg("--language").Arg(given.Language).
 				Arg("--name").Arg(extensionName).
 				Exec()
 			Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/getenvoy_extension_run_test.go b/test/e2e/getenvoy_extension_run_test.go
@@ -103,8 +103,8 @@ var _ = Describe("getenvoy extension run", func() {
 			By("running `extension init` command")
 			_, _, err := GetEnvoy("extension init").
 				Arg(outputDir).
-				Arg("--category").Arg(given.Category.String()).
-				Arg("--language").Arg(given.Language.String()).
+				Arg("--category").Arg(given.Category).
+				Arg("--language").Arg(given.Language).
 				Arg("--name").Arg(extensionName).
 				Exec()
 			Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/getenvoy_extension_test_test.go b/test/e2e/getenvoy_extension_test_test.go
@@ -47,8 +47,8 @@ var _ = Describe("getenvoy extension test", func() {
 			By("running `extension init` command")
 			_, _, err := GetEnvoy("extension init").
 				Arg(outputDir).
-				Arg("--category").Arg(given.Category.String()).
-				Arg("--language").Arg(given.Language.String()).
+				Arg("--category").Arg(given.Category).
+				Arg("--language").Arg(given.Language).
 				Arg("--name").Arg(extensionName).
 				Exec()
 			Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/util/data.go b/test/e2e/util/data.go
@@ -17,14 +17,13 @@ package util
 import (
 	"fmt"
 
-	"github.com/tetratelabs/getenvoy/pkg/extension/workspace/config/extension"
+	cmdinit "github.com/tetratelabs/getenvoy/pkg/cmd/extension/init"
 )
 
 // CategoryLanguageTuple represents a combination of extension category and
 // programming language.
 type CategoryLanguageTuple struct {
-	extension.Category
-	extension.Language
+	Category, Language string
 }
 
 func (t CategoryLanguageTuple) String() string {
@@ -35,9 +34,9 @@ func (t CategoryLanguageTuple) String() string {
 // extension category with a supported programming language.
 func GetCategoryLanguageCombinations() []CategoryLanguageTuple {
 	tuples := make([]CategoryLanguageTuple, 0)
-	for _, category := range extension.Categories {
-		for _, language := range extension.Languages {
-			tuples = append(tuples, CategoryLanguageTuple{category, language})
+	for _, lang := range cmdinit.SupportedLanguages {
+		for _, category := range cmdinit.SupportedCategories[lang.Value] {
+			tuples = append(tuples, CategoryLanguageTuple{category.Value, lang.Value})
 		}
 	}
 	return tuples

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func newParams() *params {`
`91`	`91`	`if value == "" {`
`92`	`92`	`return errors.New("programming language cannot be empty")`
`93`	`93`	`}`
`94`		`- if !supportedLanguages.Contains(value) {`
	`94`	`+ if !SupportedLanguages.Contains(value) {`
`95`	`95`	`return errors.Errorf("%q is not a supported programming language", value)`
`96`	`96`	`}`
`97`	`97`	`return nil`
`@@ -102,14 +102,13 @@ func newParams() *params {`
`102`	`102`	`Title: "Category",`
`103`	`103`	`Validator: func(value string) error {`
`104`	`104`	`if err := language.Validate(); err != nil {`
`105`		`- // fmt.Println(err)`
`106`	`105`	`return err`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`if value == "" {`
`110`	`109`	`return errors.New("extension category cannot be empty")`
`111`	`110`	`}`
`112`		`- if !supportedCategories[language.Value].Contains(value) {`
	`111`	`+ if !SupportedCategories[language.Value].Contains(value) {`
`113`	`112`	`return errors.Errorf("%q is not a supported extension category", value)`
`114`	`113`	`}`
`115`	`114`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,10 @@ type promptOpts struct {`
`59`	`59`	`// Fill runs the interactive UI to help a user to fill in parameters.`
`60`	`60`	`func (w wizard) Fill(params params) error {`
`61`	`61`	`w.out.Println(uiutil.Underline("What kind of extension would you like to create?"))`
`62`		`- if err := w.choose(params.Language, supportedLanguages, w.newLanguageSelector); err != nil {`
	`62`	`+ if err := w.choose(params.Language, SupportedLanguages, w.newLanguageSelector); err != nil {`
`63`	`63`	`return err`
`64`	`64`	`}`
`65`		`- if err := w.choose(params.Category, supportedCategories[params.Language.Value], w.newCategorySelector); err != nil {`
	`65`	`+ if err := w.choose(params.Category, SupportedCategories[params.Language.Value], w.newCategorySelector); err != nil {`
`66`	`66`	`return err`
`67`	`67`	`}`
`68`	`68`	`if err := w.prompt(params.OutputDir, w.newOutputDirPrompt, promptOpts{}); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ var _ = BeforeEach(func() {`
`54`	`54`	`})`
`55`	`55`
`56`	`56`	`var _ = AfterEach(func() {`
	`57`	`+ GetEnvoy("extension clean")`
`57`	`58`	`if tempDir != "" {`
`58`	`59`	`Expect(os.RemoveAll(tempDir)).To(Succeed())`
`59`	`60`	`}`