Make extract function generic

jfrog · Nov 18, 2024 · df2772a · df2772a
1 parent 3df4169
commit df2772a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/buildtools/cli.go b/buildtools/cli.go
@@ -566,7 +566,7 @@ func NugetCmd(c *cli.Context) error {
 		return err
 	}
 
-	allowInsecureConnection, err := extractBoolFlagFromArgs(&filteredNugetArgs, "allow-insecure-connections")
+	allowInsecureConnection, err := cliutils.ExtractBoolFlagFromArgs(&filteredNugetArgs, "allow-insecure-connections")
 	if err != nil {
 		return err
 	}
@@ -1083,15 +1083,3 @@ func getTwineConfigPath() (configFilePath string, err error) {
 	}
 	return "", errorutils.CheckErrorf(getMissingConfigErrMsg("twine", "pip-config OR pipenv-config"))
 }
-
-// Extracts the boolean flag from the args and removes it from the args.
-func extractBoolFlagFromArgs(filteredNugetArgs *[]string, flagName string) (value bool, err error) {
-	var flagIndex int
-	var allowInsecureConnection bool
-	flagIndex, allowInsecureConnection, err = coreutils.FindBooleanFlag("--"+flagName, *filteredNugetArgs)
-	if err != nil {
-		return false, err
-	}
-	coreutils.RemoveFlagFromCommand(filteredNugetArgs, flagIndex, flagIndex)
-	return allowInsecureConnection, nil
-}
diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go
@@ -809,3 +809,15 @@ func getDebFlag(c *cli.Context) (deb string, err error) {
 	}
 	return deb, nil
 }
+
+// ExtractBoolFlagFromArgs Extracts a boolean flag from the args and removes it from the slice.
+func ExtractBoolFlagFromArgs(filteredArgs *[]string, flagName string) (value bool, err error) {
+	var flagIndex int
+	var boolFlag bool
+	flagIndex, boolFlag, err = coreutils.FindBooleanFlag("--"+flagName, *filteredArgs)
+	if err != nil {
+		return false, err
+	}
+	coreutils.RemoveFlagFromCommand(filteredArgs, flagIndex, flagIndex)
+	return boolFlag, nil
+}