ignore excluded paths when transferring files with stfp

sdk-internals/communicator/ssh/communicator.go

@@ -539,6 +539,12 @@ func (c *comm) sftpUploadDirSession(dst string, src string, excl []string) error
  if err != nil {
  return err
  }
+
+ if excluded := isExcluded(relSrc, excl); excluded {
+ log.Printf("[DEBUG] SCP: skipping excluded file: %s", relSrc)
+ return nil
+ }
+
  finalDst := filepath.Join(rootDst, relSrc)
 
  // In Windows, Join uses backslashes which we don't want to get
@@ -964,16 +970,7 @@ func scpUploadDir(root string, fs []os.FileInfo, w io.Writer, r *bufio.Reader, e
  for _, fi := range fs {
  realPath := filepath.Join(root, fi.Name())
 
- // Check if this file is excluded
- excluded := false
- for _, e := range excl {
- if e == realPath {
- excluded = true
- break
- }
- }
-
- if excluded {
+ if excluded := isExcluded(realPath, excl); excluded {
  log.Printf("[DEBUG] SCP: skipping excluded file: %s", realPath)
  continue
  }
@@ -1038,3 +1035,25 @@ func scpUploadDir(root string, fs []os.FileInfo, w io.Writer, r *bufio.Reader, e
 
  return nil
 }
+
+// isExcluded checks if the given file path is excluded by the given list of
+// excludes.
+// It does shell style matching, so the excludes can contain wildcards.
+func isExcluded(filePath string, excludes []string) bool {
+ // Check if this file is excluded
+ excluded := false
+ log.Printf("[DEBUG] SCP: checking if %v is excluded", excludes)
+ for _, excl := range excludes {
+ log.Printf("[DEBUG] SCP: checking if %s is excluded by %s", filePath, excl)
+ match, err := filepath.Match(excl, filePath)
+ if err != nil {
+ log.Printf("[DEBUG] SCP: error matching %s to %s: %s", filePath, excl, err)
+ continue
+ }
+ if match {
+ excluded = true
+ break
+ }
+ }
+ return excluded
+}