fix(uiveri5ExecuteTests): add 'tests' stash to step yaml (#2641)

* add tests stash to uiveri5 step * add stash to uiveri5 * extend step generator with input resources * add step generator test
SAP · Mar 1, 2021 · 4ca9186 · 4ca9186
1 parent d2eb287
commit 4ca9186
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 0 deletions.
diff --git a/cmd/checkmarxExecuteScan_generated.go b/cmd/checkmarxExecuteScan_generated.go
diff --git a/cmd/cloudFoundryCreateService_generated.go b/cmd/cloudFoundryCreateService_generated.go
diff --git a/cmd/cloudFoundryCreateSpace_generated.go b/cmd/cloudFoundryCreateSpace_generated.go
diff --git a/cmd/cloudFoundryDeleteSpace_generated.go b/cmd/cloudFoundryDeleteSpace_generated.go
diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go
diff --git a/cmd/fortifyExecuteScan_generated.go b/cmd/fortifyExecuteScan_generated.go
diff --git a/cmd/gitopsUpdateDeployment_generated.go b/cmd/gitopsUpdateDeployment_generated.go
diff --git a/cmd/karmaExecuteTests_generated.go b/cmd/karmaExecuteTests_generated.go
diff --git a/cmd/kubernetesDeploy_generated.go b/cmd/kubernetesDeploy_generated.go
diff --git a/cmd/nexusUpload_generated.go b/cmd/nexusUpload_generated.go
diff --git a/cmd/npmExecuteScripts_generated.go b/cmd/npmExecuteScripts_generated.go
diff --git a/cmd/uiVeri5ExecuteTests_generated.go b/cmd/uiVeri5ExecuteTests_generated.go
diff --git a/cmd/whitesourceExecuteScan_generated.go b/cmd/whitesourceExecuteScan_generated.go
diff --git a/pkg/generator/helper/helper.go b/pkg/generator/helper/helper.go
@@ -34,6 +34,7 @@ type stepInfo struct {
 	Containers       []config.Container
 	Sidecars         []config.Container
 	Outputs          config.StepOutputs
+	Resources        []config.StepResources
 }
 
 //StepGoTemplate ...
@@ -171,6 +172,17 @@ func {{ .StepName }}Metadata() config.StepData {
 		},
 		Spec: config.StepSpec{
 			Inputs: config.StepInputs{
+				{{ if .Resources -}}
+				Resources: []config.StepResources{
+					{{- range $resource := .Resources }}
+					{
+						{{- if $resource.Name -}} Name: "{{$resource.Name}}",{{- end }}
+						{{- if $resource.Description -}} Description: "{{$resource.Description}}",{{- end }}
+						{{- if $resource.Type -}} Type: "{{$resource.Type}}",{{- end }}
+						{{- if $resource.Conditions -}} Conditions: []config.Condition{ {{- range $i, $cond := $resource.Conditions }} {ConditionRef: "{{$cond.ConditionRef}}", Params: []config.Param{ {{- range $j, $p := $cond.Params}} { Name: "{{$p.Name}}", Value: "{{$p.Value}}" }, {{end -}} } }, {{ end -}} },{{ end }}
+					},{{- end }}
+				},
+				{{ end -}}
 				Parameters: []config.StepParameters{
 					{{- range $key, $value := .StepParameters }}
 					{
@@ -223,6 +235,7 @@ func {{ .StepName }}Metadata() config.StepData {
 							{{ if $p.tags}}{"tags": []map[string]string{ {{- range $j, $t := $p.tags}} {"name": "{{$t.name}}"}, {{end -}} } },{{ end -}}
 						{{ end }}
 						{{ if $res.Parameters -}} }, {{- end }}
+						{{- if $res.Conditions -}} Conditions: []config.Condition{ {{- range $i, $cond := $res.Conditions }} {ConditionRef: "{{$cond.ConditionRef}}", Params: []config.Param{ {{- range $j, $p := $cond.Params}} { Name: "{{$p.Name}}", Value: "{{$p.Value}}" }, {{end -}} } }, {{ end -}} },{{ end }}
 					}, {{- end }}
 				},
 			}, {{- end }}
@@ -542,6 +555,7 @@ func getStepInfo(stepData *config.StepData, osImport bool, exportPrefix string)
 			Containers:       stepData.Spec.Containers,
 			Sidecars:         stepData.Spec.Sidecars,
 			Outputs:          stepData.Spec.Outputs,
+			Resources:        stepData.Spec.Inputs.Resources,
 		},
 		err
 }

diff --git a/pkg/generator/helper/helper_test.go b/pkg/generator/helper/helper_test.go
@@ -42,6 +42,9 @@ spec:
             tags:
               - name: t1
   inputs:
+    resources:
+      - name: stashName
+        type: stash
     params:
       - name: param0
         type: string

diff --git a/pkg/generator/helper/testdata/TestProcessMetaFiles/custom_step_code_generated.golden b/pkg/generator/helper/testdata/TestProcessMetaFiles/custom_step_code_generated.golden
@@ -174,6 +174,10 @@ func testStepMetadata() config.StepData {
 		},
 		Spec: config.StepSpec{
 			Inputs: config.StepInputs{
+				Resources: []config.StepResources{
+					{Name: "stashName",Type: "stash",
+					},
+				},
 				Parameters: []config.StepParameters{
 					{
 						Name:      "param0",

diff --git a/pkg/generator/helper/testdata/TestProcessMetaFiles/step_code_generated.golden b/pkg/generator/helper/testdata/TestProcessMetaFiles/step_code_generated.golden
@@ -173,6 +173,10 @@ func testStepMetadata() config.StepData {
 		},
 		Spec: config.StepSpec{
 			Inputs: config.StepInputs{
+				Resources: []config.StepResources{
+					{Name: "stashName",Type: "stash",
+					},
+				},
 				Parameters: []config.StepParameters{
 					{
 						Name:      "param0",

diff --git a/resources/metadata/uiVeri5ExecuteTests.yaml b/resources/metadata/uiVeri5ExecuteTests.yaml
@@ -12,6 +12,11 @@ metadata:
 #        In a Kubernetes environment, the containers both need to be referenced with `localhost`.
 spec:
   inputs:
+    resources:
+      - name: buildDescriptor
+        type: stash
+      - name: tests
+        type: stash
     params:
       - name: installCommand
         type: string