update the load command to check the path of the load-config in the CLI, also do more checking on the apiserver side of the yaml structure

jmccormick2001 · jmccormick2001 · commit 657b0edcd98d · 2019-01-21T13:01:27.000-05:00
diff --git a/apiserver/loadservice/loadconfig.go b/apiserver/loadservice/loadconfig.go
@@ -66,14 +66,15 @@ func (c *LoadConfig) validate() error {
 	return err
 }
 
-func (c *LoadConfig) getConf(yamlFile *bytes.Buffer) *LoadConfig {
+func (c *LoadConfig) getConf(yamlFile *bytes.Buffer) (*LoadConfig, error) {
 
 	err := yaml.Unmarshal(yamlFile.Bytes(), c)
 	if err != nil {
-		log.Fatalf("Unmarshal: %v", err)
+		log.Errorf("Unmarshal: %v", err)
+		return c, err
 	}
 
-	return c
+	return c, err
 }
 
 func (c *LoadConfig) print() {
diff --git a/apiserver/loadservice/loadimpl.go b/apiserver/loadservice/loadimpl.go
@@ -68,7 +68,12 @@ func Load(request *msgs.LoadRequest) msgs.LoadResponse {
 	LoadConfigTemplate := loadJobTemplateFields{}
 
 	var LoadCfg LoadConfig
-	LoadCfg.getConf(bytes.NewBufferString(request.LoadConfig))
+	_, err = LoadCfg.getConf(bytes.NewBufferString(request.LoadConfig))
+	if err != nil {
+		resp.Status.Code = msgs.Error
+		resp.Status.Msg = err.Error()
+		return resp
+	}
 
 	err = LoadCfg.validate()
 	if err != nil {
diff --git a/examples/load/sample-json-load-config.yaml b/examples/load/sample-json-load-config.yaml
@@ -1,5 +1,5 @@
 COImagePrefix:  crunchydata
-COImageTag:  rhel7-3.5.0-rc5
+COImageTag:  centos7-3.5.0-rc8
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432
diff --git a/pgo/cmd/load.go b/pgo/cmd/load.go
@@ -77,6 +77,11 @@ func createLoad(args []string) {
 	}
 
 	buf, err := ioutil.ReadFile(LoadConfig)
+	if err != nil {
+		fmt.Println("Error: " + err.Error())
+		os.Exit(2)
+	}
+
 	request := msgs.LoadRequest{}
 	request.LoadConfig = string(buf)
 	request.Selector = Selector

Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,15 @@ func (c *LoadConfig) validate() error {`
`66`	`66`	`return err`
`67`	`67`	`}`
`68`	`68`
`69`		`-func (c LoadConfig) getConf(yamlFile bytes.Buffer) *LoadConfig {`
	`69`	`+func (c LoadConfig) getConf(yamlFile bytes.Buffer) (*LoadConfig, error) {`
`70`	`70`
`71`	`71`	`err := yaml.Unmarshal(yamlFile.Bytes(), c)`
`72`	`72`	`if err != nil {`
`73`		`- log.Fatalf("Unmarshal: %v", err)`
	`73`	`+ log.Errorf("Unmarshal: %v", err)`
	`74`	`+ return c, err`
`74`	`75`	`}`
`75`	`76`
`76`		`- return c`
	`77`	`+ return c, err`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`func (c *LoadConfig) print() {`