refactored script engine as script.script was an ugly config options

taskcluster · Oct 12, 2016 · b72e5cc · b72e5cc
1 parent f9624b3
commit b72e5cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/engines/script/config.go b/engines/script/config.go
@@ -3,7 +3,7 @@ package scriptengine
 import schematypes "github.com/taskcluster/go-schematypes"
 
 type configType struct {
-	Script     []string `json:"script"`
+	Command    []string `json:"command"`
 	Expiration int      `json:"expiration"`
 	Schema     struct {
 		Type       string                 `json:"type"`
@@ -18,9 +18,9 @@ var configSchema = schematypes.Object{
 		Description: `Configuration properties for the 'scriptengine'.`,
 	},
 	Properties: schematypes.Properties{
-		"script": schematypes.Array{
+		"command": schematypes.Array{
 			MetaData: schematypes.MetaData{
-				Title: "Script to Execute",
+				Title: "Command to Execute",
 				Description: `Script and arguments to execute. This script will be fed
         a JSON string that matches the schema configured over stdin.`,
 			},
@@ -53,7 +53,7 @@ var configSchema = schematypes.Object{
 		},
 	},
 	Required: []string{
-		"script",
+		"command",
 		"schema",
 		"expiration",
 	},

diff --git a/engines/script/engine_test.go b/engines/script/engine_test.go
@@ -9,7 +9,7 @@ import (
 var provider = &enginetest.EngineProvider{
 	Engine: "script",
 	Config: `{
-    "script": ["bash", "-ec", "v=$(cat); echo \"$v\"; echo \"$v\" | grep success"],
+    "command": ["bash", "-ec", "v=$(cat); echo \"$v\"; echo \"$v\" | grep success"],
     "schema": {
       "type": "object",
       "properties": {

diff --git a/engines/script/sandboxbuilder.go b/engines/script/sandboxbuilder.go
@@ -18,7 +18,7 @@ type sandboxBuilder struct {
 }
 
 func (b *sandboxBuilder) StartSandbox() (engines.Sandbox, error) {
-	script := b.engine.config.Script
+	script := b.engine.config.Command
 	cmd := exec.Command(script[0], script[1:]...)
 	folder, err := b.engine.environment.TemporaryStorage.NewFolder()
 	if err != nil {