fs.FS!

Author: yoonsio

pkg/agentfs/client.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/fs"
 	"net/http"
 	"os"
 	"regexp"
@@ -100,7 +101,7 @@ func WithHTTPClient(httpClient *http.Client) ClientOption {
 // CreateAgent creates a new agent by building from source.
 func (c *Client) CreateAgent(
 	ctx context.Context,
-	workingDir string,
+	source fs.FS,
 	secrets []*lkproto.AgentSecret,
 	regions []string,
 	excludeFiles []string,
@@ -116,7 +117,7 @@ func (c *Client) CreateAgent(
 		resp.AgentId,
 		resp.PresignedUrl,
 		resp.PresignedPostRequest,
-		workingDir,
+		source,
 		excludeFiles,
 	); err != nil {
 		return nil, err
@@ -128,7 +129,7 @@ func (c *Client) CreateAgent(
 func (c *Client) DeployAgent(
 	ctx context.Context,
 	agentID string,
-	workingDir string,
+	source fs.FS,
 	secrets []*lkproto.AgentSecret,
 	excludeFiles []string,
 ) error {
@@ -142,7 +143,7 @@ func (c *Client) DeployAgent(
 	if !resp.Success {
 		return fmt.Errorf("failed to deploy agent: %s", resp.Message)
 	}
-	return c.uploadAndBuild(ctx, agentID, resp.PresignedUrl, resp.PresignedPostRequest, workingDir, excludeFiles)
+	return c.uploadAndBuild(ctx, agentID, resp.PresignedUrl, resp.PresignedPostRequest, source, excludeFiles)
 }
 
 // uploadAndBuild uploads the source and triggers remote build
@@ -151,15 +152,15 @@ func (c *Client) uploadAndBuild(
 	agentID string,
 	presignedUrl string,
 	presignedPostRequest *lkproto.PresignedPostRequest,
-	workingDir string,
+	source fs.FS,
 	excludeFiles []string,
 ) error {
-	projectType, err := DetectProjectType(workingDir)
+	projectType, err := DetectProjectType(source)
 	if err != nil {
 		return err
 	}
 	if err := UploadTarball(
-		workingDir,
+		source,
 		presignedUrl,
 		presignedPostRequest,
 		excludeFiles,

pkg/agentfs/tar.go

@@ -20,6 +20,7 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
+	"io/fs"
 	"mime/multipart"
 	"net/http"
 	"os"
@@ -54,17 +55,17 @@ var (
 )
 
 func UploadTarball(
-	directory string,
+	directory fs.FS,
 	presignedUrl string,
 	presignedPostRequest *livekit.PresignedPostRequest,
 	excludeFiles []string,
 	projectType ProjectType,
 ) error {
 	excludeFiles = append(excludeFiles, defaultExcludePatterns...)
 
-	loadExcludeFiles := func(filename string) (bool, string, error) {
-		if _, err := os.Stat(filename); err == nil {
-			content, err := os.ReadFile(filename)
+	loadExcludeFiles := func(dir fs.FS, filename string) (bool, string, error) {
+		if _, err := fs.Stat(dir, filename); err == nil {
+			content, err := fs.ReadFile(dir, filename)
 			if err != nil {
 				return false, "", err
 			}
@@ -75,7 +76,7 @@ func UploadTarball(
 
 	foundDockerIgnore := false
 	for _, exclude := range ignoreFilePatterns {
-		found, content, err := loadExcludeFiles(path.Join(directory, exclude))
+		found, content, err := loadExcludeFiles(directory, exclude)
 		if err != nil {
 			logger.Debugw("failed to load exclude file", "filename", exclude, "error", err)
 			continue
@@ -89,7 +90,7 @@ func UploadTarball(
 	// need to ensure we use a dockerignore file
 	// if we fail to load a dockerignore file, we have to exit
 	if !foundDockerIgnore {
-		dockerIgnoreContent, err := fs.ReadFile(path.Join("examples", string(projectType)+".dockerignore"))
+		dockerIgnoreContent, err := fs.ReadFile(directory, path.Join("examples", string(projectType)+".dockerignore"))
 		if err != nil {
 			return fmt.Errorf("failed to load exclude file %s: %w", string(projectType), err)
 		}
@@ -105,7 +106,7 @@ func UploadTarball(
 		excludeFiles[i] = strings.TrimSpace(exclude)
 	}
 
-	checkFilesToInclude := func(path string, info os.FileInfo) bool {
+	checkFilesToInclude := func(path string) bool {
 		fileName := filepath.Base(path)
 		// we have to include the Dockerfile in the upload, as it is required for the build
 		if strings.Contains(fileName, "Dockerfile") {
@@ -123,17 +124,17 @@ func UploadTarball(
 	// we walk the directory first to calculate the total size of the tarball
 	// this lets the progress bar show the correct progress
 	var totalSize int64
-	err = filepath.Walk(directory, func(path string, info os.FileInfo, err error) error {
+	err = fs.WalkDir(directory, ".", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 
-		relPath, err := filepath.Rel(directory, path)
+		info, err := d.Info()
 		if err != nil {
-			return nil
+			return err
 		}
 
-		if !checkFilesToInclude(relPath, info) {
+		if !checkFilesToInclude(path) {
 			return nil
 		}
 
@@ -166,17 +167,19 @@ func UploadTarball(
 	tarWriter := tar.NewWriter(gzipWriter)
 	defer tarWriter.Close()
 
-	err = filepath.Walk(directory, func(path string, info os.FileInfo, err error) error {
+	err = fs.WalkDir(directory, ".", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 
-		relPath, err := filepath.Rel(directory, path)
+		info, err := d.Info()
 		if err != nil {
-			return fmt.Errorf("failed to calculate relative path for %s: %w", path, err)
+			return err
 		}
 
-		if !checkFilesToInclude(relPath, info) {
+		relPath := path
+
+		if !checkFilesToInclude(relPath) {
 			logger.Debugw("excluding file from tarball", "path", path)
 			return nil
 		}

pkg/agentfs/utils.go

@@ -17,6 +17,7 @@ package agentfs
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -110,7 +111,7 @@ func LocateLockfile(dir string, p ProjectType) (bool, string) {
 	return false, ""
 }
 
-func DetectProjectType(dir string) (ProjectType, error) {
+func DetectProjectType(dir fs.FS) (ProjectType, error) {
 	// Node.js detection
 	if util.FileExists(dir, "package.json") {
 		return ProjectTypeNode, nil
@@ -127,8 +128,7 @@ func DetectProjectType(dir string) (ProjectType, error) {
 		return ProjectTypePythonPip, nil
 	}
 	if util.FileExists(dir, "pyproject.toml") {
-		tomlPath := filepath.Join(dir, "pyproject.toml")
-		data, err := os.ReadFile(tomlPath)
+		data, err := fs.ReadFile(dir, "pyproject.toml")
 		if err == nil {
 			var doc map[string]any
 			if err := toml.Unmarshal(data, &doc); err == nil {

pkg/util/fs.go

@@ -17,6 +17,7 @@ package util
 import (
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
@@ -25,8 +26,8 @@ import (
 	"github.com/livekit/protocol/utils/guid"
 )
 
-func FileExists(dir, filename string) bool {
-	_, err := os.Stat(filepath.Join(dir, filename))
+func FileExists(dir fs.FS, filename string) bool {
+	_, err := fs.Stat(dir, filename)
 	return err == nil
 }