[KOGITO-9082] - [KSW-Operator] Review the Workflow CRD API (#118)

Signed-off-by: Spolti <[email protected]>
tiagobento · May 16, 2023 · 3760827 · 3760827
1 parent b03ca35
commit 3760827
Show file tree

Hide file tree

Showing 14 changed files with 11,604 additions and 11,142 deletions.
diff --git a/api/v1alpha08/kogitoserverlessworkflow_types.go b/api/v1alpha08/kogitoserverlessworkflow_types.go
@@ -25,7 +25,8 @@ import (
 
 // KogitoServerlessWorkflowSpec defines the desired state of KogitoServerlessWorkflow
 type KogitoServerlessWorkflowSpec struct {
-	model.Workflow `json:",inline"`
+	// +kubebuilder:validation:Required
+	Flow model.Workflow `json:"flow"`
 }
 
 // KogitoServerlessWorkflowStatus defines the observed state of KogitoServerlessWorkflow

diff --git a/api/v1alpha08/zz_generated.deepcopy.go b/api/v1alpha08/zz_generated.deepcopy.go
diff --git a/bundle/manifests/kogito-serverless-operator.clusterserviceversion.yaml b/bundle/manifests/kogito-serverless-operator.clusterserviceversion.yaml
@@ -31,63 +31,65 @@ metadata:
             "name": "greeting"
           },
           "spec": {
-            "functions": [
-              {
-                "name": "greetFunction",
-                "operation": "sysout",
-                "type": "custom"
-              }
-            ],
-            "start": "ChooseOnLanguage",
-            "states": [
-              {
-                "dataConditions": [
-                  {
-                    "condition": "${ .language == \"English\" }",
-                    "transition": "GreetInEnglish"
+            "flow": {
+              "functions": [
+                {
+                  "name": "greetFunction",
+                  "operation": "sysout",
+                  "type": "custom"
+                }
+              ],
+              "start": "ChooseOnLanguage",
+              "states": [
+                {
+                  "dataConditions": [
+                    {
+                      "condition": "${ .language == \"English\" }",
+                      "transition": "GreetInEnglish"
+                    },
+                    {
+                      "condition": "${ .language == \"Spanish\" }",
+                      "transition": "GreetInSpanish"
+                    }
+                  ],
+                  "defaultCondition": "GreetInEnglish",
+                  "name": "ChooseOnLanguage",
+                  "type": "switch"
+                },
+                {
+                  "data": {
+                    "greeting": "Hello from JSON Workflow, "
                   },
-                  {
-                    "condition": "${ .language == \"Spanish\" }",
-                    "transition": "GreetInSpanish"
-                  }
-                ],
-                "defaultCondition": "GreetInEnglish",
-                "name": "ChooseOnLanguage",
-                "type": "switch"
-              },
-              {
-                "data": {
-                  "greeting": "Hello from JSON Workflow, "
+                  "name": "GreetInEnglish",
+                  "transition": "GreetPerson",
+                  "type": "inject"
                 },
-                "name": "GreetInEnglish",
-                "transition": "GreetPerson",
-                "type": "inject"
-              },
-              {
-                "data": {
-                  "greeting": "Saludos desde JSON Workflow, "
+                {
+                  "data": {
+                    "greeting": "Saludos desde JSON Workflow, "
+                  },
+                  "name": "GreetInSpanish",
+                  "transition": "GreetPerson",
+                  "type": "inject"
                 },
-                "name": "GreetInSpanish",
-                "transition": "GreetPerson",
-                "type": "inject"
-              },
-              {
-                "actions": [
-                  {
-                    "functionRef": {
-                      "arguments": {
-                        "message": ".greeting+.name"
+                {
+                  "actions": [
+                    {
+                      "functionRef": {
+                        "arguments": {
+                          "message": ".greeting+.name"
+                        },
+                        "refName": "greetFunction"
                       },
-                      "refName": "greetFunction"
-                    },
-                    "name": "greetAction"
-                  }
-                ],
-                "end": true,
-                "name": "GreetPerson",
-                "type": "operation"
-              }
-            ]
+                      "name": "greetAction"
+                    }
+                  ],
+                  "end": true,
+                  "name": "GreetPerson",
+                  "type": "operation"
+                }
+              ]
+            }
           }
         }
       ]