Add more tests for Podman + write Component abstraction for integration tests

tests/helper/component_cluster.go

@@ -0,0 +1,39 @@
+package helper
+
+import (
+	"fmt"
+
+	. "github.com/onsi/gomega"
+)
+
+// ClusterComponent is an abstraction for a Devfile Component deployed on a cluster (either Kubernetes or OpenShift)
+type ClusterComponent struct {
+	name      string
+	app       string
+	namespace string
+	cli       CliRunner
+}
+
+func NewClusterComponent(name string, app string, namespace string, cli CliRunner) *ClusterComponent {
+	return &ClusterComponent{
+		name:      name,
+		app:       app,
+		namespace: namespace,
+		cli:       cli,
+	}
+}
+
+func (o *ClusterComponent) ExpectIsNotDeployed() {
+	deploymentName := fmt.Sprintf("%s-%s", o.name, o.app)
+	stdout := o.cli.Run("get", "deployment", "-n", o.namespace).Out.Contents()
+	Expect(string(stdout)).To(Not(ContainSubstring(deploymentName)))
+}
+
+func (o *ClusterComponent) Exec(container string, args ...string) string {
+	podName := o.cli.GetRunningPodNameByComponent(o.name, o.namespace)
+	return o.cli.Exec(podName, o.namespace, append([]string{"--"}, args...)...)
+}
+
+func (o *ClusterComponent) GetEnvVars() map[string]string {
+	return o.cli.GetEnvsDevFileDeployment(o.name, o.app, o.namespace)
+}

tests/helper/component_interface.go

@@ -0,0 +1,23 @@
+package helper
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+)
+
+// Component is an abstraction for a Devfile Component deployed on a specific platform
+type Component interface {
+	// ExpectIsNotDeployed checks that the component is not deployed
+	ExpectIsNotDeployed()
+	// Exec executes the command in specific container of the component
+	Exec(container string, args ...string) string
+	// GetEnvVars returns the environment variables defined for the component
+	GetEnvVars() map[string]string
+}
+
+func NewComponent(name string, app string, namespace string, cli CliRunner) Component {
+	if NeedsCluster(CurrentSpecReport().Labels()) {
+		return NewClusterComponent(name, app, namespace, cli)
+	} else {
+		return NewPodmanComponent(name, app)
+	}
+}

tests/helper/component_podman.go

@@ -0,0 +1,75 @@
+package helper
+
+import (
+	"fmt"
+	"os/exec"
+
+	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
+	jsonserializer "k8s.io/apimachinery/pkg/runtime/serializer/json"
+	"k8s.io/kubectl/pkg/scheme"
+)
+
+// PodmanComponent is an abstraction for a Devfile Component deployed on podman
+type PodmanComponent struct {
+	name string
+	app  string
+}
+
+func NewPodmanComponent(name string, app string) *PodmanComponent {
+	return &PodmanComponent{
+		name: name,
+		app:  app,
+	}
+}
+
+func (o *PodmanComponent) ExpectIsNotDeployed() {
+	podName := fmt.Sprintf("%s-%s", o.name, o.app)
+	cmd := exec.Command("podman", "pod", "list", "--format", "{{.Name}}", "--noheading")
+	stdout, err := cmd.Output()
+	Expect(err).ToNot(HaveOccurred())
+	Expect(string(stdout)).ToNot(ContainSubstring(podName))
+}
+
+func (o *PodmanComponent) Exec(container string, args ...string) string {
+	containerName := fmt.Sprintf("%s-%s-%s", o.name, o.app, container)
+	cmdargs := []string{"exec", "--interactive"}
+	cmdargs = append(cmdargs, "--tty")
+	cmdargs = append(cmdargs, containerName)
+	cmdargs = append(cmdargs, args...)
+
+	command := exec.Command("podman", cmdargs...)
+	fmt.Printf("exec %v\n", cmdargs)
+	out, err := command.Output()
+	Expect(err).ToNot(HaveOccurred())
+	return string(out)
+}
+
+func (o *PodmanComponent) GetEnvVars() map[string]string {
+	podName := fmt.Sprintf("%s-%s", o.name, o.app)
+	podDef := getPodDef(podName)
+	res := map[string]string{}
+	for _, env := range podDef.Spec.Containers[0].Env {
+		res[env.Name] = env.Value
+	}
+	return res
+}
+
+func getPodDef(podname string) *corev1.Pod {
+	serializer := jsonserializer.NewSerializerWithOptions(
+		jsonserializer.SimpleMetaFactory{},
+		scheme.Scheme,
+		scheme.Scheme,
+		jsonserializer.SerializerOptions{
+			Yaml: true,
+		},
+	)
+
+	cmd := exec.Command("podman", "kube", "generate", podname)
+	resultBytes, err := cmd.Output()
+	Expect(err).ToNot(HaveOccurred())
+	var pod corev1.Pod
+	_, _, err = serializer.Decode(resultBytes, nil, &pod)
+	Expect(err).ToNot(HaveOccurred())
+	return &pod
+}

tests/helper/helper_dev.go

@@ -237,11 +237,9 @@ func (o DevSession) CheckNotSynced(timeout time.Duration) {
 // RunDevMode runs a dev session and executes the `inside` code when the dev mode is completely started
 // The inside handler is passed the internal session pointer, the contents of the standard and error outputs,
 // and a slice of strings - ports - giving the redirections in the form localhost:<port_number> to access ports opened by component
-func RunDevMode(additionalOpts []string, envvars []string, inside func(session *gexec.Session, outContents []byte, errContents []byte, ports map[string]string)) error {
-	session, outContents, errContents, urls, err := StartDevMode(DevSessionOpts{
-		EnvVars:     envvars,
-		CmdlineArgs: additionalOpts,
-	})
+func RunDevMode(options DevSessionOpts, inside func(session *gexec.Session, outContents []byte, errContents []byte, ports map[string]string)) error {
+
+	session, outContents, errContents, urls, err := StartDevMode(options)
 	if err != nil {
 		return err
 	}