fix build

Faris Huskovic · Faris Huskovic · commit 79893988fc37 · 2020-10-27T11:45:31.000-05:00
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -167,7 +167,16 @@ coder envs create --image 5f443b16-30652892427b955601330fa5 my-env-name
 coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955601330fa5 my-env-name`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if img == "" {
-				return xerrors.New("image id unset")
+				return xerrors.New("image unset")
+			}
+
+			multiOrgMember, err := isMultiOrgMember(*user)
+			if err != nil {
+				return err
+			}
+
+			if *multiOrgMember && org == "" {
+				return xerrors.New("org is required for multi-org members")
 			}
 
 			client, err := newClient()
@@ -234,17 +243,6 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 	cmd.Flags().StringVarP(&img, "image", "i", "", "name of the image to base the environment off of.")
 	cmd.Flags().BoolVar(&follow, "follow", false, "follow buildlog after initiating rebuild")
 	_ = cmd.MarkFlagRequired("image")
-
-	multiOrgMember, err := isMultiOrgMember(*user)
-	if err != nil {
-		_ = clog.Fatal(fmt.Sprintf("checking if user is mutli-org member: %s", err.Error()))
-		return nil
-	}
-
-	// if the user belongs to multiple organizations we need them to specify which one.
-	if *multiOrgMember {
-		_ = cmd.MarkFlagRequired("org")
-	}
 	return cmd
 }
 
@@ -282,6 +280,16 @@ coder envs edit back-end-env --disk 20`,
 				return err
 			}
 
+			multiOrgMember, err := isMultiOrgMember(*user)
+			if err != nil {
+				return err
+			}
+
+			// if the user belongs to multiple organizations we need them to specify which one.
+			if *multiOrgMember && org == "" {
+				return xerrors.New("org is required for multi-org members")
+			}
+
 			cpuCores, _ = cmd.Flags().GetFloat32("cpu")
 			memGB, _ = cmd.Flags().GetFloat32("memory")
 			diskGB, _ = cmd.Flags().GetInt("disk")
@@ -332,19 +340,6 @@ coder envs edit back-end-env --disk 20`,
 	cmd.Flags().IntP("disk", "d", diskGB, "The amount of disk storage an environment should be provisioned with.")
 	cmd.Flags().IntP("gpu", "g", gpus, "The amount of disk storage to provision the environment with.")
 	cmd.Flags().BoolVar(&follow, "follow", false, "follow buildlog after initiating rebuild")
-	// if the image is being changed we need to know whether or not we should require the org flag.
-	if img != "" {
-		multiOrgMember, err := isMultiOrgMember(*user)
-		if err != nil {
-			_ = clog.Fatal(fmt.Sprintf("checking if user is mutli-org member: %s", err.Error()))
-			return nil
-		}
-
-		// if the user belongs to multiple organizations we need them to specify which one.
-		if *multiOrgMember {
-			_ = cmd.MarkFlagRequired("org")
-		}
-	}
 	return cmd
 }
 
