Merge pull request #530 from cbosdo/revive-fixes

Fix redefined built-in identifiers

Author: cbosdo

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Go ${{ matrix.go-version }}
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Install dependencies
         run: |

.github/workflows/golangci-lint.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6

go.mod

@@ -1,6 +1,6 @@
 module github.com/uyuni-project/uyuni-tools
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2

mgrpxy/cmd/cache/clear.go

@@ -23,14 +23,14 @@ func NewClearCmd(globalFlags *types.GlobalFlags) *cobra.Command {
 		Long:  L("Clear the cache"),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var flags cacheClearFlags
-			return utils.CommandHelper(globalFlags, cmd, args, &flags, nil, clear)
+			return utils.CommandHelper(globalFlags, cmd, args, &flags, nil, clearCmd)
 		},
 	}
 
 	return clearCmd
 }
 
-func clear(globalFlags *types.GlobalFlags, flags *cacheClearFlags, cmd *cobra.Command, args []string) error {
+func clearCmd(globalFlags *types.GlobalFlags, flags *cacheClearFlags, cmd *cobra.Command, args []string) error {
 	fn, err := shared.ChooseProxyPodmanOrKubernetes(cmd.Flags(), podmanCacheClear, kubernetesCacheClear)
 	if err != nil {
 		return err

shared/utils/utils.go

@@ -49,24 +49,24 @@ type InspectResult struct {
 	Debug             bool `mapstructure:"debug"`
 }
 
-func checkValueSize(value string, min int, max int) bool {
-	if min == 0 && max == 0 {
+func checkValueSize(value string, minValue int, maxValue int) bool {
+	if minValue == 0 && maxValue == 0 {
 		return true
 	}
 
-	if len(value) < min {
-		fmt.Printf(NL("Has to be more than %d character long", "Has to be more than %d characters long", min), min)
+	if len(value) < minValue {
+		fmt.Printf(NL("Has to be more than %d character long", "Has to be more than %d characters long", minValue), minValue)
 		return false
 	}
-	if len(value) > max {
-		fmt.Printf(NL("Has to be less than %d character long", "Has to be less than %d characters long", max), max)
+	if len(value) > maxValue {
+		fmt.Printf(NL("Has to be less than %d character long", "Has to be less than %d characters long", maxValue), maxValue)
 		return false
 	}
 	return true
 }
 
 // CheckValidPassword performs check to a given password.
-func CheckValidPassword(value *string, prompt string, min int, max int) string {
+func CheckValidPassword(value *string, prompt string, minValue int, maxValue int) string {
 	fmt.Print(prompt + promptEnd)
 	bytePassword, err := term.ReadPassword(int(syscall.Stdin))
 	if err != nil {
@@ -88,7 +88,7 @@ func CheckValidPassword(value *string, prompt string, min int, max int) string {
 		return ""
 	}
 
-	if !checkValueSize(tmpValue, min, max) {
+	if !checkValueSize(tmpValue, minValue, maxValue) {
 		fmt.Println()
 		return ""
 	}
@@ -99,18 +99,18 @@ func CheckValidPassword(value *string, prompt string, min int, max int) string {
 
 // AskPasswordIfMissing asks for password if missing.
 // Don't perform any check if min and max are set to 0.
-func AskPasswordIfMissing(value *string, prompt string, min int, max int) {
+func AskPasswordIfMissing(value *string, prompt string, minValue int, maxValue int) {
 	if *value == "" && !term.IsTerminal(int(os.Stdin.Fd())) {
 		log.Warn().Msgf(L("not an interactive device, not asking for missing value"))
 		return
 	}
 
 	for *value == "" {
-		firstRound := CheckValidPassword(value, prompt, min, max)
+		firstRound := CheckValidPassword(value, prompt, minValue, maxValue)
 		if firstRound == "" {
 			continue
 		}
-		secondRound := CheckValidPassword(value, L("Confirm the password"), min, max)
+		secondRound := CheckValidPassword(value, L("Confirm the password"), minValue, maxValue)
 		if secondRound != firstRound {
 			fmt.Println(L("Two different passwords have been provided"))
 			*value = ""
@@ -122,20 +122,20 @@ func AskPasswordIfMissing(value *string, prompt string, min int, max int) {
 
 // AskPasswordIfMissingOnce asks for password if missing only once
 // Don't perform any check if min and max are set to 0.
-func AskPasswordIfMissingOnce(value *string, prompt string, min int, max int) {
+func AskPasswordIfMissingOnce(value *string, prompt string, minValue int, maxValue int) {
 	if *value == "" && !term.IsTerminal(int(os.Stdin.Fd())) {
 		log.Warn().Msgf(L("not an interactive device, not asking for missing value"))
 		return
 	}
 
 	for *value == "" {
-		*value = CheckValidPassword(value, prompt, min, max)
+		*value = CheckValidPassword(value, prompt, minValue, maxValue)
 	}
 }
 
 // AskIfMissing asks for a value if missing.
-// Don't perform any check if min and max are set to 0.
-func AskIfMissing(value *string, prompt string, min int, max int, checker func(string) bool) {
+// Don't perform any check if minValue and maxValue are set to 0.
+func AskIfMissing(value *string, prompt string, minValue int, maxValue int, checker func(string) bool) {
 	if *value == "" && !term.IsTerminal(int(os.Stdin.Fd())) {
 		log.Warn().Msgf(L("not an interactive device, not asking for missing value"))
 		return
@@ -149,7 +149,7 @@ func AskIfMissing(value *string, prompt string, min int, max int, checker func(s
 			log.Fatal().Err(err).Msg(L("failed to read input"))
 		}
 		tmpValue := strings.TrimSpace(newValue)
-		if checkValueSize(tmpValue, min, max) && (checker == nil || checker(tmpValue)) {
+		if checkValueSize(tmpValue, minValue, maxValue) && (checker == nil || checker(tmpValue)) {
 			*value = tmpValue
 		}
 		fmt.Println()

uyuni-tools.spec

@@ -80,12 +80,12 @@ BuildRequires:  fish
 BuildRequires:  zsh
 # Get the proper Go version on different distros
 %if 0%{?suse_version}
-BuildRequires:  golang(API) >= 1.21
+BuildRequires:  golang(API) >= 1.22
 %endif
 # 0%{?suse_version}
 
 %if 0%{?ubuntu}
-%define go_version      1.21
+%define go_version      1.22
 BuildRequires:  golang-%{go_version}
 %endif
 # 0%{?ubuntu}
@@ -96,7 +96,7 @@ BuildRequires:  golang >= 1.19
 # 0%{?debian}
 
 %if 0%{?fedora} || 0%{?rhel}
-BuildRequires:  golang >= 1.21
+BuildRequires:  golang >= 1.22
 %endif
 # 0%{?fedora} || 0%{?rhel}