Merge pull request #96 from interlink-hq/feat/add-unit-tests

dciangot · web-flow · commit 1fd6e9056f52 · 2025-10-09T09:43:10.000+02:00
test: add unit tests for core utility functions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,6 +21,7 @@ jobs:
           workdir: ci
           verb: call
           args: -s test --interlink-version 0.5.2 --src ../ --plugin-config ./manifests/plugin-config.yaml --manifests ./manifests
+          args: -s test   --interlink-version latest  --src ./ --plugin-config ./ci/manifests/plugin-config.yaml --manifests ./ci/manifests
           cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
-          version: "0.18.9"
+          version: "0.19.1"
 
diff --git a/ci/main.go b/ci/main.go
@@ -17,24 +17,35 @@ package main
 import (
 	"context"
 	"dagger/interlink-slurm/internal/dagger"
+	"time"
 )
 
 type InterlinkSlurm struct{}
 
-func (m *InterlinkSlurm) RunTest(interlinkVersion string, pluginService *dagger.Service, manifests *dagger.Directory, interlinkConfig *dagger.File, pluginConfig *dagger.File, src *dagger.Directory,
+// UnitTest runs the unit tests using make test
+func (m *InterlinkSlurm) UnitTest(ctx context.Context, src *dagger.Directory) (string, error) {
+	return dag.Container().
+		From("golang:1.24").
+		WithDirectory("/src", src).
+		WithWorkdir("/src").
+		WithExec([]string{"make", "test"}).
+		Stdout(ctx)
+}
+
+func (m *InterlinkSlurm) RunTest(interlinkVersion string, pluginService *dagger.Service, manifests *dagger.Directory, interlinkEndpoint *dagger.Service, pluginConfig *dagger.File, src *dagger.Directory,
 ) *dagger.Container {
 	registry := dag.Container().From("registry").
 		WithExposedPort(5000).AsService()
 
 	return dag.Interlink("ci", dagger.InterlinkOpts{
-		VirtualKubeletRef: "ghcr.io/intertwin-eu/interlink/virtual-kubelet-inttw:" + interlinkVersion,
-		InterlinkRef:      "ghcr.io/intertwin-eu/interlink/interlink:" + interlinkVersion,
+		VirtualKubeletRef: "ghcr.io/interlink-hq/interlink/virtual-kubelet-inttw:" + interlinkVersion,
+		InterlinkRef:      "ghcr.io/interlink-hq/interlink/interlink:" + interlinkVersion,
 	}).NewInterlink(dagger.InterlinkNewInterlinkOpts{
-		PluginEndpoint:  pluginService,
-		Manifests:       manifests,
-		InterlinkConfig: interlinkConfig,
-		PluginConfig:    pluginConfig,
-		LocalRegistry:   registry,
+		PluginEndpoint:    pluginService,
+		Manifests:         manifests,
+		InterlinkEndpoint: interlinkEndpoint,
+		PluginConfig:      pluginConfig,
+		LocalRegistry:     registry,
 	}).Test(dagger.InterlinkTestOpts{
 		Manifests:    manifests,
 		SourceFolder: src,
@@ -46,16 +57,17 @@ func (m *InterlinkSlurm) Test(ctx context.Context, interlinkVersion string, src
 	// +optional
 	pluginEndpoint *dagger.Service,
 	// +optional
-	// +defaultPath="./manifests/plugin-config.yaml"
+	interlinkEndpoint *dagger.Service,
+	// +optional
+	// +defaultPath="./manifests/interlink-config.yaml"
 	interlinkConfig *dagger.File,
 ) (string, error) {
 	if pluginEndpoint == nil {
 
 		// build using Dockerfile and publish to registry
-		plugin := dag.Container().
-			Build(src, dagger.ContainerBuildOpts{
-				Dockerfile: "docker/Dockerfile",
-			}).
+		plugin := src.DockerBuild(dagger.DirectoryDockerBuildOpts{
+			Dockerfile: "docker/Dockerfile",
+		}).
 			WithFile("/etc/interlink/InterLinkConfig.yaml", pluginConfig).
 			WithEnvVariable("SLURMCONFIGPATH", "/etc/interlink/InterLinkConfig.yaml").
 			WithEnvVariable("SHARED_FS", "true").
@@ -65,8 +77,25 @@ func (m *InterlinkSlurm) Test(ctx context.Context, interlinkVersion string, src
 		if err != nil {
 			return "", err
 		}
-		return m.RunTest(interlinkVersion, pluginEndpoint, manifests, interlinkConfig, pluginConfig, src).Stdout(ctx)
+
+		interlink := dag.Container().From("ghcr.io/interlink-hq/interlink/interlink:"+interlinkVersion).
+			WithFile("/etc/interlink/InterLinkConfig.yaml", interlinkConfig).
+			WithEnvVariable("BUST", time.Now().String()).
+			WithServiceBinding("plugin", pluginEndpoint).
+			WithEnvVariable("INTERLINKCONFIGPATH", "/etc/interlink/InterLinkConfig.yaml").
+			WithExposedPort(3000)
+
+		interlinkEndpoint, err = interlink.
+			AsService(
+				dagger.ContainerAsServiceOpts{
+					UseEntrypoint:            true,
+					InsecureRootCapabilities: true,
+				}).Start(ctx)
+		if err != nil {
+			return "", err
+		}
+		return m.RunTest(interlinkVersion, pluginEndpoint, manifests, interlinkEndpoint, pluginConfig, src).Stdout(ctx)
 	}
 
-	return m.RunTest(interlinkVersion, pluginEndpoint, manifests, interlinkConfig, pluginConfig, src).Stdout(ctx)
+	return m.RunTest(interlinkVersion, pluginEndpoint, manifests, interlinkEndpoint, pluginConfig, src).Stdout(ctx)
 }
diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	al.essio.dev/pkg/shellescape v1.5.0
 	github.com/alexellis/go-execute v0.6.0
 	github.com/containerd/containerd v1.7.6
+	github.com/goccy/go-yaml v1.18.0
 	github.com/google/uuid v1.6.0
 	github.com/intertwin-eu/interlink v0.0.0-20250203130222-964ed80a8c1a
 	github.com/sirupsen/logrus v1.9.3
@@ -17,7 +18,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.27.0
 	go.opentelemetry.io/otel/trace v1.27.0
 	google.golang.org/grpc v1.64.0
-	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.29.1
 	k8s.io/apimachinery v0.29.1
 	k8s.io/client-go v0.29.1
@@ -56,6 +56,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
diff --git a/go.sum b/go.sum
@@ -28,6 +28,8 @@ github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogB
 github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
diff --git a/pkg/slurm/func.go b/pkg/slurm/func.go
@@ -11,7 +11,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/containerd/containerd/log"
-	"gopkg.in/yaml.v2"
+	"github.com/goccy/go-yaml"
 )
 
 var SlurmConfigInst SlurmConfig
diff --git a/pkg/slurm/func_test.go b/pkg/slurm/func_test.go
@@ -0,0 +1,78 @@
+package slurm
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestGetSessionContext(t *testing.T) {
+	tests := []struct {
+		name           string
+		headerValue    string
+		expectedResult string
+	}{
+		{
+			name:           "header present",
+			headerValue:    "session-123",
+			expectedResult: "session-123",
+		},
+		{
+			name:           "header empty",
+			headerValue:    "",
+			expectedResult: "NoSessionFound#0",
+		},
+		{
+			name:           "header with special characters",
+			headerValue:    "session@456#abc",
+			expectedResult: "session@456#abc",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := httptest.NewRequest(http.MethodGet, "/test", nil)
+			if tt.headerValue != "" {
+				req.Header.Set("InterLink-Http-Session", tt.headerValue)
+			}
+
+			result := GetSessionContext(req)
+			if result != tt.expectedResult {
+				t.Errorf("GetSessionContext() = %q, want %q", result, tt.expectedResult)
+			}
+		})
+	}
+}
+
+func TestGetSessionContextMessage(t *testing.T) {
+	tests := []struct {
+		name           string
+		sessionContext string
+		expectedResult string
+	}{
+		{
+			name:           "normal session",
+			sessionContext: "session-123",
+			expectedResult: "HTTP InterLink session session-123: ",
+		},
+		{
+			name:           "empty session",
+			sessionContext: "",
+			expectedResult: "HTTP InterLink session : ",
+		},
+		{
+			name:           "default no session",
+			sessionContext: "NoSessionFound#0",
+			expectedResult: "HTTP InterLink session NoSessionFound#0: ",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := GetSessionContextMessage(tt.sessionContext)
+			if result != tt.expectedResult {
+				t.Errorf("GetSessionContextMessage(%q) = %q, want %q", tt.sessionContext, result, tt.expectedResult)
+			}
+		})
+	}
+}
diff --git a/pkg/slurm/prepare_test.go b/pkg/slurm/prepare_test.go

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"k8s.io/client-go/kubernetes"`
`12`	`12`
`13`	`13`	`"github.com/containerd/containerd/log"`
`14`		`- "gopkg.in/yaml.v2"`
	`14`	`+ "github.com/goccy/go-yaml"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`var SlurmConfigInst SlurmConfig`