[KOGITO-7856] Fixes to export a Kogito compliant JSON workflow defini…

…tion (apache#25)

Signed-off-by: Davide Salerno <[email protected]>

api/v08/kogitoserverlessworkflow_support.go

@@ -0,0 +1,24 @@
+package v08
+
+import "fmt"
+
+func (e StateType) String() string {
+	switch e {
+	case EventStateType:
+		return "event"
+	case OperationStateType:
+		return "operation"
+	case SwitchStateType:
+		return "switch"
+	case SleepStateType:
+		return "sleep"
+	case ParallelStateType:
+		return "parallel"
+	case InjectStateType:
+		return "inject"
+	case ForEachStateType:
+		return "foreach"
+	default:
+		return fmt.Sprintf("%s", string(e))
+	}
+}

builder/builder.go

@@ -16,17 +16,28 @@
 package builder
 
 import (
+	"context"
 	"fmt"
 	"github.com/davidesalerno/kogito-serverless-operator/constants"
 	"github.com/ricardozanini/kogito-builder/api"
 	"github.com/ricardozanini/kogito-builder/builder"
 	"github.com/ricardozanini/kogito-builder/client"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"os"
+	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
 	"time"
 )
 
-func BuildImageWithDefaults(sourceSwfName string, sourceSwf []byte) (*api.Build, error) {
+type Builder struct {
+	ctx context.Context
+}
+
+// NewBuilder ...
+func NewBuilder(contex context.Context) Builder {
+	return Builder{ctx: contex}
+}
+
+func (b *Builder) BuildImageWithDefaults(sourceSwfName string, sourceSwf []byte) (*api.Build, error) {
 	wd, _ := os.Getwd()
 	dockerFile, _ := os.ReadFile(wd + "/builder/Dockerfile")
 	ib := NewImageBuilder(sourceSwfName, sourceSwf, dockerFile)
@@ -37,10 +48,11 @@ func BuildImageWithDefaults(sourceSwfName string, sourceSwf []byte) (*api.Build,
 	ib.WithSecret(constants.DEFAULT_KANIKO_SECRET)
 	ib.WithRegistryAddress(constants.DEFAULT_REGISTRY_REPO)
 	ib.WithTimeout(5 * time.Minute)
-	return BuildImage(ib.Build())
+	return b.BuildImage(ib.Build())
 }
 
-func BuildImage(b KogitoBuilder) (*api.Build, error) {
+func (r *Builder) BuildImage(b KogitoBuilder) (*api.Build, error) {
+	log := ctrllog.FromContext(r.ctx)
 	cli, err := client.NewClient(true)
 	platform := api.PlatformBuild{
 		ObjectReference: api.ObjectReference{
@@ -62,22 +74,22 @@ func BuildImage(b KogitoBuilder) (*api.Build, error) {
 	}
 
 	build, err := builder.NewBuild(platform, b.ImageName, b.PodMiddleName).
-		WithResource(constants.BUILDER_RESOURCE_NAME_DEFAULT, b.DockerFile).WithResource(b.SourceSwfName, b.SourceSwf).
+		WithResource(constants.BUILDER_RESOURCE_NAME_DEFAULT, b.DockerFile).WithResource(b.SourceSwfName+".sw.json", b.SourceSwf).
 		WithClient(cli).
 		Schedule()
 	if err != nil {
-		fmt.Println(err.Error())
+		log.Error(err, err.Error())
 		return nil, err
 	}
 	//FIXME: Remove this  For loop as soon as the KogitoServerlessBuild CR will be availbable
 	// from now the Reconcile method can be called until the build is finished
 	for build.Status.Phase != api.BuildPhaseSucceeded &&
 		build.Status.Phase != api.BuildPhaseError &&
 		build.Status.Phase != api.BuildPhaseFailed {
-		fmt.Printf("\nBuild status is %s", build.Status.Phase)
+		log.Info("Build status is ", "status", build.Status.Phase)
 		build, err = builder.FromBuild(build).WithClient(cli).Reconcile()
 		if err != nil {
-			fmt.Println("Failed to run test")
+			log.Info("Failed to build")
 			panic(fmt.Errorf("build %v just failed", build))
 		}
 		time.Sleep(10 * time.Second)

builder/builder_test.go

@@ -1,6 +1,7 @@
 package builder
 
 import (
+	"context"
 	"github.com/davidesalerno/kogito-serverless-operator/constants"
 	"github.com/stretchr/testify/assert"
 	"os"
@@ -31,7 +32,8 @@ func TestBuild(t *testing.T) {
 
 	ib.WithTimeout(5 * time.Minute)
 
-	build, error := BuildImage(ib.Build())
+	builder := NewBuilder(context.TODO())
+	build, error := builder.BuildImage(ib.Build())
 	// after some build minikube need more time for the schedule
 	time.Sleep(20 * time.Second)
 	assert.NotNilf(t, build, "Build  result")

config/samples/sw.kogito.kie.org__v08_kogitoserverlessworkflow.yaml

@@ -14,20 +14,20 @@ spec:
     - name: ChooseOnLanguage
       type: switch
       dataConditions:
-        - condition: ${ .language == "English" }
+        - condition: "${ .language == \"English\" }"
           transition: GreetInEnglish
-        - condition: ${ .language == "Spanish" }
+        - condition: "${ .language == \"Spanish\" }"
           transition: GreetInSpanish
       defaultCondition: GreetInEnglish
     - name: GreetInEnglish
       type: inject
       data:
-        greeting: "Hello from k8s Workflow!"
+        greeting: "Hello from JSON Workflow, "
       transition: GreetPerson
     - name: GreetInSpanish
       type: inject
       data:
-        greeting: "Saludos desde k8s Workflow!"
+        greeting: "Saludos desde JSON Workflow, "
       transition: GreetPerson
     - name: GreetPerson
       type: operation
@@ -36,5 +36,5 @@ spec:
           functionRef:
             refName: greetFunction
             arguments:
-              message: .greeting + .name
+              message:  ".greeting+.name"
       end: true

config/samples/sw.kogito.kie.org__v08_kogitoserverlessworkflow_withITA.yaml

@@ -0,0 +1,47 @@
+apiVersion: sw.kogito.kie.org/v08
+kind: KogitoServerlessWorkflow
+metadata:
+  name: greeting
+  annotations:
+    sw.kogito.kie.org/description: Greeting example on k8s!
+spec:
+  start: ChooseOnLanguage
+  functions:
+    - name: greetFunction
+      type: custom
+      operation: sysout
+  states:
+    - name: ChooseOnLanguage
+      type: switch
+      dataConditions:
+        - condition: "${ .language == \"English\" }"
+          transition: GreetInEnglish
+        - condition: "${ .language == \"Spanish\" }"
+          transition: GreetInSpanish
+        - condition: "${ .language == \"Italian\" }"
+          transition: GreetInItalian
+      defaultCondition: GreetInEnglish
+    - name: GreetInEnglish
+      type: inject
+      data:
+        greeting: "Hello from JSON Workflow, "
+      transition: GreetPerson
+    - name: GreetInSpanish
+      type: inject
+      data:
+        greeting: "Saludos desde JSON Workflow, "
+      transition: GreetPerson
+    - name: GreetInItalian
+      type: inject
+      data:
+        greeting: "Saluti dal JSON Workflow, "
+      transition: GreetPerson
+    - name: GreetPerson
+      type: operation
+      actions:
+        - name: greetAction
+          functionRef:
+            refName: greetFunction
+            arguments:
+              message: ".greeting+.name"
+      end: true

controllers/kogitoserverlessworkflow_controller.go

@@ -18,10 +18,10 @@ package controllers
 
 import (
 	"context"
+	"encoding/json"
 	apiv08 "github.com/davidesalerno/kogito-serverless-operator/api/v08"
 	"github.com/davidesalerno/kogito-serverless-operator/builder"
 	"github.com/davidesalerno/kogito-serverless-operator/converters"
-	"github.com/ghodss/yaml"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -73,17 +73,21 @@ func (r *KogitoServerlessWorkflowReconciler) Reconcile(ctx context.Context, req
 		log.Error(err, "Failed converting KogitoServerlessWorkflow into Workflow")
 		return ctrl.Result{}, err
 	}
-	yamlWorkflow, err := yaml.Marshal(workflow)
+	jsonWorkflow, err := json.Marshal(workflow)
 	if err != nil {
-		log.Error(err, "Failed converting KogitoServerlessWorkflow into YAML")
+		log.Error(err, "Failed converting KogitoServerlessWorkflow into JSON")
 		return ctrl.Result{}, err
 	}
-	log.Info("Converted Workflow CR into Kogito Yaml Workflow", "workflow", yamlWorkflow)
+	log.Info("Converted Workflow CR into Kogito JSON Workflow", "workflow", jsonWorkflow)
 	//TODO Save into Shared Volume
 	//"greetings.sw.json"
 	//TODO KOGITO-7498 Kogito Serverless Workflow Builder Image
 	//[KOGITO-7899]-Integrate Kaniko into SWF Operator
-	builder.BuildImageWithDefaults(workflow.ID, yamlWorkflow)
+	builder := builder.NewBuilder(ctx)
+	_, err = builder.BuildImageWithDefaults(workflow.ID, jsonWorkflow)
+	if err != nil {
+		log.Info("Error building KogitoServerlessWorkflow into Workflow: ", "message", err.Error())
+	}
 	return ctrl.Result{}, nil
 }
 

converters/kogitoserverlessworkflow_converter.go

@@ -63,10 +63,16 @@ func retrieveStates(incomingStates []apiv08.State) []model.State {
 	states := make([]model.State, len(incomingStates))
 	log.Info("States: ", "states", incomingStates)
 	for i, s := range incomingStates {
-		newBaseState := &model.BaseState{Name: s.Name}
+		stateT := model.StateType(s.Type.String())
+		newBaseState := &model.BaseState{Name: s.Name, Type: stateT}
 		if s.End {
 			newBaseState.End = &model.End{Terminate: true}
 		}
+		if s.Transition != nil {
+			newBaseState.Transition = &model.Transition{
+				NextState: *s.Transition,
+			}
+		}
 		switch sType := s.Type; sType {
 		case "switch":
 			newBaseSwitchState := &model.BaseSwitchState{