fix rebase

defenseunicorns · Jun 12, 2024 · 55fbad3 · 55fbad3
1 parent b54dcbc
commit 55fbad3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 53 deletions.
diff --git a/src/cmd/run.go b/src/cmd/run.go
@@ -51,51 +51,6 @@ var runCmd = &cobra.Command{
 	RunE: func(_ *cobra.Command, args []string) error {
 		taskName := ""
 
-		err := utils.ReadYaml(config.TaskFileLocation, &tasksFile)
-		if err != nil {
-			message.Fatalf(err, "Failed to open file: %s", err.Error())
-		}
-
-		// ensure vars are uppercase
-		setRunnerVariables = helpers.TransformMapKeys(setRunnerVariables, strings.ToUpper)
-
-		// set any env vars that come from the environment (taking MARU_ over VENDOR_)
-		for _, variable := range tasksFile.Variables {
-			if _, ok := setRunnerVariables[variable.Name]; !ok {
-				if value := os.Getenv(fmt.Sprintf("%s_%s", strings.ToUpper(config.EnvPrefix), variable.Name)); value != "" {
-					setRunnerVariables[variable.Name] = value
-				} else if config.VendorPrefix != "" {
-					if value := os.Getenv(fmt.Sprintf("%s_%s", strings.ToUpper(config.VendorPrefix), variable.Name)); value != "" {
-						setRunnerVariables[variable.Name] = value
-					}
-				}
-			}
-		}
-
-		if listTasks || listAllTasks {
-			rows := [][]string{
-				{"Name", "Description"},
-			}
-			for _, task := range tasksFile.Tasks {
-				rows = append(rows, []string{task.Name, task.Description})
-			}
-			// If ListAllTasks, add tasks from included files
-			if listAllTasks {
-				err = listTasksFromIncludes(&rows, tasksFile)
-				if err != nil {
-					message.Fatalf(err, "Cannot list tasks: %s", err.Error())
-				}
-			}
-
-			err := pterm.DefaultTable.WithHasHeader().WithData(rows).Render()
-			if err != nil {
-				message.Fatalf(err, "Error listing tasks: %s", err.Error())
-			}
-
-			return
-		}
-
-		taskName := "default"
 		if len(args) > 0 {
 			taskName = args[0]
 		}
@@ -129,7 +84,7 @@ var runCmd = &cobra.Command{
 
 	// 	err := utils.ReadYaml(config.TaskFileLocation, &tasksFile)
 	// 	if err != nil {
-	// 		message.Fatalf(err, "Cannot unmarshal %s", config.TaskFileLocation)
+	// 		message.Fatalf(err, "Failed to open file: %s", err.Error())
 	// 	}
 
 	// 	// ensure vars are uppercase

diff --git a/src/test/tasks/scripting/tasks.yaml b/src/test/tasks/scripting/tasks.yaml
@@ -21,6 +21,7 @@ tasks:
     inputs:
       url:
         required: true
+        description: the URL to fetch
     outputs:
       user-agent: ${{ steps.fetch.headers["User-Agent"] }}
       url: ${{ inputs.url }}

diff --git a/tasks.schema.json b/tasks.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://github.com/defenseunicorns/maru-runner/src/types/tasks-file",
+  "$id": "https://github.com/defenseunicorns/maru-runner/src/pkg/tasks/tasks-file",
   "$ref": "#/$defs/TasksFile",
   "$defs": {
     "Action": {
@@ -11,11 +11,15 @@
         },
         "cmd": {
           "type": "string",
-          "description": "The command to run. Must specify either cmd or wait for the action to do anything."
+          "description": "The command to run. Must specify cmd"
+        },
+        "script": {
+          "type": "string",
+          "description": "The script to run. Must specify cmd"
         },
         "wait": {
           "$ref": "#/$defs/ActionWait",
-          "description": "Wait for a condition to be met before continuing. Must specify either cmd or wait for the action."
+          "description": "Wait for a condition to be met before continuing. Must specify cmd"
         },
         "env": {
           "items": {
@@ -310,10 +314,6 @@
           "type": "string",
           "description": "The script to run. Must specify cmd"
         },
-        "wait": {
-          "$ref": "#/$defs/ActionWait",
-          "description": "Wait for a condition to be met before continuing. Must specify cmd"
-        },
         "uses": {
           "type": "string",
           "description": "The task to run"
@@ -357,11 +357,25 @@
           "type": "array",
           "description": "Actions to take when running the task"
         },
+        "steps": {
+          "items": {
+            "$ref": "#/$defs/Step"
+          },
+          "type": "array",
+          "description": "Actions to take when running the task"
+        },
         "inputs": {
           "additionalProperties": {
             "$ref": "#/$defs/InputParameter"
           },
           "type": "object",
+          "description": "Input parameters for the task"
+        },
+        "outputs": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "type": "object",
           "description": "Outputs from the task"
         }
       },