@@ -167,7 +167,16 @@ coder envs create --image 5f443b16-30652892427b955601330fa5 my-env-name
167167coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955601330fa5 my-env-name` ,
168168RunE :func (cmd * cobra.Command ,args []string )error {
169169if img == "" {
170- return xerrors .New ("image id unset" )
170+ return xerrors .New ("image unset" )
171+ }
172+
173+ multiOrgMember ,err := isMultiOrgMember (* user )
174+ if err != nil {
175+ return err
176+ }
177+
178+ if * multiOrgMember && org == "" {
179+ return xerrors .New ("org is required for multi-org members" )
171180}
172181
173182client ,err := newClient ()
@@ -234,17 +243,6 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
234243cmd .Flags ().StringVarP (& img ,"image" ,"i" ,"" ,"name of the image to base the environment off of." )
235244cmd .Flags ().BoolVar (& follow ,"follow" ,false ,"follow buildlog after initiating rebuild" )
236245_ = cmd .MarkFlagRequired ("image" )
237-
238- multiOrgMember ,err := isMultiOrgMember (* user )
239- if err != nil {
240- _ = clog .Fatal (fmt .Sprintf ("checking if user is mutli-org member: %s" ,err .Error ()))
241- return nil
242- }
243-
244- // if the user belongs to multiple organizations we need them to specify which one.
245- if * multiOrgMember {
246- _ = cmd .MarkFlagRequired ("org" )
247- }
248246return cmd
249247}
250248
@@ -282,6 +280,16 @@ coder envs edit back-end-env --disk 20`,
282280return err
283281}
284282
283+ multiOrgMember ,err := isMultiOrgMember (* user )
284+ if err != nil {
285+ return err
286+ }
287+
288+ // if the user belongs to multiple organizations we need them to specify which one.
289+ if * multiOrgMember && org == "" {
290+ return xerrors .New ("org is required for multi-org members" )
291+ }
292+
285293cpuCores ,_ = cmd .Flags ().GetFloat32 ("cpu" )
286294memGB ,_ = cmd .Flags ().GetFloat32 ("memory" )
287295diskGB ,_ = cmd .Flags ().GetInt ("disk" )
@@ -332,19 +340,6 @@ coder envs edit back-end-env --disk 20`,
332340cmd .Flags ().IntP ("disk" ,"d" ,diskGB ,"The amount of disk storage an environment should be provisioned with." )
333341cmd .Flags ().IntP ("gpu" ,"g" ,gpus ,"The amount of disk storage to provision the environment with." )
334342cmd .Flags ().BoolVar (& follow ,"follow" ,false ,"follow buildlog after initiating rebuild" )
335- // if the image is being changed we need to know whether or not we should require the org flag.
336- if img != "" {
337- multiOrgMember ,err := isMultiOrgMember (* user )
338- if err != nil {
339- _ = clog .Fatal (fmt .Sprintf ("checking if user is mutli-org member: %s" ,err .Error ()))
340- return nil
341- }
342-
343- // if the user belongs to multiple organizations we need them to specify which one.
344- if * multiOrgMember {
345- _ = cmd .MarkFlagRequired ("org" )
346- }
347- }
348343return cmd
349344}
350345
