Merge pull request #418 from databacker/smb-user-pass

properly plumb through SMB username and password

Author: deitch

cmd/root.go

@@ -239,6 +239,17 @@ func rootCmd(execs execs) (*cobra.Command, error) {
 	pflags.String("smb-pass", "", "SMB username")
 	pflags.String("smb-domain", "", "SMB domain")
 
+	// override the DB_ for these
+	if err := v.BindEnv("smb-user", "SMB_USER"); err != nil {
+		return nil, err
+	}
+	if err := v.BindEnv("smb-pass", "SMB_PASS"); err != nil {
+		return nil, err
+	}
+	if err := v.BindEnv("smb-domain", "SMB_DOMAIN"); err != nil {
+		return nil, err
+	}
+
 	for _, subCmd := range subCommands {
 		if sc, err := subCmd(execs, cmdConfig); err != nil {
 			return nil, err

pkg/storage/smb/smb.go

@@ -131,7 +131,9 @@ func (s *SMB) Remove(ctx context.Context, target string, logger *log.Entry) erro
 
 func (s *SMB) exec(u url.URL, command func(fs *smb2.Share, sharepath string) error) error {
 	var (
-		username, password, domain string
+		username = s.username
+		password = s.password
+		domain   = s.domain
 	)
 
 	hostname, port, path := u.Hostname(), u.Port(), u.Path
@@ -144,10 +146,9 @@ func (s *SMB) exec(u url.URL, command func(fs *smb2.Share, sharepath string) err
 	if s.username == "" && u.User != nil {
 		username = u.User.Username()
 		password, _ = u.User.Password()
+		username, domain = parseSMBDomain(username)
 	}
 
-	username, domain = parseSMBDomain(username)
-
 	conn, err := net.Dial("tcp", host)
 	if err != nil {
 		return err