Progress

.github/workflows/e2e-tests.yml

@@ -39,3 +39,5 @@ jobs:
 
       - name: 'Run tests for ${{ matrix.command }} command'
         run: './tests/${{ matrix.command }}/run_tests.sh'
+        env:
+          3LV_NON_INTERACTIVE: 'true'

main.go

@@ -35,6 +35,13 @@ func main() {
 		Usage:                 "Command Line Interface tool for developing, building and securing Elvia applications ⚡",
 		Version:               version,
 		EnableShellCompletion: true,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:    "non-interactive",
+				Usage:   "Run in non-interactive mode. Accepts all default values without prompting for confirmation.",
+				Sources: cli.EnvVars("3LV_NON_INTERACTIVE"),
+			},
+		},
 		After: func(ctx context.Context, c *cli.Command) error {
 			latestVersion, _ := getLatestVersion(ctx)
 			if semver.Compare("v"+version, "v"+latestVersion) == -1 {

pkg/create/create.go

@@ -2,7 +2,6 @@ package create
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"os/exec"
 	"path"
@@ -11,6 +10,7 @@ import (
 	"github.com/3lvia/cli/pkg/command"
 	"github.com/3lvia/cli/pkg/githubactions"
 	"github.com/3lvia/cli/pkg/shared"
+	"github.com/3lvia/cli/pkg/utils"
 	"github.com/urfave/cli/v3"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
@@ -57,6 +57,8 @@ func Create(ctx context.Context, c *cli.Command) error {
 		return cli.ShowAppHelp(c)
 	}
 
+	nonInteractive := c.Bool("non-interactive")
+
 	outputDirectory := c.Args().First()
 	if outputDirectory == "" {
 		return cli.Exit("Output directory not provided", 1)
@@ -78,14 +80,12 @@ func Create(ctx context.Context, c *cli.Command) error {
 	checkCoooiecutterInstalledOutput := checkCookiecutterInstalledCommand(nil)
 	if command.IsError(checkCoooiecutterInstalledOutput) {
 		log.Printf("Cookiecutter is not installed. Do you want to install it? (Y/n)")
-
-		var answer string
-		_, err := fmt.Scanln(&answer)
+		yes, err := utils.PromptYesNo("Cookiecutter is not installed. Do you want to install it?", nonInteractive)
 		if err != nil {
-			log.Fatal(err)
+			return cli.Exit(err, 1)
 		}
 
-		if answer != "n" {
+		if yes {
 			checkPipxInstalledOutput := checkPipxÌnstalledCommand(nil)
 			if command.IsError(checkPipxInstalledOutput) {
 				log.Fatal("pipx, which is required for installing cookiecutter, is not installed. Please install it first.")
@@ -127,6 +127,7 @@ func Create(ctx context.Context, c *cli.Command) error {
 		applicationName,
 		"",
 		defaultBranch,
+		nonInteractive,
 	)
 	if err != nil {
 		return cli.Exit(err, 1)

pkg/githubactions/githubactions.go

@@ -53,6 +53,7 @@ func GitHubActions(ctx context.Context, c *cli.Command) error {
 		c.String("application-name"),
 		c.String("helm-values-file"),
 		c.String("default-branch"),
+		c.Bool("non-interactive"),
 	)
 	if err != nil {
 		return cli.Exit(err, 1)
@@ -69,6 +70,7 @@ func CreateDeployWorkflow(
 	applicationName string,
 	helmValuesFile string,
 	defaultBranch string,
+	nonInteractive bool,
 ) error {
 	const githubActionsDir = ".github/workflows"
 	fullPath := path.Join(outputDirectory, githubActionsDir)
@@ -85,7 +87,7 @@ func CreateDeployWorkflow(
 		return err
 	}
 
-	helmValuesFile_, err := resolveHelmValuesFile(helmValuesFile, outputDirectory)
+	helmValuesFile_, err := resolveHelmValuesFile(helmValuesFile, outputDirectory, nonInteractive)
 	if err != nil {
 		return err
 	}
@@ -291,14 +293,19 @@ func getExampleWorkflowFileURL(language string, runtimeCloudProvider string) (st
 		)
 }
 
-func resolveHelmValuesFile(outputDirectory string, helmValuesFile string) (string, error) {
+func resolveHelmValuesFile(outputDirectory string, helmValuesFile string, nonInteractive bool) (string, error) {
 	if helmValuesFile == "" {
 		const defaultHelmValuesFile = ".github/deploy/values.yml"
 
-		var answer string
-		fmt.Printf("You have not provided a Helm values file, which is required for the deployment. Do you want to create a default Helm values file at '.github/deploy/values.yml'? (Y/n): ")
-		fmt.Scanln(&answer)
-		if strings.ToLower(answer) == "n" {
+		yes, err := utils.PromptYesNo(
+			"You have not provided a Helm values file, which is required for the deployment. Do you want to create a default Helm values file?",
+			nonInteractive,
+		)
+		if err != nil {
+			return "", err
+		}
+
+		if !yes {
 			return "", fmt.Errorf("Helm values file is required for the deployment.")
 		}
 
@@ -313,7 +320,7 @@ func resolveHelmValuesFile(outputDirectory string, helmValuesFile string) (strin
 			return "", fmt.Errorf("Failed to create directory for Helm values file: %w", err)
 		}
 
-		// TODO: use tempalte file
+		// TODO: use template file
 		if err := os.WriteFile(newHelmValuesFile, []byte("image:\n  tag: latest\n"), 0644); err != nil {
 			return "", fmt.Errorf("Failed to create default Helm values file: %w", err)
 		}

pkg/utils/utils.go

@@ -113,3 +113,19 @@ func WriteFileWithTemplate(
 
 	return filePath, nil
 }
+
+// Will only return false if the response is "n"
+func PromptYesNo(question string, nonInteractive bool) (bool, error) {
+	fmt.Printf("%s (Y/n): ", question)
+	if nonInteractive {
+		return true, nil
+	}
+
+	var response string
+	_, err := fmt.Scanln(&response)
+	if err != nil {
+		return false, fmt.Errorf("Failed to read response: %s", err)
+	}
+
+	return strings.ToLower(response) != "n", nil
+}