fix dockerignore and tarball uploads for cloud agents (#673)

real-danm · web-flow · commit 7c6f729252db · 2025-08-30T15:24:21.000-06:00
* fix dockerignore for projects without a dockerignore and loading an existing dockerignore

* ensure we include the Dockerfile in the upload as it's required for the build

* add tests for windows, mac and ubuntu

* fix test log

* update to toolchain version and set workflow perms

* typo

* remove test fmt for now, use path.Join with embedded fs instead of filepath.Join

* add back test fmt

* fix gotestfmt

* remove gotestfmt since it's panicing on some output

* bump version
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,52 @@
+name: Go Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    permissions:
+      contents: read
+      packages: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.25"
+          cache: true
+
+      - name: Download Go modules
+        run: go mod download
+
+      - name: Static Check
+        uses: dominikh/staticcheck-action@v1
+        with:
+          checks: '["all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-SA1019"]'
+          version: "latest"
+          install-go: false
+
+      - name: Test
+        shell: bash
+        run: |
+          set -euo pipefail
+          go test -race -json -v ./... 2>&1 | tee test.log
+
+      - name: Upload test log
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-log-${{ matrix.os }}
+          path: test.log
+          if-no-files-found: warn
diff --git a/cmd/lk/agent.go b/cmd/lk/agent.go
@@ -432,7 +432,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	err = agentfs.UploadTarball(workingDir, resp.PresignedUrl, []string{config.LiveKitTOMLFile})
+	err = agentfs.UploadTarball(workingDir, resp.PresignedUrl, []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}, projectType)
 	if err != nil {
 		return err
 	}
@@ -595,7 +595,7 @@ func deployAgent(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	presignedUrl := resp.PresignedUrl
-	err = agentfs.UploadTarball(workingDir, presignedUrl, []string{config.LiveKitTOMLFile})
+	err = agentfs.UploadTarball(workingDir, presignedUrl, []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}, projectType)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/agentfs/docker.go b/pkg/agentfs/docker.go
@@ -73,12 +73,12 @@ func GenerateDockerArtifacts(dir string, projectType ProjectType, settingsMap ma
 		return nil, nil, fmt.Errorf("unable to fetch client settings from server, please try again later")
 	}
 
-	dockerfileContent, err := fs.ReadFile("examples/" + string(projectType) + ".Dockerfile")
+	dockerfileContent, err := fs.ReadFile(filepath.Join("examples", string(projectType)+".Dockerfile"))
 	if err != nil {
 		return nil, nil, err
 	}
 
-	dockerIgnoreContent, err := fs.ReadFile("examples/" + string(projectType) + ".dockerignore")
+	dockerIgnoreContent, err := fs.ReadFile(filepath.Join("examples", string(projectType)+".dockerignore"))
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/pkg/agentfs/docker_test.go b/pkg/agentfs/docker_test.go
@@ -1,17 +1,18 @@
 package agentfs
 
 import (
+	"path"
 	"testing"
 )
 
 func TestLoadDockerFiles(t *testing.T) {
 	expectedFiles := []string{
-		"examples/node.Dockerfile",
-		"examples/node.dockerignore",
-		"examples/python.pip.Dockerfile",
-		"examples/python.pip.dockerignore",
-		"examples/python.uv.Dockerfile",
-		"examples/python.uv.dockerignore",
+		path.Join("examples", "node.Dockerfile"),
+		path.Join("examples", "node.dockerignore"),
+		path.Join("examples", "python.pip.Dockerfile"),
+		path.Join("examples", "python.pip.dockerignore"),
+		path.Join("examples", "python.uv.Dockerfile"),
+		path.Join("examples", "python.uv.dockerignore"),
 	}
 
 	for _, file := range expectedFiles {
diff --git a/pkg/agentfs/examples/node.dockerignore b/pkg/agentfs/examples/node.dockerignore
@@ -1,25 +1,25 @@
 # Node.js dependencies
-node_modules
-npm-debug.log
-yarn-error.log
-pnpm-debug.log
+**/node_modules
+**/npm-debug.log
+**/yarn-error.log
+**/pnpm-debug.log
 
 # Build outputs
-dist
-build
-coverage
+**/dist
+**/build
+**/coverage
 
 # Local environment & config files
-.env
-.env.local
+**/.env
+**/.env.local
 .DS_Store
 
 # Logs & temp files
-*.log
-*.gz
-*.tgz
-.tmp
-.cache
+**/*.log
+**/*.gz
+**/*.tgz
+**/.tmp
+**/.cache
 
 # Docker artifacts
 Dockerfile*
diff --git a/pkg/agentfs/examples/python.pip.dockerignore b/pkg/agentfs/examples/python.pip.dockerignore
@@ -1,32 +1,32 @@
 # Python bytecode and artifacts
-__pycache__/
-*.py[cod]
-*.pyo
-*.pyd
-*.egg-info/
-dist/
-build/
+**/__pycache__/
+**/*.py[cod]
+**/*.pyo
+**/*.pyd
+**/*.egg-info/
+**/dist/
+**/build/
 
 # Virtual environments
-.venv/
-venv/
+**/.venv/
+**/venv/
 
 # Caches and test output
-.cache/
-.pytest_cache/
-.ruff_cache/
-coverage/
+**/.cache/
+**/.pytest_cache/
+**/.ruff_cache/
+**/coverage/
 
 # Logs and temp files
-*.log
-*.gz
-*.tgz
-.tmp
-.cache
+**/*.log
+**/*.gz
+**/*.tgz
+**/.tmp
+**/.cache
 
 # Environment variables
-.env
-.env.*
+**/.env
+**/.env.*
 
 # VCS, editor, OS
 .git
@@ -45,4 +45,4 @@ LICENSE
 test/
 tests/
 eval/
-evals/
+evals/
diff --git a/pkg/agentfs/examples/python.uv.dockerignore b/pkg/agentfs/examples/python.uv.dockerignore
@@ -1,32 +1,32 @@
 # Python bytecode and artifacts
-__pycache__/
-*.py[cod]
-*.pyo
-*.pyd
-*.egg-info/
-dist/
-build/
+**/__pycache__/
+**/*.py[cod]
+**/*.pyo
+**/*.pyd
+**/*.egg-info/
+**/dist/
+**/build/
 
 # Virtual environments
-.venv/
-venv/
+**/.venv/
+**/venv/
 
 # Caches and test output
-.cache/
-.pytest_cache/
-.ruff_cache/
-coverage/
+**/.cache/
+**/.pytest_cache/
+**/.ruff_cache/
+**/coverage/
 
 # Logs and temp files
-*.log
-*.gz
-*.tgz
-.tmp
-.cache
+**/*.log
+**/*.gz
+**/*.tgz
+**/.tmp
+**/.cache
 
 # Environment variables
-.env
-.env.*
+**/.env
+**/.env.*
 
 # VCS, editor, OS
 .git
@@ -45,4 +45,4 @@ LICENSE
 test/
 tests/
 eval/
-evals/
+evals/
diff --git a/pkg/agentfs/tar.go b/pkg/agentfs/tar.go
diff --git a/pkg/agentfs/tar_test.go b/pkg/agentfs/tar_test.go
diff --git a/version.go b/version.go

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {`
`432`	`432`	`return err`
`433`	`433`	`}`
`434`	`434`
`435`		`- err = agentfs.UploadTarball(workingDir, resp.PresignedUrl, []string{config.LiveKitTOMLFile})`
	`435`	`+ err = agentfs.UploadTarball(workingDir, resp.PresignedUrl, []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}, projectType)`
`436`	`436`	`if err != nil {`
`437`	`437`	`return err`
`438`	`438`	`}`
`@@ -595,7 +595,7 @@ func deployAgent(ctx context.Context, cmd *cli.Command) error {`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`presignedUrl := resp.PresignedUrl`
`598`		`- err = agentfs.UploadTarball(workingDir, presignedUrl, []string{config.LiveKitTOMLFile})`
	`598`	`+ err = agentfs.UploadTarball(workingDir, presignedUrl, []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)}, projectType)`
`599`	`599`	`if err != nil {`
`600`	`600`	`return err`
`601`	`601`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ func GenerateDockerArtifacts(dir string, projectType ProjectType, settingsMap ma`
`73`	`73`	`return nil, nil, fmt.Errorf("unable to fetch client settings from server, please try again later")`
`74`	`74`	`}`
`75`	`75`
`76`		`- dockerfileContent, err := fs.ReadFile("examples/" + string(projectType) + ".Dockerfile")`
	`76`	`+ dockerfileContent, err := fs.ReadFile(filepath.Join("examples", string(projectType)+".Dockerfile"))`
`77`	`77`	`if err != nil {`
`78`	`78`	`return nil, nil, err`
`79`	`79`	`}`
`80`	`80`
`81`		`- dockerIgnoreContent, err := fs.ReadFile("examples/" + string(projectType) + ".dockerignore")`
	`81`	`+ dockerIgnoreContent, err := fs.ReadFile(filepath.Join("examples", string(projectType)+".dockerignore"))`
`82`	`82`	`if err != nil {`
`83`	`83`	`return nil, nil, err`
`84`	`84`	`}`