From 53b16ccd2688f6075b678c46ffcd59b8f7941d27 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <vrothberg@redhat.com>
Date: Tue, 4 Apr 2023 09:55:14 +0200
Subject: [PATCH] quadlet: use `Flag` suffix for variables

Purely cosmetic change for consistency.

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

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
---
 cmd/quadlet/main.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

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