Skip to content

fix(cli): clarify tty err on non-tty git bootstrap #5661

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

Open
carlosonunez wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(cli): clarify tty err on non-tty git bootstrap #5661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c98d6
fix(cli): clarify tty err on non-tty git bootstrap
carlosonunez Dec 16, 2025
3e8ae92
fixup! fix(cli): clarify tty err on non-tty git bootstrap
carlosonunez Dec 16, 2025
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
6 changes: 6 additions & 0 deletions cmd/flux/bootstrap_git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package main

import (
"context"
"errors"
"fmt"
"net/url"
"os"
Expand All @@ -38,6 +39,7 @@ import (
"github.com/fluxcd/flux2/v2/pkg/manifestgen/install"
"github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret"
"github.com/fluxcd/flux2/v2/pkg/manifestgen/sync"
"github.com/mattn/go-isatty"
)

var bootstrapGitCmd = &cobra.Command{
Expand Down Expand Up @@ -382,6 +384,7 @@ func getAuthOpts(u *url.URL, caBundle []byte) (*git.AuthOptions, error) {
}

func promptPublicKey(ctx context.Context, secret corev1.Secret, _ sourcesecret.Options) error {
logger.Actionf("requesting to grant key access to repository")
ppk, ok := secret.StringData[sourcesecret.PublicKeySecretKey]
if !ok {
return nil
Expand All @@ -390,6 +393,9 @@ func promptPublicKey(ctx context.Context, secret corev1.Secret, _ sourcesecret.O
logger.Successf("public key: %s", strings.TrimSpace(ppk))

if !gitArgs.silent {
if !isatty.IsTerminal(os.Stdout.Fd()) {
return errors.New("aborting; not a terminal (use --silent)")
}
prompt := promptui.Prompt{
Label: "Please give the key access to your repository",
IsConfirm: true,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ require (
github.com/homeport/dyff v1.10.2
github.com/lucasb-eyer/go-colorful v1.2.0
github.com/manifoldco/promptui v0.9.0
github.com/mattn/go-isatty v0.0.20
github.com/mattn/go-shellwords v1.0.12
github.com/notaryproject/notation-go v1.3.2
github.com/olekukonko/tablewriter v0.0.5
Expand Down Expand Up @@ -179,7 +180,6 @@ require (
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand Down