fix: help messages for enum flag

supabase · Aug 12, 2022 · 85077a7 · 85077a7
1 parent 5b86847
commit 85077a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/cmd/projects.go b/cmd/projects.go
@@ -23,8 +23,14 @@ var (
 	interactive bool
 	orgId       string
 	dbPassword  string
-	region      utils.EnumFlag
-	plan        utils.EnumFlag
+
+	region = utils.EnumFlag{
+		Allowed: make([]string, len(utils.RegionMap)),
+	}
+	plan = utils.EnumFlag{
+		Allowed: []string{string(api.Free), string(api.Pro)},
+		Value:   string(api.Free),
+	}
 
 	projectsCreateCmd = &cobra.Command{
 		Use:     "create <project name>",
@@ -67,12 +73,11 @@ var (
 
 func init() {
 	// Setup enum flags
-	region.Allowed = make([]string, len(utils.RegionMap))
+	i := 0
 	for k := range utils.RegionMap {
-		region.Allowed = append(region.Allowed, k)
+		region.Allowed[i] = k
+		i++
 	}
-	plan.Allowed = []string{string(api.Free), string(api.Pro)}
-	plan.Value = string(api.Free)
 	// Add flags to cobra command
 	createFlags := projectsCreateCmd.Flags()
 	createFlags.BoolVarP(&interactive, "interactive", "i", false, "Enables interactive mode.")

diff --git a/internal/projects/create/create.go b/internal/projects/create/create.go
@@ -20,8 +20,6 @@ func Run(ctx context.Context, params api.CreateProjectBody, fsys afero.Fs) error
 		return err
 	}
 
-	// TODO: remove the StatusOK case after 2022-08-20
-	// if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated {
 	if resp.JSON201 == nil {
 		return errors.New("Unexpected error creating project: " + string(resp.Body))
 	}

diff --git a/internal/utils/enum.go b/internal/utils/enum.go
@@ -25,7 +25,7 @@ func (a *EnumFlag) Set(p string) error {
 		return false
 	}
 	if !isIncluded(a.Allowed, p) {
-		return fmt.Errorf("%s is not included in [ %s ]", p, strings.Join(a.Allowed, " | "))
+		return fmt.Errorf("must be one of [ %s ]", strings.Join(a.Allowed, " | "))
 	}
 	a.Value = p
 	return nil