Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Log correct --registry-require flag (remove D from end) #2256

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Log correct --registry-require flag (remove D from end) #2256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cmd/fluxd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ func main() {
possiblyRequired := stringset(RequireValues)
for _, r := range *registryRequire {
if !possiblyRequired.has(r) {
logger.Log("err", fmt.Sprintf("--registry-required value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
logger.Log("err", fmt.Sprintf("--registry-require value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
os.Exit(1)
}
}
Expand Down Expand Up @@ -454,7 +454,7 @@ func main() {
awsPreflight, credsWithAWSAuth := registry.ImageCredsWithAWSAuth(imageCreds, log.With(logger, "component", "aws"), awsConf)
if mandatoryRegistry.has(RequireECR) {
if err := awsPreflight(); err != nil {
logger.Log("error", "AWS API required (due to --registry-required=ecr), but not available", "err", err)
logger.Log("error", "AWS API required (due to --registry-require=ecr), but not available", "err", err)
os.Exit(1)
}
}
Expand Down