fix(cli/templatepush): only implicitly read from stdin if the directory flag is unset

ethanndickson · ethanndickson · commit 58a6752d1d0a · 2025-09-03T01:00:02.000Z
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -309,8 +309,9 @@ func (pf *templateUploadFlags) stdin(inv *serpent.Invocation) (out bool) {
 			inv.Logger.Info(inv.Context(), "uploading tar read from stdin")
 		}
 	}()
-	// We let the directory override our isTTY check
-	return pf.directory == "-" || (!isTTYIn(inv) && pf.directory == ".")
+	// We read a tar from stdin if the directory is "-" or if we're not in a
+	// TTY and the directory flag is unset.
+	return pf.directory == "-" || (!isTTYIn(inv) && !inv.ParsedFlags().Lookup("directory").Changed)
 }
 
 func (pf *templateUploadFlags) upload(inv *serpent.Invocation, client *codersdk.Client) (*codersdk.UploadResponse, error) {

Original file line number	Diff line number	Diff line change
`@@ -309,8 +309,9 @@ func (pf templateUploadFlags) stdin(inv serpent.Invocation) (out bool) {`
`309`	`309`	`inv.Logger.Info(inv.Context(), "uploading tar read from stdin")`
`310`	`310`	`}`
`311`	`311`	`}()`
`312`		`- // We let the directory override our isTTY check`
`313`		`- return pf.directory == "-" \|\| (!isTTYIn(inv) && pf.directory == ".")`
	`312`	`+ // We read a tar from stdin if the directory is "-" or if we're not in a`
	`313`	`+ // TTY and the directory flag is unset.`
	`314`	`+ return pf.directory == "-" \|\| (!isTTYIn(inv) && !inv.ParsedFlags().Lookup("directory").Changed)`
`314`	`315`	`}`
`315`	`316`
`316`	`317`	`func (pf templateUploadFlags) upload(inv serpent.Invocation, client codersdk.Client) (codersdk.UploadResponse, error) {`