diff --git a/charts/extendable-workflow/Chart.yaml b/charts/extendable-workflow/Chart.yaml index fffd1ade..a6ebb876 100644 --- a/charts/extendable-workflow/Chart.yaml +++ b/charts/extendable-workflow/Chart.yaml @@ -6,7 +6,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.0-rc2 +version: 1.3.0-rc3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/extendable-workflow/templates/02-configmap_01-extendable-workflow-resources-schemas.yaml b/charts/extendable-workflow/templates/02-configmap_01-extendable-workflow-resources-schemas.yaml index 151da4e5..81f6d0a8 100755 --- a/charts/extendable-workflow/templates/02-configmap_01-extendable-workflow-resources-schemas.yaml +++ b/charts/extendable-workflow/templates/02-configmap_01-extendable-workflow-resources-schemas.yaml @@ -52,6 +52,19 @@ data: "required": ["personalInfo", "languageInfo"] } + workflow-output-schema.json: |- + { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "WorkflowResult", + "description": "Schema of workflow output", + "type": "object", + "properties": { + "result": { + "$ref": "../shared/schemas/workflow-result-schema.json", + "type": "object" + } + } + } kind: ConfigMap metadata: creationTimestamp: null diff --git a/charts/extendable-workflow/templates/03-sonataflow_extendable-workflow.yaml b/charts/extendable-workflow/templates/03-sonataflow_extendable-workflow.yaml index 1e3cc898..3a0146b3 100755 --- a/charts/extendable-workflow/templates/03-sonataflow_extendable-workflow.yaml +++ b/charts/extendable-workflow/templates/03-sonataflow_extendable-workflow.yaml @@ -4,7 +4,7 @@ metadata: annotations: sonataflow.org/description: YAML based extendable-workflow workflow sonataflow.org/expressionLang: jq - sonataflow.org/profile: prod + sonataflow.org/profile: gitops sonataflow.org/version: "1.0" creationTimestamp: null labels: @@ -31,6 +31,9 @@ spec: - name: GreetInFrench operation: '{ greeting: "Bienvenue " + .personalInfo.firstName + " " + .personalInfo.lastName + " du merveilleux pays de " + .personalInfo.country + " ! Vos mots de passes sont bien reçus: " + .personalInfo.password + " et ils correspondent: " + .personalInfo.confirmPassword + "... Il serait bon de les changer maintenant." }' type: expression + - name: successResult + operation: '{ "completedWith":"success", "message": "Extendable workflow completed successfully", "outputs":[ { "key":"Selected language", "value": .languageInfo.language }, { "key":"Greeting message", "value": .greeting } ] }' + type: expression start: stateName: ChooseOnLanguage states: @@ -91,6 +94,12 @@ spec: invoke: sync refName: greetFunction name: greetAction + - actionDataFilter: + useResults: true + functionRef: + invoke: sync + refName: successResult + name: setOutput end: terminate: true name: GreetPerson @@ -98,7 +107,7 @@ spec: podTemplate: container: resources: {} - image: quay.io/orchestrator/serverless-workflow-extendable-workflow:7c4866215908760015ded6d848d32cf937a2ca98 + image: quay.io/orchestrator/serverless-workflow-extendable-workflow:be3e8e3c8099f475b29a7c67b61c6cb604f8b66c resources: configMaps: - configMap: