dont pass cobra command down stream in updateConf

Faris Huskovic · Faris Huskovic · commit 40f521c9913e · 2020-10-27T10:15:42.000-05:00
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -280,13 +281,23 @@ coder envs edit back-end-env --disk 20`,
 				return err
 			}
 
-			req, err := buildUpdateReq(updateConf{
-					command:     cmd,
+			cpuCores, _ = cmd.Flags().GetFloat32("cpu")
+			memGB, _ = cmd.Flags().GetFloat32("memory")
+			diskGB, _ = cmd.Flags().GetInt("disk")
+			gpus, _ = cmd.Flags().GetInt("gpus")
+
+			req, err := buildUpdateReq(cmd.Context(),
+				updateConf{
+					cpu: 		 cpuCores,
+					memGB: 		 memGB,
+					diskGB: 	 diskGB,
+					gpus: 		 gpus,
 					client:      client,
 					environment: env,
 					user:        user,
 					image:       img,
 					imageTag:    tag,
+					orgName: 	 org,
 				},
 			)
 			if err != nil {
@@ -394,15 +405,19 @@ func rmEnvsCommand(user *string) *cobra.Command {
 }
 
 type updateConf struct {
-	command     *cobra.Command
+	cpu     	float32
+	memGB		float32
+	diskGB		int
+	gpus		int
 	client      *coder.Client
 	environment *coder.Environment
 	user        *string
 	image       string
 	imageTag    string
+	orgName		string
 }
 
-func buildUpdateReq(conf updateConf) (*coder.UpdateEnvironmentReq, error) {
+func buildUpdateReq(ctx context.Context, conf updateConf) (*coder.UpdateEnvironmentReq, error) {
 	var (
 		updateReq       coder.UpdateEnvironmentReq
 		defaultCPUCores float32
@@ -412,10 +427,11 @@ func buildUpdateReq(conf updateConf) (*coder.UpdateEnvironmentReq, error) {
 
 	// If this is not empty it means the user is requesting to change the environment image.
 	if conf.image != "" {
-		importedImg, err := findImg(conf.command.Context(),
+		importedImg, err := findImg(ctx,
 			conf.client,
 			*conf.user,
 			conf.image,
+			conf.orgName,
 		)
 		if err != nil {
 			return nil, err
@@ -449,25 +465,22 @@ func buildUpdateReq(conf updateConf) (*coder.UpdateEnvironmentReq, error) {
 	// If they did not, then we will get the zero value back
 	// and should set the resource amount to the default.
 
-	cpuCores, _ := conf.command.Flags().GetFloat32("cpu")
-	if cpuCores == 0 {
+	if conf.cpu == 0 {
 		updateReq.CPUCores = &defaultCPUCores
 	} else {
-		updateReq.CPUCores = &cpuCores
+		updateReq.CPUCores = &conf.cpu
 	}
 
-	memGB, _ := conf.command.Flags().GetFloat32("memory")
-	if memGB == 0 {
+	if conf.memGB == 0 {
 		updateReq.MemoryGB = &defaultMemGB
 	} else {
-		updateReq.MemoryGB = &memGB
+		updateReq.MemoryGB = &conf.memGB
 	}
 
-	diskGB, _ := conf.command.Flags().GetInt("disk")
-	if diskGB == 0 {
+	if conf.diskGB == 0 {
 		updateReq.DiskGB = &defaultDiskGB
 	} else {
-		updateReq.DiskGB = &diskGB
+		updateReq.DiskGB = &conf.diskGB
 	}
 
 	// Environment disks can not be shrink so we have to overwrite this
@@ -477,9 +490,8 @@ func buildUpdateReq(conf updateConf) (*coder.UpdateEnvironmentReq, error) {
 		updateReq.DiskGB = &conf.environment.DiskGB
 	}
 
-	gpus, _ := conf.command.Flags().GetInt("gpus")
-	if gpus != 0 {
-		updateReq.GPUs = &gpus
+	if conf.gpus != 0 {
+		updateReq.GPUs = &conf.gpus
 	}
 
 	if conf.imageTag == "" {
