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

Merge pull request #1222 from fluxcd/fix-git-http

Browse source 
Fix create source git auth for non-HTTPS repos
This commit is contained in:
Stefan Prodan 2021-04-08 11:11:03 +03:00 committed by GitHub
commit fffe40fbd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/flux/create_source_git.go
View file

@ -240,6 +240,10 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
secretOpts.Username = sourceGitArgs.username secretOpts.Username = sourceGitArgs.username
secretOpts.Password = sourceGitArgs.password secretOpts.Password = sourceGitArgs.password
secretOpts.CAFilePath = sourceGitArgs.caFile secretOpts.CAFilePath = sourceGitArgs.caFile
case "http":
logger.Warningf("insecure configuration: credentials configured for an HTTP URL")
secretOpts.Username = sourceGitArgs.username
secretOpts.Password = sourceGitArgs.password
} }
secret, err := sourcesecret.Generate(secretOpts) secret, err := sourcesecret.Generate(secretOpts)
if err != nil { if err != nil {

4
cmd/flux/log.go
View file

@ -41,6 +41,10 @@ func (l stderrLogger) Successf(format string, a ...interface{}) {
fmt.Fprintln(l.stderr, `✔`, fmt.Sprintf(format, a...)) fmt.Fprintln(l.stderr, `✔`, fmt.Sprintf(format, a...))
} }
func (l stderrLogger) Warningf(format string, a ...interface{}) {
fmt.Fprintln(l.stderr, `⚠️`, fmt.Sprintf(format, a...))
}
func (l stderrLogger) Failuref(format string, a ...interface{}) { func (l stderrLogger) Failuref(format string, a ...interface{}) {
fmt.Fprintln(l.stderr, `✗`, fmt.Sprintf(format, a...)) fmt.Fprintln(l.stderr, `✗`, fmt.Sprintf(format, a...))
} }

2
pkg/log/log.go
View file

@ -24,6 +24,8 @@ type Logger interface {
Waitingf(format string, a ...interface{}) Waitingf(format string, a ...interface{})
// Successf logs a formatted success message. // Successf logs a formatted success message.
Successf(format string, a ...interface{}) Successf(format string, a ...interface{})
// Warningf logs a formatted warning message.
Warningf(format string, a ...interface{})
// Failuref logs a formatted failure message. // Failuref logs a formatted failure message.
Failuref(format string, a ...interface{}) Failuref(format string, a ...interface{})
} }