fix: parse missing vars (#337)

Signed-off-by: Yvonnick Esnault <[email protected]>
ovh · Nov 26, 2020 · 9eb3367 · 9eb3367
1 parent 56cccf9
commit 9eb3367
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 19 deletions.
diff --git a/executors/dbfixtures/dbfixtures.go b/executors/dbfixtures/dbfixtures.go
@@ -108,7 +108,7 @@ func (e Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, er
 	return r, nil
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/exec/exec.go b/executors/exec/exec.go
@@ -44,7 +44,7 @@ type Result struct {
 	TimeSeconds   float64     `json:"timeseconds,omitempty" yaml:"timeseconds,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/grpc/grpc.go b/executors/grpc/grpc.go
@@ -87,7 +87,7 @@ func (c *customHandler) OnReceiveTrailers(stat *status.Status, met metadata.MD)
 	c.target.Code = strconv.Itoa(int(uint32(stat.Code())))
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/http/http.go b/executors/http/http.go
@@ -73,7 +73,7 @@ type HTTPRequest struct {
 	PostForm url.Values  `json:"post_form,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/imap/imap.go b/executors/imap/imap.go
@@ -57,7 +57,7 @@ type Result struct {
 	TimeSeconds float64 `json:"timeSeconds,omitempty" yaml:"timeSeconds,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/kafka/kafka.go b/executors/kafka/kafka.go
@@ -99,7 +99,7 @@ type (
 	consumeFunc = func(message *sarama.ConsumerMessage) (Message, interface{}, error)
 )
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/ovhapi/ovhapi.go b/executors/ovhapi/ovhapi.go
@@ -48,7 +48,7 @@ type Result struct {
 	Headers     Headers     `json:"headers" yaml:"headers"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/plugins/README.md b/executors/plugins/README.md
@@ -45,7 +45,7 @@ func (e Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, er
 	return r, nil
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (e Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/plugins/hello/hello.go b/executors/plugins/hello/hello.go
@@ -38,7 +38,7 @@ func (e Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, er
 	return r, nil
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (e Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/plugins/odbc/odbc.go b/executors/plugins/odbc/odbc.go
@@ -97,7 +97,7 @@ func (e Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, er
 	return r, nil
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/rabbitmq/rabbitmq.go b/executors/rabbitmq/rabbitmq.go
@@ -70,7 +70,7 @@ type Result struct {
 	Err         string        `json:"error" yaml:"error"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/readfile/readfile.go b/executors/readfile/readfile.go
@@ -44,7 +44,7 @@ type Result struct {
 	Mod         map[string]string `json:"mod,omitempty" yaml:"mod,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	r := Result{
 		Md5sum:  make(map[string]string),

diff --git a/executors/redis/redis.go b/executors/redis/redis.go
@@ -41,7 +41,7 @@ type Result struct {
 	Commands []Command `json:"commands,omitempty" yaml:"commands,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/smtp/smtp.go b/executors/smtp/smtp.go
@@ -42,7 +42,7 @@ type Result struct {
 	TimeSeconds float64 `json:"timeSeconds,omitempty" yaml:"timeSeconds,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/sql/sql.go b/executors/sql/sql.go
@@ -105,7 +105,7 @@ func (e Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, er
 	return r, nil
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/ssh/ssh.go b/executors/ssh/ssh.go
@@ -44,7 +44,7 @@ type Result struct {
 	TimeSeconds float64 `json:"timeseconds,omitempty" yaml:"timeseconds,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/executors/web/web.go b/executors/web/web.go
@@ -53,7 +53,7 @@ type Result struct {
 	Value       string  `json:"value,omitempty" yaml:"value,omitempty"`
 }
 
-// ZeroValueResult return an empty implemtation of this executor result
+// ZeroValueResult return an empty implementation of this executor result
 func (Executor) ZeroValueResult() interface{} {
 	return Result{}
 }

diff --git a/process_testcase.go b/process_testcase.go
@@ -48,6 +48,16 @@ func (v *Venom) parseTestCase(ts *TestSuite, tc *TestCase) ([]string, []string,
 				return nil, nil, err
 			}
 			for k := range dumpE {
+				var found bool
+				for i := 0; i < len(vars); i++ {
+					if vars[i] == k {
+						found = true
+						break
+					}
+				}
+				if !found {
+					extractedVars = append(extractedVars, k)
+				}
 				extractedVars = append(extractedVars, tc.Name+"."+k)
 				if strings.HasSuffix(k, "__type__") && dumpE[k] == "Map" {
 					// go-dump doesnt dump the map name, here is a workaround
@@ -100,7 +110,6 @@ func (v *Venom) parseTestCase(ts *TestSuite, tc *TestCase) ([]string, []string,
 				}
 			}
 		}
-
 	}
 	return vars, extractedVars, nil
 }

diff --git a/tests/user_executor.yml b/tests/user_executor.yml
@@ -5,4 +5,9 @@ testcases:
   - type: hello
     myarg: World
     assertions:
-    - result.display.hello ShouldContainSubstring World
+    - result.display.hello ShouldContainSubstring World
+- name: testB
+  steps:
+  - script: echo "{{.testA.result.display.hello}}"
+    assertions:
+    - result.systemout ShouldContainSubstring {{.testA.result.display.hello}}
diff --git a/types_executor.go b/types_executor.go
@@ -153,6 +153,26 @@ func (ux UserExecutor) Run(ctx context.Context, step TestStep) (interface{}, err
 	return nil, errors.New("Run not implemented for user interface, use RunUserExecutor instead")
 }
 
+func (ux UserExecutor) ZeroValueResult() interface{} {
+	type Output struct {
+		Result interface{} `json:"result"`
+	}
+	output := &Output{
+		Result: ux.Output,
+	}
+	outputS, err := json.Marshal(output)
+	if err != nil {
+		return ""
+	}
+
+	result := make(map[string]interface{})
+	err = json.Unmarshal(outputS, &result)
+	if err != nil {
+		return ""
+	}
+	return result
+}
+
 func (v *Venom) RunUserExecutor(ctx context.Context, ux UserExecutor, step TestStep) (interface{}, error) {
 	vrs := H{}
 	for k, va := range ux.Input {