fix: commands in main

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

.gitignore

@@ -1,2 +1,3 @@
 .tools/
 website/site/
+kyverno-envoy-plugin

Makefile

@@ -108,6 +108,18 @@ vet: ## Run go vet
 	@echo Go vet... >&2
 	@go vet ./...
 
+#########
+# BUILD #
+#########
+
+.PHONY: build
+build: ## Build
+build: fmt
+build: vet
+build:
+	@echo "Build..." >&2
+	@LD_FLAGS=$(LD_FLAGS) go build .
+
 ##############
 # BUILD (KO) #
 ##############
@@ -118,8 +130,7 @@ build-ko: fmt
 build-ko: vet
 build-ko: $(KO)
 	@echo "Build Docker image with ko..." >&2
-	@LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(KO_REGISTRY) \
-		$(KO) build . --preserve-import-paths --tags=$(KO_TAGS)
+	@LD_FLAGS=$(LD_FLAGS) KO_DOCKER_REPO=$(KO_REGISTRY) $(KO) build . --preserve-import-paths --tags=$(KO_TAGS)
 
 ########
 # TEST #

main.go

@@ -8,35 +8,33 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var policies []string
-var address string
-var healthaddress string
-
-func init() {
-	serveCmd.Flags().StringSliceVar(&policies, "policy", nil, "Path to kyverno-json policies")
-	serveCmd.Flags().StringVar(&address, "address", ":9000", "Address to listen on")
-	serveCmd.Flags().StringVar(&healthaddress, "healthaddress", ":8181", "Address to listen on for health checks")
-}
-
-var serveCmd = &cobra.Command{
-	Use:   "serve",
-	Short: "Start the kyverno-envoy-plugin server",
-	Run: func(cmd *cobra.Command, args []string) {
-		srv := server.NewServers(policies, address, healthaddress)
-		server.StartServers(srv)
-	},
+func main() {
+	root := setup()
+	if err := root.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 }
 
-func main() {
-	var rootCmd = &cobra.Command{
+func setup() *cobra.Command {
+	var policies []string
+	var address string
+	var healthaddress string
+	serve := &cobra.Command{
+		Use:   "serve",
+		Short: "Start the kyverno-envoy-plugin server",
+		Run: func(cmd *cobra.Command, args []string) {
+			srv := server.NewServers(policies, address, healthaddress)
+			server.StartServers(srv)
+		},
+	}
+	serve.Flags().StringSliceVar(&policies, "policy", nil, "Path to kyverno-json policies")
+	serve.Flags().StringVar(&address, "address", ":9000", "Address to listen on")
+	serve.Flags().StringVar(&healthaddress, "healthaddress", ":8181", "Address to listen on for health checks")
+	root := &cobra.Command{
 		Use:   "kyverno-envoy-plugin",
 		Short: "kyverno-envoy-plugin is a plugin for Envoy",
 	}
-
-	rootCmd.AddCommand(serveCmd)
-
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
+	root.AddCommand(serve)
+	return root
 }