Merge branch 'run-schema-on-create-2485' of github.com:defenseunicorn…

…s/zarf into run-schema-on-create-2485

go.mod

@@ -1,12 +1,11 @@
 module github.com/defenseunicorns/zarf
 
-go 1.22.3
+go 1.21.8
 
 // TODO (@AABRO): Pending merge into github.com/gojsonschema/gojsonschema (https://github.com/gojsonschema/gojsonschema/pull/5)
 replace github.com/xeipuuv/gojsonschema => github.com/defenseunicorns/gojsonschema v0.0.0-20231116163348-e00f069122d6
 
 require (
-	cuelang.org/go v0.7.0
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/agnivade/levenshtein v1.1.1
@@ -62,6 +61,8 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
+require cuelang.org/go v0.7.0 // indirect
+
 require (
 	atomicgo.dev/cursor v0.2.0 // indirect
 	atomicgo.dev/keyboard v0.2.9 // indirect

main.go

@@ -5,7 +5,10 @@
 package main
 
 import (
+	"context"
 	"embed"
+	"os/signal"
+	"syscall"
 
 	"github.com/defenseunicorns/zarf/src/cmd"
 	"github.com/defenseunicorns/zarf/src/config"
@@ -19,7 +22,10 @@ var cosignPublicKey string
 var zarfSchema embed.FS
 
 func main() {
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
+	defer cancel()
+
 	config.CosignPublicKey = cosignPublicKey
 	lint.ZarfSchema = zarfSchema
-	cmd.Execute()
+	cmd.Execute(ctx)
 }

src/cmd/common/setup.go

@@ -21,8 +21,6 @@ var LogLevelCLI string
 
 // SetupCLI sets up the CLI logging, interrupt functions, and more
 func SetupCLI() {
-	ExitOnInterrupt()
-
 	match := map[string]message.LogLevel{
 		"warn":  message.WarnLevel,
 		"info":  message.InfoLevel,

src/cmd/common/utils.go

@@ -6,18 +6,11 @@ package common
 
 import (
 	"context"
-	"os"
-	"os/signal"
-	"syscall"
 
-	"github.com/defenseunicorns/zarf/src/config/lang"
 	"github.com/defenseunicorns/zarf/src/pkg/cluster"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 )
 
-// SuppressGlobalInterrupt suppresses the global error on an interrupt
-var SuppressGlobalInterrupt = false
-
 // SetBaseDirectory sets the base directory. This is a directory with a zarf.yaml.
 func SetBaseDirectory(args []string) string {
 	if len(args) > 0 {
@@ -26,18 +19,6 @@ func SetBaseDirectory(args []string) string {
 	return "."
 }
 
-// ExitOnInterrupt catches an interrupt and exits with fatal error
-func ExitOnInterrupt() {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		<-c
-		if !SuppressGlobalInterrupt {
-			message.Fatal(lang.ErrInterrupt, lang.ErrInterrupt.Error())
-		}
-	}()
-}
-
 // NewClusterOrDie creates a new Cluster instance and waits for the cluster to be ready or throws a fatal error.
 func NewClusterOrDie(ctx context.Context) *cluster.Cluster {
 	timeoutCtx, cancel := context.WithTimeout(ctx, cluster.DefaultTimeout)

src/cmd/connect.go

@@ -7,8 +7,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"os/signal"
-	"syscall"
 
 	"github.com/defenseunicorns/zarf/src/cmd/common"
 	"github.com/defenseunicorns/zarf/src/config/lang"
@@ -72,17 +70,12 @@ var (
 				}
 			}
 
-			// Keep this open until an interrupt signal is received.
-			interruptChan := make(chan os.Signal, 1)
-			signal.Notify(interruptChan, os.Interrupt, syscall.SIGTERM)
-			common.SuppressGlobalInterrupt = true
-
 			// Wait for the interrupt signal or an error.
 			select {
+			case <-ctx.Done():
+				spinner.Successf(lang.CmdConnectTunnelClosed, url)
 			case err = <-tunnel.ErrChan():
 				spinner.Fatalf(err, lang.CmdConnectErrService, err.Error())
-			case <-interruptChan:
-				spinner.Successf(lang.CmdConnectTunnelClosed, url)
 			}
 			os.Exit(0)
 		},

src/cmd/internal.go

@@ -38,17 +38,17 @@ var agentCmd = &cobra.Command{
 	Use:   "agent",
 	Short: lang.CmdInternalAgentShort,
 	Long:  lang.CmdInternalAgentLong,
-	Run: func(_ *cobra.Command, _ []string) {
-		agent.StartWebhook()
+	RunE: func(cmd *cobra.Command, _ []string) error {
+		return agent.StartWebhook(cmd.Context())
 	},
 }
 
 var httpProxyCmd = &cobra.Command{
 	Use:   "http-proxy",
 	Short: lang.CmdInternalProxyShort,
 	Long:  lang.CmdInternalProxyLong,
-	Run: func(_ *cobra.Command, _ []string) {
-		agent.StartHTTPProxy()
+	RunE: func(cmd *cobra.Command, _ []string) error {
+		return agent.StartHTTPProxy(cmd.Context())
 	},
 }
 

src/cmd/root.go

@@ -10,14 +10,16 @@ import (
 	"os"
 	"strings"
 
+	"github.com/pterm/pterm"
+	"github.com/spf13/cobra"
+
 	"github.com/defenseunicorns/zarf/src/cmd/common"
 	"github.com/defenseunicorns/zarf/src/cmd/tools"
 	"github.com/defenseunicorns/zarf/src/config"
 	"github.com/defenseunicorns/zarf/src/config/lang"
 	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/types"
-	"github.com/spf13/cobra"
 )
 
 var (
@@ -32,21 +34,17 @@ var rootCmd = &cobra.Command{
 		if common.CheckVendorOnlyFromPath(cmd) {
 			return
 		}
-
 		// Don't log the help command
 		if cmd.Parent() == nil {
 			config.SkipLogFile = true
 		}
-
-		// Set the global context for the root command and all child commands
-		ctx := context.Background()
-		cmd.SetContext(ctx)
-
 		common.SetupCLI()
 	},
-	Short: lang.RootCmdShort,
-	Long:  lang.RootCmdLong,
-	Args:  cobra.MaximumNArgs(1),
+	Short:         lang.RootCmdShort,
+	Long:          lang.RootCmdLong,
+	Args:          cobra.MaximumNArgs(1),
+	SilenceUsage:  true,
+	SilenceErrors: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		zarfLogo := message.GetLogo()
 		_, _ = fmt.Fprintln(os.Stderr, zarfLogo)
@@ -64,8 +62,18 @@ var rootCmd = &cobra.Command{
 }
 
 // Execute is the entrypoint for the CLI.
-func Execute() {
-	cobra.CheckErr(rootCmd.Execute())
+func Execute(ctx context.Context) {
+	cmd, err := rootCmd.ExecuteContextC(ctx)
+	if err == nil {
+		return
+	}
+	comps := strings.Split(cmd.CommandPath(), " ")
+	if len(comps) > 1 && comps[1] == "tools" {
+		cmd.PrintErrln(cmd.ErrPrefix(), err.Error())
+	} else {
+		pterm.Error.Println(err.Error())
+	}
+	os.Exit(1)
 }
 
 func init() {

src/cmd/tools/crane.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/defenseunicorns/zarf/src/cmd/common"
 	"github.com/defenseunicorns/zarf/src/config"
 	"github.com/defenseunicorns/zarf/src/config/lang"
 	"github.com/defenseunicorns/zarf/src/internal/packager/images"
@@ -39,9 +38,6 @@ func init() {
 		Aliases: []string{"r", "crane"},
 		Short:   lang.CmdToolsRegistryShort,
 		PersistentPreRun: func(cmd *cobra.Command, _ []string) {
-
-			common.ExitOnInterrupt()
-
 			// The crane options loading here comes from the rootCmd of crane
 			craneOptions = append(craneOptions, crane.WithContext(cmd.Context()))
 			// TODO(jonjohnsonjr): crane.Verbose option?

src/internal/agent/http/server.go

@@ -18,16 +18,14 @@ import (
 )
 
 // NewAdmissionServer creates a http.Server for the mutating webhook admission handler.
-func NewAdmissionServer(port string) *http.Server {
+func NewAdmissionServer(ctx context.Context, port string) *http.Server {
 	message.Debugf("http.NewAdmissionServer(%s)", port)
 
 	c, err := cluster.NewCluster()
 	if err != nil {
 		message.Fatalf(err, err.Error())
 	}
 
-	ctx := context.Background()
-
 	// Instances hooks
 	podsMutation := hooks.NewPodMutationHook(ctx, c)
 	fluxGitRepositoryMutation := hooks.NewGitRepositoryMutationHook(ctx, c)

src/internal/agent/start.go

@@ -6,10 +6,11 @@ package agent
 
 import (
 	"context"
+	"errors"
 	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
+	"time"
+
+	"golang.org/x/sync/errgroup"
 
 	"github.com/defenseunicorns/zarf/src/config/lang"
 	agentHttp "github.com/defenseunicorns/zarf/src/internal/agent/http"
@@ -27,35 +28,40 @@ const (
 )
 
 // StartWebhook launches the Zarf agent mutating webhook in the cluster.
-func StartWebhook() {
+func StartWebhook(ctx context.Context) error {
 	message.Debug("agent.StartWebhook()")
-
-	startServer(agentHttp.NewAdmissionServer(httpPort))
+	return startServer(ctx, agentHttp.NewAdmissionServer(ctx, httpPort))
 }
 
 // StartHTTPProxy launches the zarf agent proxy in the cluster.
-func StartHTTPProxy() {
+func StartHTTPProxy(ctx context.Context) error {
 	message.Debug("agent.StartHttpProxy()")
-
-	startServer(agentHttp.NewProxyServer(httpPort))
+	return startServer(ctx, agentHttp.NewProxyServer(httpPort))
 }
 
-func startServer(server *http.Server) {
-	go func() {
-		if err := server.ListenAndServeTLS(tlsCert, tlsKey); err != nil && err != http.ErrServerClosed {
-			message.Fatal(err, lang.AgentErrStart)
+func startServer(ctx context.Context, srv *http.Server) error {
+	g, gCtx := errgroup.WithContext(ctx)
+	g.Go(func() error {
+		err := srv.ListenAndServeTLS(tlsCert, tlsKey)
+		if err != nil && !errors.Is(err, http.ErrServerClosed) {
+			return err
 		}
-	}()
-
+		return nil
+	})
+	g.Go(func() error {
+		<-gCtx.Done()
+		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		defer cancel()
+		err := srv.Shutdown(ctx)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
 	message.Infof(lang.AgentInfoPort, httpPort)
-
-	// listen shutdown signal
-	signalChan := make(chan os.Signal, 1)
-	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
-	<-signalChan
-
-	message.Infof(lang.AgentInfoShutdown)
-	if err := server.Shutdown(context.Background()); err != nil {
-		message.Fatal(err, lang.AgentErrShutdown)
+	err := g.Wait()
+	if err != nil {
+		return err
 	}
+	return nil
 }

src/internal/packager/git/gitea.go

@@ -10,17 +10,17 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	netHttp "net/http"
 	"os"
 	"time"
 
-	netHttp "net/http"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/defenseunicorns/zarf/src/config"
 	"github.com/defenseunicorns/zarf/src/pkg/cluster"
 	"github.com/defenseunicorns/zarf/src/pkg/k8s"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/types"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // CreateTokenResponse is the response given from creating a token in Gitea
@@ -253,24 +253,38 @@ func UpdateGiteaPVC(ctx context.Context, shouldRollBack bool) (string, error) {
 	}
 
 	pvcName := os.Getenv("ZARF_VAR_GIT_SERVER_EXISTING_PVC")
-	groupKind := schema.GroupKind{
-		Group: "",
-		Kind:  "PersistentVolumeClaim",
-	}
-	labels := map[string]string{"app.kubernetes.io/managed-by": "Helm"}
-	annotations := map[string]string{"meta.helm.sh/release-name": "zarf-gitea", "meta.helm.sh/release-namespace": "zarf"}
 
 	if shouldRollBack {
-		err = c.K8s.RemoveLabelsAndAnnotations(ctx, cluster.ZarfNamespaceName, pvcName, groupKind, labels, annotations)
-		return "false", err
+		pvc, err := c.Clientset.CoreV1().PersistentVolumeClaims(cluster.ZarfNamespaceName).Get(ctx, pvcName, metav1.GetOptions{})
+		if err != nil {
+			return "false", err
+		}
+		delete(pvc.Labels, "app.kubernetes.io/managed-by")
+		delete(pvc.Annotations, "meta.helm.sh/release-name")
+		delete(pvc.Annotations, "meta.helm.sh/release-namespace")
+		_, err = c.Clientset.CoreV1().PersistentVolumeClaims(cluster.ZarfNamespaceName).Update(ctx, pvc, metav1.UpdateOptions{})
+		if err != nil {
+			return "false", err
+		}
+		return "false", nil
 	}
 
 	if pvcName == "data-zarf-gitea-0" {
-		err = c.K8s.AddLabelsAndAnnotations(ctx, cluster.ZarfNamespaceName, pvcName, groupKind, labels, annotations)
-		return "true", err
+		pvc, err := c.Clientset.CoreV1().PersistentVolumeClaims(cluster.ZarfNamespaceName).Get(ctx, pvcName, metav1.GetOptions{})
+		if err != nil {
+			return "true", err
+		}
+		pvc.Labels["app.kubernetes.io/managed-by"] = "Helm"
+		pvc.Annotations["meta.helm.sh/release-name"] = "zarf-gitea"
+		pvc.Annotations["meta.helm.sh/release-namespace"] = "zarf"
+		_, err = c.Clientset.CoreV1().PersistentVolumeClaims(cluster.ZarfNamespaceName).Update(ctx, pvc, metav1.UpdateOptions{})
+		if err != nil {
+			return "true", err
+		}
+		return "true", nil
 	}
 
-	return "false", err
+	return "false", nil
 }
 
 // DoHTTPThings adds http request boilerplate and perform the request, checking for a successful response.