litmusctl version fix (#20)

Signed-off-by: Raj Babu Das <[email protected]>
litmuschaos · Jul 21, 2021 · ea4c62c · ea4c62c
1 parent a58bc76
commit ea4c62c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/pkg/agent/ops.go b/pkg/agent/ops.go
@@ -130,10 +130,9 @@ AGENT_NAME:
 
 	if strings.ToLower(nodeSelectorDescision) == "y" {
 		utils.White_B.Print("\nEnter the NodeSelector (Format: key1=value1,key2=value2): ")
-		nodeSelector := utils.Scanner()
-		newAgent.NodeSelector = &nodeSelector
+		newAgent.NodeSelector = utils.Scanner()
 
-		if ok := utils.CheckKeyValueFormat(*newAgent.NodeSelector); !ok {
+		if ok := utils.CheckKeyValueFormat(newAgent.NodeSelector); !ok {
 			os.Exit(1)
 		}
 	}

diff --git a/pkg/apis/agent.go b/pkg/apis/agent.go
@@ -102,8 +102,8 @@ type UserAgentReg struct {
 // ConnectAgent connects the agent with the given details
 func ConnectAgent(agent types.Agent, cred types.Credentials) (AgentConnectionData, error) {
 	query := `{"query":"mutation {\n  userClusterReg(clusterInput: \n    { \n    cluster_name: \"` + agent.AgentName + `\", \n    description: \"` + agent.Description + `\",\n  \tplatform_name: \"` + agent.PlatformName + `\",\n    project_id: \"` + agent.ProjectId + `\",\n    cluster_type: \"` + agent.ClusterType + `\",\n  agent_scope: \"` + agent.Mode + `\",\n    agent_namespace: \"` + agent.Namespace + `\",\n    serviceaccount: \"` + agent.ServiceAccount + `\",\n    agent_ns_exists: ` + fmt.Sprintf("%t", agent.NsExists) + `,\n    agent_sa_exists: ` + fmt.Sprintf("%t", agent.SAExists) + `,\n  }){\n    cluster_id\n    cluster_name\n    token\n  }\n}"}`
-	if *agent.NodeSelector != "" {
-		query = `{"query":"mutation {\n  userClusterReg(clusterInput: \n    { \n    cluster_name: \"` + agent.AgentName + `\", \n    description: \"` + agent.Description + `\",\n  node_selector: \"` + *agent.NodeSelector + `\",\n  \tplatform_name: \"` + agent.PlatformName + `\",\n    project_id: \"` + agent.ProjectId + `\",\n    cluster_type: \"` + agent.ClusterType + `\",\n  agent_scope: \"` + agent.Mode + `\",\n    agent_namespace: \"` + agent.Namespace + `\",\n    serviceaccount: \"` + agent.ServiceAccount + `\",\n    agent_ns_exists: ` + fmt.Sprintf("%t", agent.NsExists) + `,\n    agent_sa_exists: ` + fmt.Sprintf("%t", agent.SAExists) + `,\n  }){\n    cluster_id\n    cluster_name\n    token\n  }\n}"}`
+	if agent.NodeSelector != "" {
+		query = `{"query":"mutation {\n  userClusterReg(clusterInput: \n    { \n    cluster_name: \"` + agent.AgentName + `\", \n    description: \"` + agent.Description + `\",\n  node_selector: \"` + agent.NodeSelector + `\",\n  \tplatform_name: \"` + agent.PlatformName + `\",\n    project_id: \"` + agent.ProjectId + `\",\n    cluster_type: \"` + agent.ClusterType + `\",\n  agent_scope: \"` + agent.Mode + `\",\n    agent_namespace: \"` + agent.Namespace + `\",\n    serviceaccount: \"` + agent.ServiceAccount + `\",\n    agent_ns_exists: ` + fmt.Sprintf("%t", agent.NsExists) + `,\n    agent_sa_exists: ` + fmt.Sprintf("%t", agent.SAExists) + `,\n  }){\n    cluster_id\n    cluster_name\n    token\n  }\n}"}`
 	}
 
 	resp, err := SendRequest(SendRequestParams{Endpoint: cred.Endpoint + utils.GQLAPIPath, Token: cred.Token}, []byte(query))

diff --git a/pkg/cmd/create/agent.go b/pkg/cmd/create/agent.go
@@ -116,11 +116,10 @@ var agentCmd = &cobra.Command{
 				os.Exit(1)
 			}
 
-			nodeSelector, err := cmd.Flags().GetString("node-selector")
-			newAgent.NodeSelector = &nodeSelector
+			newAgent.NodeSelector, err = cmd.Flags().GetString("node-selector")
 			utils.PrintError(err)
-			if *newAgent.NodeSelector != "" {
-				if ok := utils.CheckKeyValueFormat(*newAgent.NodeSelector); !ok {
+			if newAgent.NodeSelector != "" {
+				if ok := utils.CheckKeyValueFormat(newAgent.NodeSelector); !ok {
 					os.Exit(1)
 				}
 			}

diff --git a/pkg/types/agent_types.go b/pkg/types/agent_types.go
@@ -18,11 +18,11 @@ package types
 type Agent struct {
 	AgentName      string `json:"cluster_name"`
 	Mode           string
-	Description    string  `json:"description,omitempty"`
-	PlatformName   string  `json:"platform_name"`
-	ProjectId      string  `json:"project_id"`
-	ClusterType    string  `json:"cluster_type"`
-	NodeSelector   *string `json:"node_selector"`
+	Description    string `json:"description,omitempty"`
+	PlatformName   string `json:"platform_name"`
+	ProjectId      string `json:"project_id"`
+	ClusterType    string `json:"cluster_type"`
+	NodeSelector   string `json:"node_selector"`
 	Namespace      string
 	ServiceAccount string
 	NsExists       bool