Skip to content

ssh: improve debug logging #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbajolet-hashicorp merged 1 commit into from
Apr 28, 2023
Merged

ssh: improve debug logging #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions sdk-internals/communicator/ssh/communicator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,9 @@ func (c *comm) sftpUploadDirSession(dst string, src string, excl []string) error
sftpFunc := func(client *sftp.Client) error {
rootDst := dst
if src[len(src)-1] != '/' {
log.Printf("[DEBUG] No trailing slash, creating the source directory name")
rootDst = filepath.Join(dst, filepath.Base(src))
srcBase := filepath.Base(src)
log.Printf("[DEBUG] sftp: No trailing slash, creating directory %s/%s", dst, srcBase)
rootDst = filepath.Join(dst, srcBase)
}
walkFunc := func(path string, info os.FileInfo, err error) error {
if err != nil {
Expand All @@ -545,9 +546,12 @@ func (c *comm) sftpUploadDirSession(dst string, src string, excl []string) error
// to the sftp server
finalDst = filepath.ToSlash(finalDst)

log.Printf("[DEBUG] sftp: uploading %q to %q", relSrc, finalDst)

// Skip the creation of the target destination directory since
// it should exist and we might not even own it
if finalDst == dst {
log.Printf("[DEBUG] sftp: skipping creation of %q", dst)
return nil
}

Expand Down Expand Up @@ -689,12 +693,13 @@ func (c *comm) scpUploadDirSession(dst string, src string, excl []string) error
}

if src[len(src)-1] != '/' {
log.Printf("[DEBUG] No trailing slash, creating the source directory name")
srcBase := filepath.Base(src)
log.Printf("[DEBUG] scp: No trailing slash, creating directory %s/%s", dst, srcBase)
fi, err := os.Stat(src)
if err != nil {
return err
}
return scpUploadDirProtocol(filepath.Base(src), w, r, uploadEntries, fi)
return scpUploadDirProtocol(srcBase, w, r, uploadEntries, fi)
} else {
// Trailing slash, so only upload the contents
return uploadEntries()
Expand Down Expand Up @@ -961,6 +966,8 @@ func scpUploadDirProtocol(name string, w io.Writer, r *bufio.Reader, f func() er
}

func scpUploadDir(root string, fs []os.FileInfo, w io.Writer, r *bufio.Reader) error {
log.Printf("[DEBUG] scp: uploading directory %s", root)

for _, fi := range fs {
realPath := filepath.Join(root, fi.Name())

Expand Down