Updated tests

Removed godotenv, made it use the podman version in path instead of hard-coded path, and disabled a test when not on linux

connector_test.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 	"sync"
 	"testing"
@@ -29,13 +30,17 @@ func getConnector(t *testing.T, configJSON string) (deployer.Connector, *Config)
 	assert.NoError(t, err)
 	connector, err := factory.Create(unserializedConfig, log.NewTestLogger(t))
 	assert.NoError(t, err)
+	unserializedConfig.Podman.Path, err = binaryCheck(unserializedConfig.Podman.Path)
+	if err != nil {
+		t.Fatalf("Error checking Podman path (%s)", err)
+	}
 	return connector, unserializedConfig
 }
 
 var inOutConfig = `
 {
    "podman":{
-      "path":"/usr/bin/podman"
+      "path":"podman"
    }
 }
 `
@@ -74,15 +79,14 @@ var envConfig = `
 {
    "deployment":{
       "container":{
-         "NetworkDisabled":true,
          "Env":[
             "DEPLOYER_PODMAN_TEST_1=TEST1",
             "DEPLOYER_PODMAN_TEST_2=TEST2"
          ]
       }
    },
    "podman":{
-      "path":"/usr/bin/podman"
+      "path":"podman"
    }
 }
 `
@@ -114,7 +118,7 @@ var volumeConfig = `
       }
    },
    "podman":{
-      "path":"/usr/bin/podman"
+      "path":"podman"
    }
 }
 `
@@ -131,7 +135,7 @@ func TestSimpleVolume(t *testing.T) {
 	cmd := exec.Command("chcon", "-Rt", "svirt_sandbox_file_t", fmt.Sprintf("%s/tests/volume", cwd)) //nolint:gosec
 	err = cmd.Run()
 	if err != nil {
-		logger.Warningf("failed to set SELinux permissions on folder, chcon error: %s, this may cause test failure, let's see...", err.Error())
+		logger.Warningf("failed to set SELinux permissions on folder, chcon error: %s, this may cause test failure if SELinux is enabled.", err.Error())
 	}
 
 	container, err := connector.Deploy(
@@ -142,9 +146,8 @@ func TestSimpleVolume(t *testing.T) {
 	var containerInput = []byte("volume\n")
 	_, err = container.Write(containerInput)
 	assert.NoError(t, err)
-
 	readBuffer := readOutputUntil(t, container, string(fileContent))
-	assert.Equals(t, len(readBuffer) > 0, true)
+	assert.GreaterThan(t, len(readBuffer), 0)
 
 	t.Cleanup(func() {
 		assert.NoError(t, container.Close())
@@ -154,7 +157,7 @@ func TestSimpleVolume(t *testing.T) {
 var nameTemplate = `
 {
   "podman":{
-     "path":"/usr/bin/podman",
+     "path":"podman",
      "containerNamePrefix":"%s"
   }
 }
@@ -207,9 +210,13 @@ func TestContainerName(t *testing.T) {
 var cgroupTemplate = `
 {
    "podman":{
-      "path":"/usr/bin/podman",
-      "containerNamePrefix":"%s",
-      "cgroupNs":"%s"
+      "path":"podman",
+      "containerNamePrefix":"%s"
+   },
+   "deployment":{
+	   "host":{
+		  "CgroupnsMode":"%s"
+	   }
    }
 }
 `
@@ -271,7 +278,8 @@ func TestPrivateCgroupNs(t *testing.T) {
 	logger := log.NewTestLogger(t)
 
 	var wg sync.WaitGroup
-	userCgroupNs := tests.GetCommmandCgroupNs(logger, "/usr/bin/sleep", []string{"3"})
+	// Assume sleep is in the path. Because it's not in the same location for every user.
+	userCgroupNs := tests.GetCommmandCgroupNs(logger, "sleep", []string{"3"})
 	assert.NotNil(t, userCgroupNs)
 	logger.Debugf("Detected cgroup namespace for user: %s", userCgroupNs)
 
@@ -304,10 +312,15 @@ func TestPrivateCgroupNs(t *testing.T) {
 }
 
 func TestHostCgroupNs(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skipf("Not running on Linux. Skipping cgroup test.")
+		return
+	}
 	logger := log.NewTestLogger(t)
 	var wg sync.WaitGroup
 
-	userCgroupNs := tests.GetCommmandCgroupNs(logger, "/usr/bin/sleep", []string{"3"})
+	// Assume sleep is in the path. Because it's not in the same location for every user.
+	userCgroupNs := tests.GetCommmandCgroupNs(logger, "sleep", []string{"3"})
 	assert.NotNil(t, userCgroupNs)
 
 	logger.Debugf("Detected cgroup namespace for user: %s", userCgroupNs)
@@ -334,7 +347,7 @@ func TestHostCgroupNs(t *testing.T) {
 	assert.NotNil(t, podmanCgroupNs)
 	wg.Wait()
 
-	assert.Equals(t, userCgroupNs == podmanCgroupNs, true)
+	assert.Equals(t, userCgroupNs, podmanCgroupNs)
 
 	t.Cleanup(func() {
 		assert.NoError(t, container.Close())
@@ -400,8 +413,12 @@ var networkTemplate = `
 {
    "podman":{
       "containerNamePrefix":"%s",
-      "path":"/usr/bin/podman",
-      "networkMode":"%s"
+      "path":"podman"
+   },
+   "deployment":{
+	   "host":{
+		  "NetworkMode":"%s"
+	   }
    }
 }
 `
@@ -502,6 +519,7 @@ func readOutputUntil(t *testing.T, plugin io.Reader, lookForOutput string) []byt
 			if err != io.EOF {
 				t.Fatalf("error while reading stdout: %s", err.Error())
 			} else {
+				t.Errorf("Hit EOF.")
 				return readBuffer[:n]
 			}
 		}

go.mod

@@ -5,7 +5,6 @@ go 1.18
 require (
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
-	github.com/joho/godotenv v1.5.1
 	go.arcalot.io/assert v1.6.0
 	go.arcalot.io/lang v1.0.0
 	go.flow.arcalot.io/deployer v0.4.0

schema.go

@@ -216,7 +216,7 @@ var Schema = schema.NewTypedScopeSchema[*Config](
 				nil,
 			),
 			"NetworkMode": schema.NewPropertySchema(
-				schema.NewStringSchema(nil, nil, regexp.MustCompile("^(none|bridge|host|container:[a-zA-Z0-9][a-zA-Z0-9_.-]+|[a-zA-Z0-9][a-zA-Z0-9_.-]+)$")),
+				schema.NewStringSchema(nil, nil, regexp.MustCompile("^(none|private|bridge(:.+)?|host|container:[a-zA-Z0-9][a-zA-Z0-9_.-]+|[a-zA-Z0-9][a-zA-Z0-9_.-]+|pasta:.+|slirp4netns:.+|ns:.+)$")),
 				schema.NewDisplayValue(schema.PointerTo("Network mode"), schema.PointerTo("Specifies either the network mode, the container network to attach to, or a name of a Docker network to use."), nil),
 				false,
 				nil,
@@ -271,11 +271,7 @@ var Schema = schema.NewTypedScopeSchema[*Config](
 				nil,
 			).Disable(notImplemented),
 			"CgroupnsMode": schema.NewPropertySchema(
-				schema.NewStringEnumSchema(map[string]*schema.DisplayValue{
-					"private": {NameValue: schema.PointerTo("Private")},
-					"host":    {NameValue: schema.PointerTo("Host")},
-					"":        {NameValue: schema.PointerTo("Empty")},
-				}),
+				schema.NewStringSchema(nil, nil, regexp.MustCompile("host|private|ns:.+|container:.+")),
 				schema.NewDisplayValue(schema.PointerTo("CGroup namespace mode"), schema.PointerTo("CGroup namespace mode to use for the container."), nil),
 				false,
 				nil,

tests/common.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/joho/godotenv"
 	log "go.arcalot.io/log/v2"
 	"os"
 	"os/exec"
@@ -27,10 +26,11 @@ type BasicInspection struct {
 }
 
 func GetPodmanPath() string {
-	if err := godotenv.Load("../../tests/env/test.env"); err != nil {
-		panic(err)
+	envPath := os.Getenv("PODMAN_PATH")
+	if len(envPath) > 0 {
+		return envPath
 	}
-	return os.Getenv("PODMAN_PATH")
+	return "podman"
 }
 
 func RemoveImage(logger log.Logger, image string) {