Code review changes

cmd/lakectl/cmd/fs_upload.go

@@ -32,16 +32,8 @@ var fsUploadCmd = &cobra.Command{
 
 		ctx, stop := signal.NotifyContext(ctx, os.Interrupt, os.Kill)
 		defer stop()
-		ignoreRecessive := true // Ignore recursive if source is the standard input or a file (not a directory)
-		if source != StdinFileName {
-			stat, err := os.Stat(source)
-			if err != nil {
-				Die("failed to stat source", 1)
-			}
-			ignoreRecessive = !stat.IsDir()
-		}
 
-		if !recursive || ignoreRecessive {
+		if !recursive || isFileOrStdin(source) {
 			if strings.HasSuffix(remotePath, uri.PathSeparator) {
 				Die("target path is not a valid URI", 1)
 			}
@@ -88,6 +80,17 @@ var fsUploadCmd = &cobra.Command{
 	},
 }
 
+func isFileOrStdin(source string) bool {
+	if source == StdinFileName {
+		return true
+	}
+	stat, err := os.Stat(source)
+	if err != nil {
+		Die("failed to stat source", 1)
+	}
+	return !stat.IsDir()
+}
+
 func upload(ctx context.Context, client apigen.ClientWithResponsesInterface, sourcePathname string, destURI *uri.URI, contentType string, syncFlags local.SyncFlags) (*apigen.ObjectStats, error) {
 	fp := Must(OpenByPath(sourcePathname))
 	defer func() {

esti/lakectl_test.go

@@ -118,7 +118,9 @@ func TestLakectlPreSignUpload(t *testing.T) {
 	})
 	t.Run("upload from stdin", func(t *testing.T) {
 		filePath = "sample"
-		RunCmdAndVerifySuccess(t, "echo sample | "+Lakectl()+" -c ~/.lakectl.yaml fs upload -s - lakefs://"+repoName+"/"+mainBranch+"/"+filePath+" --pre-sign", false, "sample", vars)
+		fileContent := "sample"
+		expected := sanitize(fileContent, vars)
+		RunCmdAndVerifySuccess(t, "echo sample | "+Lakectl()+" fs upload -s - lakefs://"+repoName+"/"+mainBranch+"/"+filePath+" --pre-sign", false, expected, vars)
 	})
 }