opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

quadlet: use Flag suffix for variables

Browse Source 
Purely cosmetic change for consistency.

[NO NEW TESTS NEEDED]  as it doesn't change functionality.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2023-04-04 09:55:14 +02:00
parent facb5b0ede
commit 53b16ccd26
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/quadlet/main.go
View File

@ -25,8 +25,8 @@ import (
var ( var (
verboseFlag bool // True if -v passed verboseFlag bool // True if -v passed
noKmsgFlag bool noKmsgFlag bool
isUser bool // True if run as quadlet-user-generator executable isUserFlag bool // True if run as quadlet-user-generator executable
dryRun bool // True if -dryrun is used dryRunFlag bool // True if -dryrun is used
) )
var ( var (
@ -294,32 +294,32 @@ func warnIfAmbiguousName(container *parser.UnitFile) {
func main() { func main() {
exitCode := 0 exitCode := 0
prgname := path.Base(os.Args[0]) prgname := path.Base(os.Args[0])
isUser = strings.Contains(prgname, "user") isUserFlag = strings.Contains(prgname, "user")
flag.Parse() flag.Parse()
if verboseFlag || dryRun { if verboseFlag || dryRunFlag {
enableDebug() enableDebug()
} }
if noKmsgFlag || dryRun { if noKmsgFlag || dryRunFlag {
noKmsg = true noKmsg = true
} }
if !dryRun && flag.NArg() < 1 { if !dryRunFlag && flag.NArg() < 1 {
Logf("Missing output directory argument") Logf("Missing output directory argument")
os.Exit(1) os.Exit(1)
} }
var outputPath string var outputPath string
if !dryRun { if !dryRunFlag {
outputPath = flag.Arg(0) outputPath = flag.Arg(0)
Debugf("Starting quadlet-generator, output to: %s", outputPath) Debugf("Starting quadlet-generator, output to: %s", outputPath)
} }
sourcePaths := getUnitDirs(isUser) sourcePaths := getUnitDirs(isUserFlag)
units := make(map[string]*parser.UnitFile) units := make(map[string]*parser.UnitFile)
for _, d := range sourcePaths { for _, d := range sourcePaths {
@ -333,7 +333,7 @@ func main() {
os.Exit(0) os.Exit(0)
} }
if !dryRun { if !dryRunFlag {
err := os.MkdirAll(outputPath, os.ModePerm) err := os.MkdirAll(outputPath, os.ModePerm)
if err != nil { if err != nil {
Logf("Can't create dir %s: %s", outputPath, err) Logf("Can't create dir %s: %s", outputPath, err)
@ -348,11 +348,11 @@ func main() {
switch { switch {
case strings.HasSuffix(name, ".container"): case strings.HasSuffix(name, ".container"):
warnIfAmbiguousName(unit) warnIfAmbiguousName(unit)
service, err = quadlet.ConvertContainer(unit, isUser) service, err = quadlet.ConvertContainer(unit, isUserFlag)
case strings.HasSuffix(name, ".volume"): case strings.HasSuffix(name, ".volume"):
service, err = quadlet.ConvertVolume(unit, name) service, err = quadlet.ConvertVolume(unit, name)
case strings.HasSuffix(name, ".kube"): case strings.HasSuffix(name, ".kube"):
service, err = quadlet.ConvertKube(unit, isUser) service, err = quadlet.ConvertKube(unit, isUserFlag)
case strings.HasSuffix(name, ".network"): case strings.HasSuffix(name, ".network"):
service, err = quadlet.ConvertNetwork(unit, name) service, err = quadlet.ConvertNetwork(unit, name)
default: default:
@ -365,7 +365,7 @@ func main() {
} else { } else {
service.Path = path.Join(outputPath, service.Filename) service.Path = path.Join(outputPath, service.Filename)
if dryRun { if dryRunFlag {
data, err := service.ToString() data, err := service.ToString()
if err != nil { if err != nil {
Debugf("Error parsing %s\n---\n", service.Path) Debugf("Error parsing %s\n---\n", service.Path)
@ -388,6 +388,6 @@ func main() {
func init() { func init() {
flag.BoolVar(&verboseFlag, "v", false, "Print debug information") flag.BoolVar(&verboseFlag, "v", false, "Print debug information")
flag.BoolVar(&noKmsgFlag, "no-kmsg-log", false, "Don't log to kmsg") flag.BoolVar(&noKmsgFlag, "no-kmsg-log", false, "Don't log to kmsg")
flag.BoolVar(&isUser, "user", false, "Run as systemd user") flag.BoolVar(&isUserFlag, "user", false, "Run as systemd user")
flag.BoolVar(&dryRun, "dryrun", false, "run in dryrun mode printing debug information") flag.BoolVar(&dryRunFlag, "dryrun", false, "run in dryrun mode printing debug information")
} }