actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-08 00:37:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3e8ae9236f into a4903a95be

Browse source
This commit is contained in:
Carlos Nunez 2026-01-25 16:29:36 -06:00 committed by GitHub
commit bef1e40523
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/flux/bootstrap_git.go
View file

@ -18,6 +18,7 @@ package main
import (
"context"
"errors"
"fmt"
"net/url"
"os"
@ -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{
@ -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
@ -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,

2
go.mod
View file

@ -43,6 +43,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
@ -178,7 +179,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/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect