浏览代码

fix: change CLI bool flags to string flags

Matheus Marques Polillo 11 月之前
父节点
当前提交
1206681b34

+ 4 - 8
src/presentation/cli/controller/account.go

@@ -29,8 +29,7 @@ func (controller *AccountController) Read() *cobra.Command {
 }
 
 func (controller *AccountController) Create() *cobra.Command {
-	var usernameStr string
-	var passwordStr string
+	var usernameStr, passwordStr string
 
 	cmd := &cobra.Command{
 		Use:   "create",
@@ -55,10 +54,7 @@ func (controller *AccountController) Create() *cobra.Command {
 }
 
 func (controller *AccountController) Update() *cobra.Command {
-	var accountIdStr string
-	var usernameStr string
-	var passwordStr string
-	shouldUpdateApiKeyBool := false
+	var accountIdStr, usernameStr, passwordStr, shouldUpdateApiKeyBool string
 
 	cmd := &cobra.Command{
 		Use:   "update",
@@ -89,8 +85,8 @@ func (controller *AccountController) Update() *cobra.Command {
 	cmd.Flags().StringVarP(&accountIdStr, "account-id", "i", "", "AccountId")
 	cmd.Flags().StringVarP(&usernameStr, "username", "u", "", "Username")
 	cmd.Flags().StringVarP(&passwordStr, "password", "p", "", "Password")
-	cmd.Flags().BoolVarP(
-		&shouldUpdateApiKeyBool, "update-api-key", "k", false, "ShouldUpdateApiKey",
+	cmd.Flags().StringVarP(
+		&shouldUpdateApiKeyBool, "update-api-key", "k", "false", "ShouldUpdateApiKey",
 	)
 	return cmd
 }

+ 5 - 8
src/presentation/cli/controller/marketplace.go

@@ -141,18 +141,15 @@ func (controller *MarketplaceController) ReadInstalledItems() *cobra.Command {
 
 func (controller *MarketplaceController) DeleteInstalledItem() *cobra.Command {
 	var installedIdInt int
-	var shouldUninstallServices bool
+	var shouldUninstallServices string
 
 	cmd := &cobra.Command{
 		Use:   "delete",
 		Short: "DeleteInstalledItem",
 		Run: func(cmd *cobra.Command, args []string) {
 			requestBody := map[string]interface{}{
-				"installedId": installedIdInt,
-			}
-
-			if !shouldUninstallServices {
-				requestBody["shouldUninstallServices"] = false
+				"installedId":             installedIdInt,
+				"shouldUninstallServices": shouldUninstallServices,
 			}
 
 			cliHelper.ServiceResponseWrapper(
@@ -163,8 +160,8 @@ func (controller *MarketplaceController) DeleteInstalledItem() *cobra.Command {
 
 	cmd.Flags().IntVarP(&installedIdInt, "installedId", "i", 0, "InstalledItemId")
 	cmd.MarkFlagRequired("installedId")
-	cmd.Flags().BoolVarP(
-		&shouldUninstallServices, "shouldUninstallServices", "s", true,
+	cmd.Flags().StringVarP(
+		&shouldUninstallServices, "shouldUninstallServices", "s", "true",
 		"ShouldUninstallUnusedServices",
 	)
 	return cmd

+ 2 - 5
src/presentation/cli/controller/runtime.go

@@ -2,7 +2,6 @@ package cliController
 
 import (
 	"errors"
-	"strconv"
 
 	"github.com/speedianet/os/src/domain/entity"
 	"github.com/speedianet/os/src/domain/valueObject"
@@ -126,8 +125,7 @@ func (controller *RuntimeController) UpdatePhpConfig() *cobra.Command {
 }
 
 func (controller *RuntimeController) UpdatePhpModule() *cobra.Command {
-	var hostnameStr, phpVersionStr, moduleNameStr string
-	moduleStatusBool := true
+	var hostnameStr, phpVersionStr, moduleNameStr, moduleStatusStr string
 
 	cmd := &cobra.Command{
 		Use:   "update-module",
@@ -142,7 +140,6 @@ func (controller *RuntimeController) UpdatePhpModule() *cobra.Command {
 				"version":  phpVersionStr,
 			}
 
-			moduleStatusStr := strconv.FormatBool(moduleStatusBool)
 			rawPhpModuleParam := moduleNameStr + ":" + moduleStatusStr
 			module, err := entity.NewPhpModuleFromString(rawPhpModuleParam)
 			if err != nil {
@@ -161,7 +158,7 @@ func (controller *RuntimeController) UpdatePhpModule() *cobra.Command {
 	cmd.MarkFlagRequired("version")
 	cmd.Flags().StringVarP(&moduleNameStr, "name", "N", "", "PhpModuleName")
 	cmd.MarkFlagRequired("name")
-	cmd.Flags().BoolVarP(&moduleStatusBool, "status", "V", true, "PhpModuleStatus")
+	cmd.Flags().StringVarP(&moduleStatusStr, "status", "V", "true", "PhpModuleStatus")
 	cmd.MarkFlagRequired("status")
 	return cmd
 }

+ 22 - 22
src/presentation/cli/controller/services.go

@@ -46,9 +46,9 @@ func (controller *ServicesController) ReadInstallables() *cobra.Command {
 }
 
 func (controller *ServicesController) CreateInstallable() *cobra.Command {
-	var nameStr, versionStr, startupFileStr string
+	var nameStr, versionStr, startupFileStr, autoStartStr, autoRestartStr,
+		autoCreateMappingStr string
 	var envsSlice, portBindingsSlice []string
-	var autoStart, autoRestart, autoCreateMapping bool
 	var timeoutStartSecsInt, maxStartRetriesInt int
 
 	cmd := &cobra.Command{
@@ -57,9 +57,9 @@ func (controller *ServicesController) CreateInstallable() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			requestBody := map[string]interface{}{
 				"name":              nameStr,
-				"autoStart":         autoStart,
-				"autoRestart":       autoRestart,
-				"autoCreateMapping": autoCreateMapping,
+				"autoStart":         autoStartStr,
+				"autoRestart":       autoRestartStr,
+				"autoCreateMapping": autoCreateMappingStr,
 			}
 
 			if len(envsSlice) > 0 {
@@ -106,25 +106,25 @@ func (controller *ServicesController) CreateInstallable() *cobra.Command {
 	cmd.Flags().IntVarP(
 		&timeoutStartSecsInt, "timeout-start-secs", "o", 0, "TimeoutStartSecs",
 	)
-	cmd.Flags().BoolVarP(
-		&autoStart, "auto-start", "s", true, "AutoStart",
+	cmd.Flags().StringVarP(
+		&autoStartStr, "auto-start", "s", "true", "AutoStart",
 	)
 	cmd.Flags().IntVarP(
 		&maxStartRetriesInt, "max-start-retries", "m", 0, "MaxStartRetries",
 	)
-	cmd.Flags().BoolVarP(
-		&autoRestart, "auto-restart", "r", true, "AutoRestart",
+	cmd.Flags().StringVarP(
+		&autoRestartStr, "auto-restart", "r", "true", "AutoRestart",
 	)
-	cmd.Flags().BoolVarP(
-		&autoCreateMapping, "auto-create-mapping", "a", true, "AutoCreateMapping",
+	cmd.Flags().StringVarP(
+		&autoCreateMappingStr, "auto-create-mapping", "a", "true", "AutoCreateMapping",
 	)
 	return cmd
 }
 
 func (controller *ServicesController) CreateCustom() *cobra.Command {
-	var nameStr, typeStr, startCmdStr, versionStr string
+	var nameStr, typeStr, startCmdStr, versionStr, autoStartStr, autoRestartStr,
+		autoCreateMappingStr string
 	var envsSlice, portBindingsSlice []string
-	var autoStart, autoRestart, autoCreateMapping bool
 	var timeoutStartSecsInt, maxStartRetriesInt int
 
 	cmd := &cobra.Command{
@@ -135,9 +135,9 @@ func (controller *ServicesController) CreateCustom() *cobra.Command {
 				"name":              nameStr,
 				"type":              typeStr,
 				"startCmd":          startCmdStr,
-				"autoStart":         autoStart,
-				"autoRestart":       autoRestart,
-				"autoCreateMapping": autoCreateMapping,
+				"autoStart":         autoStartStr,
+				"autoRestart":       autoRestartStr,
+				"autoCreateMapping": autoCreateMappingStr,
 			}
 
 			if len(envsSlice) > 0 {
@@ -185,17 +185,17 @@ func (controller *ServicesController) CreateCustom() *cobra.Command {
 	cmd.Flags().IntVarP(
 		&timeoutStartSecsInt, "timeout-start-secs", "o", 0, "TimeoutStartSecs",
 	)
-	cmd.Flags().BoolVarP(
-		&autoStart, "auto-start", "s", true, "AutoStart",
+	cmd.Flags().StringVarP(
+		&autoStartStr, "auto-start", "s", "true", "AutoStart",
 	)
 	cmd.Flags().IntVarP(
 		&maxStartRetriesInt, "max-start-retries", "m", 0, "MaxStartRetries",
 	)
-	cmd.Flags().BoolVarP(
-		&autoRestart, "auto-restart", "r", true, "AutoRestart",
+	cmd.Flags().StringVarP(
+		&autoRestartStr, "auto-restart", "r", "true", "AutoRestart",
 	)
-	cmd.Flags().BoolVarP(
-		&autoCreateMapping, "auto-create-mapping", "a", true, "AutoCreateMapping",
+	cmd.Flags().StringVarP(
+		&autoCreateMappingStr, "auto-create-mapping", "a", "true", "AutoCreateMapping",
 	)
 	return cmd
 }