Commit 2e7a3655 authored by lukasburgey's avatar lukasburgey
Browse files

Update to feudalScripts/v3

parent 69339277
Pipeline #85142 passed with stages
in 1 minute and 58 seconds
......@@ -5,7 +5,7 @@ import (
"log"
"git.scc.kit.edu/feudal/feudalClient/config"
"git.scc.kit.edu/feudal/feudalScripts/v2"
scripts "git.scc.kit.edu/feudal/feudalScripts/v3"
)
type (
......@@ -31,7 +31,7 @@ type (
Service config.Service `json:"service"`
// Optional Answers by the users. Must have the same keys as the related Questionnaire
Answers map[string]string `json:"answers,omitempty"`
Answers map[string]interface{} `json:"answers,omitempty"`
}
// Reply is used to patch the fields of the DeploymentState
......
module git.scc.kit.edu/feudal/feudalClient
require (
git.scc.kit.edu/feudal/feudalScripts/v2 v2.0.0
git.scc.kit.edu/feudal/feudalScripts/v3 v3.0.0
github.com/alecthomas/jsonschema v0.0.0-20190122210438-a6952de1bbe6
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
......
......@@ -9,7 +9,7 @@ import (
"os"
"git.scc.kit.edu/feudal/feudalClient/config"
"git.scc.kit.edu/feudal/feudalScripts/v2"
scripts "git.scc.kit.edu/feudal/feudalScripts/v3"
"github.com/alecthomas/jsonschema"
"github.com/xeipuuv/gojsonschema"
)
......
......@@ -15,7 +15,7 @@ import (
"git.scc.kit.edu/feudal/feudalClient/config"
deps "git.scc.kit.edu/feudal/feudalClient/deployments"
"git.scc.kit.edu/feudal/feudalClient/indent"
scripts "git.scc.kit.edu/feudal/feudalScripts/v2"
scripts "git.scc.kit.edu/feudal/feudalScripts/v3"
)
type (
......@@ -158,7 +158,12 @@ func (sink *Sink) handleDep(dep deps.Dep) (output scripts.Output, err error) {
dep.Log("Output: %s", indent.Indent(stdoutBytes))
}
err = json.Unmarshal(stdoutBytes, &output)
err = scripts.UnmarshalOutput(stdoutBytes, &output)
if err != nil {
return
}
err = scripts.SanityCheck(&input, &output)
if err != nil {
return
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment