fix: adjust docker api version setting

kimdre · Aug 4, 2024 · f35d7db · f35d7db
1 parent 773a3df
commit f35d7db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,3 +21,5 @@ jobs:
       - run: go mod download
       - run: go test -v -cover -p 1 ./internal/...
         timeout-minutes: 5
+        env:
+          WEBHOOK_SECRET: test_Secret1
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ BINARY_NAME=docker-compose-webhook
 
 test:
 	@echo "Running tests..."
-	@go test -p 1 -v ./... -timeout 5m
+	@WEBHOOK_SECRET="test_Secret1" go test -p 1 -v ./... -timeout 5m
 
 build:
 	mkdir -p $(BINARY_DIR)

diff --git a/internal/docker/compose_test.go b/internal/docker/compose_test.go
@@ -38,9 +38,8 @@ func createTestFile(fileName string, content string) error {
 }
 
 var (
-	dockerAPIVersion = "v1.40"
-	projectName      = "test"
-	composeContents  = `services:
+	projectName     = "test"
+	composeContents = `services:
   test:
     image: nginx:latest
     environment:
@@ -49,7 +48,12 @@ var (
 )
 
 func TestVerifySocketConnection(t *testing.T) {
-	err := VerifySocketConnection(dockerAPIVersion)
+	c, err := config.GetAppConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = VerifySocketConnection(c.DockerAPIVersion)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -82,9 +86,14 @@ func TestLoadCompose(t *testing.T) {
 }
 
 func TestDeployCompose(t *testing.T) {
+	c, err := config.GetAppConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	t.Log("Verify socket connection")
 
-	err := VerifySocketConnection(dockerAPIVersion)
+	err = VerifySocketConnection(c.DockerAPIVersion)
 	if err != nil {
 		t.Fatal(err)
 	}