WIP. Refactor the code to abstract the engine to be used

Signed-off-by: cmoulliard <[email protected]>

tests/e2e/container/container.go

@@ -0,0 +1,18 @@
+package container
+
+import (
+	"os"
+	"os/exec"
+)
+
+type Engine interface {
+	IdpCmd() *exec.Cmd
+}
+
+func ContainerClient() string {
+	if os.Getenv("CONTAINER_ENGINE") == "podman" {
+		return "podman"
+	} else {
+		return "docker"
+	}
+}

tests/e2e/docker/docker_test.go

@@ -5,6 +5,7 @@ package docker
 import (
 	"context"
 	"fmt"
+	container_engine "github.com/cnoe-io/idpbuilder/tests/e2e/container"
 	"log/slog"
 	"os"
 	"os/exec"
@@ -23,21 +24,6 @@ var (
 	cmd                   *exec.Cmd
 )
 
-func configureContainerClientEngine() {
-	if os.Getenv("CONTAINER_ENGINE") == "podman" {
-		containerClientEngine = "podman"
-	} else {
-		containerClientEngine = "docker"
-	}
-}
-
-func enableKindExperimentalProvider(cmd exec.Cmd) *exec.Cmd {
-	if os.Getenv("CONTAINER_ENGINE") == "podman" {
-		cmd.Env = append(os.Environ(), "KIND_EXPERIMENTAL_PROVIDER=podman")
-	}
-	return &cmd
-}
-
 func CleanUpDocker(t *testing.T) {
 	t.Log("cleaning up docker env")
 
@@ -65,7 +51,8 @@ func Test_CreateDocker(t *testing.T) {
 	slogger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug}))
 	ctrl.SetLogger(logr.FromSlogHandler(slogger.Handler()))
 
-	configureContainerClientEngine()
+	t.Log("creating IDP cluster using docker engine")
+	containerClientEngine = container_engine.ContainerClient()
 	testCreate(t)
 	testCreatePath(t)
 	testCreatePort(t)

tests/e2e/podman/podman_test.go

@@ -0,0 +1,27 @@
+//go:build e2e
+
+package podman
+
+import (
+	"github.com/cnoe-io/idpbuilder/tests/e2e"
+	"github.com/cnoe-io/idpbuilder/tests/e2e/container"
+	"github.com/cnoe-io/idpbuilder/tests/e2e/shared"
+	"os"
+	"os/exec"
+	"testing"
+)
+
+type PodmanEngine struct {
+	container.Engine
+}
+
+func (p *PodmanEngine) IdpCmd() *exec.Cmd {
+	cmd := exec.Command(e2e.IdpbuilderBinaryLocation)
+	cmd.Env = append(os.Environ(), "KIND_EXPERIMENTAL_PROVIDER=podman")
+	return cmd
+}
+
+func Test_CreateCluster(t *testing.T) {
+	p := &PodmanEngine{}
+	shared.TestCreateCluster(t, container.ContainerClient(), p.IdpCmd())
+}

tests/e2e/podman/test-dockerfile

@@ -0,0 +1,2 @@
+FROM scratch
+COPY test-dockerfile .

tests/e2e/shared/shared.go

@@ -0,0 +1,42 @@
+//go:build e2e
+
+package shared
+
+import (
+	"context"
+	"fmt"
+	"github.com/cnoe-io/idpbuilder/tests/e2e"
+	"github.com/stretchr/testify/assert"
+	"os/exec"
+	"testing"
+	"time"
+)
+
+type ContainerEngine string
+
+func cleanUp(t *testing.T) {
+	t.Log("cleaning up")
+}
+
+// test idpbuilder create
+func TestCreateCluster(t *testing.T, engine string, cmd *exec.Cmd) {
+	ctx, cancel := context.WithTimeout(context.Background(), 8*time.Minute)
+	defer cancel()
+	defer cleanUp(t)
+
+	t.Log("running idpbuilder create")
+	cmd.Args = append(cmd.Args, "create")
+	b, err := cmd.CombinedOutput()
+	assert.NoError(t, err, b)
+
+	kubeClient, err := e2e.GetKubeClient()
+	assert.NoError(t, err, fmt.Sprintf("error while getting client: %s", err))
+
+	e2e.TestArgoCDApps(ctx, t, kubeClient, e2e.CorePackages)
+
+	argoBaseUrl := fmt.Sprintf("https://argocd.%s:%s", e2e.DefaultBaseDomain, e2e.DefaultPort)
+	giteaBaseUrl := fmt.Sprintf("https://gitea.%s:%s", e2e.DefaultBaseDomain, e2e.DefaultPort)
+	e2e.TestCoreEndpoints(ctx, t, argoBaseUrl, giteaBaseUrl)
+
+	e2e.TestGiteaRegistry(ctx, t, engine, fmt.Sprintf("gitea.%s", e2e.DefaultBaseDomain), e2e.DefaultPort)
+}