Closes apache#324 - Migrate e2e tests to bddframework

Signed-off-by: Ricardo Zanini <[email protected]>

bddframework/pkg/framework/http.go

@@ -25,7 +25,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 	"sync"
@@ -96,6 +95,9 @@ func WaitForFailedHTTPRequest(namespace string, requestInfo HTTPRequestInfo, tim
 		})
 }
 
+// TODO: implement a ExecuteHTTPRequest using a curl image, so we can query the services from within the cluster
+// TODO: kubectl run -n $NS -it --rm --image=curlimages/curl curly -- http://10.96.83.64
+
 // ExecuteHTTPRequest executes an HTTP request
 func ExecuteHTTPRequest(namespace string, requestInfo HTTPRequestInfo) (*http.Response, error) {
 	// Setup a retry in case the first time it did not work
@@ -217,7 +219,7 @@ func checkHTTPRequestConditionC(client *http.Client, namespace string, requestIn
 	if err != nil {
 		return false, err
 	}
-	if _, err = io.Copy(ioutil.Discard, response.Body); err != nil { // Just read the response to be able to close the connection properly
+	if _, err = io.Copy(io.Discard, response.Body); err != nil { // Just read the response to be able to close the connection properly
 		return false, err
 	}
 	defer response.Body.Close()
@@ -282,7 +284,7 @@ func createDefaultClient() *http.Client {
 	customTransport := defaultTransport.Clone()
 	// Allow executing requests against HTTPS endpoints with insecure certificate
 	customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	return &http.Client{Transport: customTransport, Timeout: (time.Duration(10*config.GetLoadFactor()) * time.Second)}
+	return &http.Client{Transport: customTransport, Timeout: time.Duration(10*config.GetLoadFactor()) * time.Second}
 }
 
 func runRequestRoutine(threadID int, waitGroup *sync.WaitGroup, client *http.Client, namespace string, requestPerThread int, requestInfo HTTPRequestInfo, results []HTTPRequestResult) {
@@ -303,7 +305,7 @@ func runRequestRoutine(threadID int, waitGroup *sync.WaitGroup, client *http.Cli
 	results[threadID] = HTTPRequestResultSuccess
 }
 
-// IsHTTPResponseArraySize makes and checks whether an http request returns an array of a specific size
+// IsHTTPResponseArraySize makes and checks whether a http request returns an array of a specific size
 func IsHTTPResponseArraySize(namespace string, requestInfo HTTPRequestInfo, arraySize int) (bool, error) {
 	var httpResponseArray []map[string]interface{}
 	err := ExecuteHTTPRequestWithUnmarshalledResponse(namespace, requestInfo, &httpResponseArray)

controllers/profiles/dev/profile_dev.go

@@ -95,13 +95,13 @@ func newObjectEnsurersOpenShift(support *common.StateSupport) *objectEnsurers {
 
 func newStatusEnrichers(support *common.StateSupport) *statusEnrichers {
 	return &statusEnrichers{
-		networkInfo: common.NewStatusEnricher(support.C, statusEnricher),
+		networkInfo: common.NewStatusEnricher(support.C, workflowAddressableStatusEnricher),
 	}
 }
 
 func newStatusEnrichersOpenShift(support *common.StateSupport) *statusEnrichers {
 	return &statusEnrichers{
-		networkInfo: common.NewStatusEnricher(support.C, statusEnricherOpenShift),
+		networkInfo: common.NewStatusEnricher(support.C, workflowAddressableStatusEnricherOpenShift),
 	}
 }
 

controllers/profiles/dev/status_enricher_dev.go

@@ -35,8 +35,8 @@ import (
 	"github.com/apache/incubator-kie-kogito-serverless-operator/workflowproj"
 )
 
-func statusEnricher(ctx context.Context, c client.Client, workflow *operatorapi.SonataFlow) (client.Object, error) {
-	//If the workflow Status hasn't got a NodePort Endpoint, we are ensuring it will be set
+func workflowAddressableStatusEnricher(ctx context.Context, c client.Client, workflow *operatorapi.SonataFlow) (client.Object, error) {
+	// If the workflow Status hasn't got a NodePort Endpoint, statusEnricherwe are ensuring it will be set
 	// If we aren't on OpenShift we will enrich the status with 2 info:
 	// - Address the service can be reached
 	// - Node port used
@@ -49,6 +49,8 @@ func statusEnricher(ctx context.Context, c client.Client, workflow *operatorapi.
 
 	//If the service has got a Port that is a nodePort we have to use it to create the workflow's NodePort Endpoint
 	if service.Spec.Ports != nil && len(service.Spec.Ports) > 0 {
+		// TODO: Replace with LoadBalancer option https://minikube.sigs.k8s.io/docs/handbook/accessing/#using-minikube-tunnel
+		// TODO: remove Endpoint, use only URL
 		if port := findNodePortFromPorts(service.Spec.Ports); port > 0 {
 			labels := workflowproj.GetDefaultLabels(workflow)
 
@@ -74,7 +76,7 @@ func statusEnricher(ctx context.Context, c client.Client, workflow *operatorapi.
 			workflow.Status.Endpoint = url
 		}
 
-		address, err := kubernetes.RetrieveServiceURL(service)
+		address, err := kubernetes.RetrieveWorkflowServiceURL(service)
 		if err != nil {
 			return nil, err
 		}
@@ -99,7 +101,7 @@ func findNodePortFromPorts(ports []v1.ServicePort) int {
 	return 0
 }
 
-func statusEnricherOpenShift(ctx context.Context, client client.Client, workflow *operatorapi.SonataFlow) (client.Object, error) {
+func workflowAddressableStatusEnricherOpenShift(ctx context.Context, client client.Client, workflow *operatorapi.SonataFlow) (client.Object, error) {
 	// On OpenShift we need to retrieve the Route to have the URL the service is available to
 	route := &openshiftv1.Route{}
 	err := client.Get(ctx, types.NamespacedName{Namespace: workflow.Namespace, Name: workflow.Name}, route)

controllers/profiles/dev/status_enricher_dev_test.go

@@ -41,7 +41,7 @@ func Test_enrichmentStatusOnK8s(t *testing.T) {
 		workflow.Namespace = toK8SNamespace(t.Name())
 		service, _ := common.ServiceCreator(workflow)
 		client := test.NewSonataFlowClientBuilder().WithRuntimeObjects(workflow, service).Build()
-		obj, err := statusEnricher(context.TODO(), client, workflow)
+		obj, err := workflowAddressableStatusEnricher(context.TODO(), client, workflow)
 
 		reflectWorkflow := obj.(*apiv08.SonataFlow)
 		assert.NoError(t, err)
@@ -57,7 +57,7 @@ func Test_enrichmentStatusOnK8s(t *testing.T) {
 		workflow.Namespace = t.Name()
 		service, _ := serviceCreator(workflow)
 		client := test.NewSonataFlowClientBuilder().WithRuntimeObjects(workflow, service).Build()
-		_, err := statusEnricher(context.TODO(), client, workflow)
+		_, err := workflowAddressableStatusEnricher(context.TODO(), client, workflow)
 		assert.Error(t, err)
 
 	})
@@ -73,7 +73,7 @@ func Test_enrichmentStatusOnOCP(t *testing.T) {
 		route.Namespace = workflow.Namespace
 		route.Spec.Host = workflow.Name + "." + workflow.Namespace + ".apps-crc.testing"
 		client := test.NewKogitoClientBuilderWithOpenShift().WithRuntimeObjects(workflow, service, route).Build()
-		obj, err := statusEnricherOpenShift(context.TODO(), client, workflow)
+		obj, err := workflowAddressableStatusEnricherOpenShift(context.TODO(), client, workflow)
 
 		reflectWorkflow := obj.(*apiv08.SonataFlow)
 		assert.NoError(t, err)