Merge branch 'main' into deploy-better-integration

commands/apps_test.go

@@ -40,7 +40,6 @@ func TestCommandsAppsCreateAttemptsToValidateStackOnError(t *testing.T) {
 		StackName: "helloworld-1.0.0",
 	}
 
-	// Define Contet
 	ctx := context.Background()
 
 	// Invoke
@@ -111,9 +110,6 @@ func TestCommandsAppsInitHandlesErrors(t *testing.T) {
 				fmt.Println("server.conf creation failed")
 			}
 
-
-			// Define Context
-
 			ctx := context.Background()
 
 			// Invoke

commands/deploy_test.go

@@ -259,7 +259,6 @@ func TestCommandsDeployUploadsTarball(t *testing.T) {
 	mockGit := MockGitService{}
 	globalGitService = &mockGit
 
-	// Define Context
 	ctx := context.Background()
 
 	// Invoke

commands/helpers.go

@@ -17,10 +17,10 @@ func NewSpinner() *spinner.Spinner {
 }
 */
 
-type CTXKEY string
+type CtxKey string
 
 func IsInCtxBool(ctx context.Context, arg string) bool {
-	return ctx.Value(CTXKEY(arg)) != nil && ctx.Value(CTXKEY(arg)).(bool)
+	return ctx.Value(CtxKey(arg)) != nil && ctx.Value(CtxKey(arg)).(bool)
 }
 
 // NewSpinner returns a nicely formatted spinner for display while users are waiting.

commands/login_test.go

@@ -39,7 +39,6 @@ func TestCommandsLoginValidatesGoodCredentials(t *testing.T) {
 		out: &out,
 	}
 
-	// Define Context
 	ctx := context.Background()
 
 	// Invoke
@@ -72,7 +71,6 @@ func TestCommandsLoginValidatesBadCredentials(t *testing.T) {
 		out: &out,
 	}
 
-	// Define Context
 	ctx:= context.Background()
 
 	// Invoke
@@ -111,7 +109,6 @@ func TestCommandsLoginUsesAlreadySetAPIToken(t *testing.T) {
 		out: &bytes.Buffer{},
 	}
 
-	// Define Context
 	ctx := context.Background()
 
 	// Invoke

sectionctl.go

@@ -46,19 +46,19 @@ type CLI struct {
 
 
 
-func bootstrap(c CLI, ctx *kong.Context) context.Context {
+func bootstrap(c CLI, cmd *kong.Context) context.Context {
 	api.PrefixURI = c.SectionAPIPrefix
 	api.Timeout = c.SectionAPITimeout
 
-	contxt := context.Background()
-	contxt = context.WithValue(contxt, commands.CTXKEY("quiet"), c.Quiet)
-
-	colorableWriter := colorable.NewColorableStderr()
-
+	ctx := context.Background()
 	minLogLevel := logutils.LogLevel("INFO")
-	if contxt.Value(commands.CTXKEY("quiet")).(bool) {
+	if c.Quiet {
+		ctx = context.WithValue(ctx, commands.CtxKey("quiet"), c.Quiet)
 		minLogLevel = logutils.LogLevel("ERROR")
 	}
+
+	colorableWriter := colorable.NewColorableStderr()
+
 	filter := &logutils.LevelFilter{
 		Levels:   []logutils.LogLevel{"DEBUG", "INFO", "WARN", "ERROR"},
 		MinLevel: minLogLevel,
@@ -67,16 +67,21 @@ func bootstrap(c CLI, ctx *kong.Context) context.Context {
 	if c.Debug {
 		filter.MinLevel = logutils.LogLevel("DEBUG")
 		if(c.DebugOutput || len(c.DebugFile) > 1){
-			if len(c.DebugFile) == 0 {
-				c.DebugFile = fmt.Sprintf("sectionctl-debug-%s.log", time.Now().Format("2006-01-02-15-04-05Z0700"))
+			info, err := os.Stat(c.DebugFile); 
+			if err != nil {
+				panic(err)
 			}
 			logFilePath := filepath.Join(c.DebugFile)
+			if len(c.DebugFile) == 0 || info.IsDir() {
+				logFilePath = filepath.Join(c.DebugFile, fmt.Sprintf("sectionctl-debug-%s.log", time.Now().Format("2006-01-02-15-04-05Z0700")))
+				c.DebugFile = logFilePath 
+			}
 			logFile, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
 			if err != nil {
 				panic(err)
 			}
 			fmt.Fprintf(logFile, "Version:   %s\n", commands.VersionCmd{}.String())
-			fmt.Fprintf(logFile, "Command:   %s\n", ctx.Args)
+			fmt.Fprintf(logFile, "Command:   %s\n", cmd.Args)
 			fmt.Fprintf(logFile, "PrefixURI: %s\n", api.PrefixURI)
 			fmt.Fprintf(logFile, "Timeout:   %s\n", api.Timeout)
 			fmt.Printf("Writing debug log to: %s\n", logFilePath)
@@ -87,11 +92,11 @@ func bootstrap(c CLI, ctx *kong.Context) context.Context {
 	log.SetOutput(filter)
 
 	switch {
-	case ctx.Command() == "version":
+	case cmd.Command() == "version":
 		// bypass auth check for version command
-	case ctx.Command() == "login":
+	case cmd.Command() == "login":
 		api.Token = c.SectionToken
-	case ctx.Command() != "login" && ctx.Command() != "logout":
+	case cmd.Command() != "login" && cmd.Command() != "logout":
 		t := c.SectionToken
 		if t == "" {
 			to, err := credentials.Setup(api.PrefixURI.Host)
@@ -103,7 +108,7 @@ func bootstrap(c CLI, ctx *kong.Context) context.Context {
 		}
 		api.Token = t
 	}
-	return contxt
+	return ctx
 }
 
 func main() {
@@ -114,14 +119,14 @@ func main() {
 		kongplete.WithPredictor("file", complete.PredictFiles("*")),
 	)
 
-	ctx := kong.Parse(&cli,
+	cmd := kong.Parse(&cli,
 		kong.Description("CLI to interact with Section."),
 		kong.UsageOnError(),
 		kong.ConfigureHelp(kong.HelpOptions{Tree: true}),
 	)
-	contxt := bootstrap(cli, ctx)
-	ctx.BindTo(contxt, (*context.Context)(nil))
-	err := ctx.Run(contxt)
+	ctx := bootstrap(cli, cmd)
+	cmd.BindTo(ctx, (*context.Context)(nil))
+	err := cmd.Run(ctx)
 	if err != nil {
 		log.Printf("[ERROR] %s\n", err)
 		os.Exit(2)

sectionctl_test.go

@@ -19,7 +19,7 @@ func TestBootstrapSetsUpDebugLogFile(t *testing.T) {
 	d, err := ioutil.TempDir("", "sectionctl")
 	assert.NoError(err)
 
-	var cli = CLI{Debug: true, SectionToken: "s3cr3t", SectionAPIPrefix: u, DebugFileDir: d}
+	var cli = CLI{Debug: true, SectionToken: "s3cr3t", SectionAPIPrefix: u, DebugFile: d, DebugOutput: true}
 	var ctx kong.Context
 
 	// Invoke