Wrap devpodignore with nil check on workspace

loft-sh · Nov 1, 2024 · 8c49c5e · 8c49c5e
1 parent 0a539e4
commit 8c49c5e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pkg/agent/tunnelserver/tunnelserver.go b/pkg/agent/tunnelserver/tunnelserver.go
@@ -419,16 +419,18 @@ func (t *tunnelServer) StreamMount(message *tunnel.StreamMountRequest, stream tu
 
 	// Get .devpodignore files to exclude
 	excludes := []string{}
-	f, err := os.Open(filepath.Join(t.workspace.Source.LocalFolder, ".devpodignore"))
-	if err == nil {
-		excludes, err = dockerignore.ReadAll(f)
-		if err != nil {
-			t.log.Warnf("Error reading .devpodignore file: %v", err)
+	if t.workspace != nil {
+		f, err := os.Open(filepath.Join(t.workspace.Source.LocalFolder, ".devpodignore"))
+		if err == nil {
+			excludes, err = dockerignore.ReadAll(f)
+			if err != nil {
+				t.log.Warnf("Error reading .devpodignore file: %v", err)
+			}
 		}
 	}
 
 	buf := bufio.NewWriterSize(NewStreamWriter(stream, t.log), 10*1024)
-	err = extract.WriteTarExclude(buf, mount.Source, false, excludes)
+	err := extract.WriteTarExclude(buf, mount.Source, false, excludes)
 	if err != nil {
 		return err
 	}