Make ResolvedExec inline ContainerInfo to avoid duplicating information

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

api/model/model_types.go

@@ -32,15 +32,14 @@ type MachineIdentifier struct {
 }
 
 type ContainerInfo struct {
-	ContainerName string
-	PodName       string
+	PodName       string `json:"pod"`
+	ContainerName string `json:"container"`
 }
 
 //ResolvedExec holds info client might send to create exec
 type ResolvedExec struct {
-	PodName       string   `json:"pod"`
-	ContainerName string   `json:"container"`
-	Cmd           []string `json:"cmd"`
+	ContainerInfo
+	Cmd []string `json:"cmd"`
 }
 
 // Todo code Refactoring: MachineExec should be simple object for exec creation, without any business logic

api/rest/common.go

@@ -16,14 +16,11 @@ import (
 	"github.com/eclipse/che-machine-exec/api/model"
 )
 
-func HandleKubeConfigCreation(kubeConfigParams *model.KubeConfigParams, resolvedExec *model.ResolvedExec) error {
+func HandleKubeConfigCreation(kubeConfigParams *model.KubeConfigParams, containerInfo *model.ContainerInfo) error {
 	if kubeConfigParams.Username == "" {
 		kubeConfigParams.Username = "Developer"
 	}
 
-	err := execManager.CreateKubeConfig(kubeConfigParams, &model.ContainerInfo{
-		ContainerName: resolvedExec.ContainerName,
-		PodName:       resolvedExec.PodName,
-	})
+	err := execManager.CreateKubeConfig(kubeConfigParams, containerInfo)
 	return err
 }

api/rest/execInit.go

@@ -56,7 +56,7 @@ func HandleInit(c *gin.Context) {
 		return
 	}
 
-	err := HandleKubeConfigCreation(&kubeConfigParams, execRequest)
+	err := HandleKubeConfigCreation(&kubeConfigParams, &execRequest.ContainerInfo)
 	if err != nil {
 		rest.WriteResponse(c, http.StatusInternalServerError, err.Error())
 		return

api/rest/execKubeConfig.go

@@ -58,7 +58,7 @@ func HandleKubeConfig(c *gin.Context) {
 		return
 	}
 
-	err := HandleKubeConfigCreation(&kubeConfigParams, execRequest)
+	err := HandleKubeConfigCreation(&kubeConfigParams, &execRequest.ContainerInfo)
 
 	if err != nil {
 		logrus.Errorf("Unable to create kubeconfig. Cause: %s", err.Error())

exec/kubernetes_exec_manager.go

@@ -94,8 +94,7 @@ func (manager *KubernetesExecManager) Resolve(container, token string) (*model.R
 		logrus.Printf("%s is successfully resolved in auto discovered container %s/%s", resolvedCmd,
 			containerInfo.PodName, containerInfo.ContainerName)
 		return &model.ResolvedExec{
-			PodName:       containerInfo.PodName,
-			ContainerName: containerInfo.ContainerName,
+			ContainerInfo: *containerInfo,
 			Cmd:           resolvedCmd,
 		}, nil
 	} else {
@@ -128,8 +127,7 @@ func (manager *KubernetesExecManager) findFirstAvailable(k8sAPI *client.K8sAPI,
 		logrus.Printf("%s is successfully resolved in auto discovered container %s/%s", resolvedCmd,
 			containerInfo.PodName, containerInfo.ContainerName)
 		return &model.ResolvedExec{
-			PodName:       containerInfo.PodName,
-			ContainerName: containerInfo.ContainerName,
+			ContainerInfo: *containerInfo,
 			Cmd:           resolvedCmd,
 		}, nil
 	}