Remove positional args for cli commands (#56)

remove positional args for cli commands

Author: hbeckmann

checks/command.go

@@ -1,7 +1,6 @@
 package checks
 
 import (
-	"fmt"
 	"os/exec"
 	"strings"
 
@@ -10,15 +9,13 @@ import (
 
 func CLICommand(
 	lesson api.Lesson,
-	optionalPositionalArgs []string,
 ) []api.CLICommandResult {
 	data := lesson.Lesson.LessonDataCLICommand.CLICommandData
 	responses := make([]api.CLICommandResult, len(data.Commands))
 	for i, command := range data.Commands {
-		finalCommand := interpolateArgs(command.Command, optionalPositionalArgs)
-		responses[i].FinalCommand = finalCommand
+		responses[i].FinalCommand = command.Command
 
-		cmd := exec.Command("sh", "-c", "LANG=en_US.UTF-8 "+finalCommand)
+		cmd := exec.Command("sh", "-c", "LANG=en_US.UTF-8 "+command.Command)
 		b, err := cmd.Output()
 		if ee, ok := err.(*exec.ExitError); ok {
 			responses[i].ExitCode = ee.ExitCode()
@@ -29,11 +26,3 @@ func CLICommand(
 	}
 	return responses
 }
-
-func interpolateArgs(rawCommand string, optionalPositionalArgs []string) string {
-	// replace $1, $2, etc. with the optional positional args
-	for i, arg := range optionalPositionalArgs {
-		rawCommand = strings.ReplaceAll(rawCommand, fmt.Sprintf("$%d", i+1), arg)
-	}
-	return rawCommand
-}

cmd/submit.go

@@ -30,10 +30,6 @@ func submissionHandler(cmd *cobra.Command, args []string) error {
 	cmd.SilenceUsage = true
 	isSubmit := cmd.Name() == "submit" || forceSubmit
 	lessonUUID := args[0]
-	optionalPositionalArgs := []string{}
-	if len(args) > 1 {
-		optionalPositionalArgs = args[1:]
-	}
 
 	lesson, err := api.FetchLesson(lessonUUID)
 	if err != nil {
@@ -53,7 +49,7 @@ func submissionHandler(cmd *cobra.Command, args []string) error {
 			render.HTTPRun(data, results)
 		}
 	case "type_cli_command":
-		results := checks.CLICommand(*lesson, optionalPositionalArgs)
+		results := checks.CLICommand(*lesson)
 		data := *lesson.Lesson.LessonDataCLICommand
 		if isSubmit {
 			failure, err := api.SubmitCLICommandLesson(lessonUUID, results)

version.txt

@@ -1 +1 @@
-v1.9.0
+v1.9.1