extension e2e: cleanup for readonly GOMODCACHE dir

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

pkg/cmd/extension/init/cmd.go

@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	// extension categories supported by the `init` command.
+	// SupportedCategories ... extension categories supported by the `init` command for each language.
 	SupportedCategories = map[string]options{
 		extension.LanguageRust.String(): {
 			{Value: extension.EnvoyHTTPFilter.String(), DisplayText: "HTTP Filter"},
@@ -38,7 +38,7 @@ var (
 			// {Value: extension.EnvoyNetworkFilter.String(), DisplayText: "Network Filter"},
 		},
 	}
-	// programming languages supported by the `init` command.
+	// SupportedLanguages ... programming languages supported by the `init` command.
 	SupportedLanguages = options{
 		{Value: extension.LanguageRust.String(), DisplayText: "Rust"},
 		{Value: extension.LanguageTinyGo.String(), DisplayText: "TinyGo"},

pkg/cmd/extension/init/options.go

@@ -21,15 +21,15 @@ type option struct {
 }
 
 // options represents an exhaustive list of valid configuration values.
-type options []option
+type options []*option
 
 func (o options) Contains(value string) bool {
 	return o.IndexOf(value) >= 0
 }
 
 func (o options) ByValue(value string) *option {
 	if i := o.IndexOf(value); i >= 0 {
-		return &o[i]
+		return o[i]
 	}
 	return nil
 }

test/e2e/e2e_suite_test.go

@@ -54,8 +54,14 @@ var _ = BeforeEach(func() {
 })
 
 var _ = AfterEach(func() {
-	GetEnvoy("extension clean")
 	if tempDir != "" {
 		Expect(os.RemoveAll(tempDir)).To(Succeed())
 	}
 })
+
+func cleanUpExtensionDir(dir string) {
+	Expect(os.Chdir(dir)).To(Succeed())
+	clean := GetEnvoy("extension clean")
+	_, _, err := clean.Exec()
+	Expect(err).To(Succeed())
+}

test/e2e/getenvoy_extension_build_test.go

@@ -78,6 +78,7 @@ var _ = Describe("getenvoy extension build", func() {
 			toolchain, err := toolchains.LoadToolchain(toolchains.Default, workspace)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(toolchain).NotTo(BeNil())
+			cleanUpExtensionDir(outputDir)
 		},
 		testCases()...,
 	)

test/e2e/getenvoy_extension_examples_test.go

@@ -120,6 +120,7 @@ default
 
 Use "getenvoy extension examples add --help" for more information on how to add one.
 `))
+			cleanUpExtensionDir(outputDir)
 		},
 		testCases()...,
 	)

test/e2e/getenvoy_extension_init_test.go

@@ -102,6 +102,7 @@ var _ = Describe("getenvoy extension init", func() {
 
 			By("verifying output directory")
 			VerifyOutputDir(given, outputDir)
+			cleanUpExtensionDir(outputDir)
 		},
 		testCases()...,
 	)

test/e2e/getenvoy_extension_run_test.go

@@ -189,6 +189,7 @@ var _ = Describe("getenvoy extension run", func() {
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Expect(dumpFiles).To(ContainElements("config_dump.json", "stats.json"))
+			cleanUpExtensionDir(outputDir)
 		},
 		testCases()...,
 	)

test/e2e/getenvoy_extension_test_test.go

@@ -67,6 +67,7 @@ var _ = Describe("getenvoy extension test", func() {
 			// apparently, use of `-t` option in `docker run` causes stderr to be incorporated into stdout
 			Expect(stdout).NotTo(BeEmpty())
 			Expect(stderr).To(BeEmpty())
+			cleanUpExtensionDir(outputDir)
 		},
 		testCases()...,
 	)