Fixes server version issue

Signed-off-by: nagesh bansal <[email protected]>

Author: Nageshbansal

pkg/apis/experiment/experiment.go

@@ -346,36 +346,3 @@ func DeleteChaosExperiment(projectID string, experimentID *string, cred types.Cr
 		return DeleteChaosExperimentData{}, errors.New("Error while deleting the Chaos Experiment")
 	}
 }
-
-// GetServerVersion fetches the GQL server version
-func GetServerVersion(endpoint string) (ServerVersionResponse, error) {
-	query := `{"query":"query{\n getServerVersion{\n key value\n }\n}"}`
-	resp, err := apis.SendRequest(
-		apis.SendRequestParams{
-			Endpoint: endpoint + utils.GQLAPIPath,
-		},
-		[]byte(query),
-		string(types.Post),
-	)
-	if err != nil {
-		return ServerVersionResponse{}, err
-	}
-	bodyBytes, err := ioutil.ReadAll(resp.Body)
-	defer resp.Body.Close()
-	if err != nil {
-		return ServerVersionResponse{}, err
-	}
-	if resp.StatusCode == http.StatusOK {
-		var version ServerVersionResponse
-		err = json.Unmarshal(bodyBytes, &version)
-		if err != nil {
-			return ServerVersionResponse{}, err
-		}
-		if len(version.Errors) > 0 {
-			return ServerVersionResponse{}, errors.New(version.Errors[0].Message)
-		}
-		return version, nil
-	} else {
-		return ServerVersionResponse{}, errors.New(resp.Status)
-	}
-}

pkg/apis/experiment/types.go

@@ -94,20 +94,3 @@ type DeleteChaosExperimentGraphQLRequest struct {
 		ExperimentRunID *string `json:"experimentRunID"`
 	} `json:"variables"`
 }
-
-type ServerVersionResponse struct {
-	Data   ServerVersionData `json:"data"`
-	Errors []struct {
-		Message string   `json:"message"`
-		Path    []string `json:"path"`
-	} `json:"errors"`
-}
-
-type ServerVersionData struct {
-	GetServerVersion GetServerVersionData `json:"getServerVersion"`
-}
-
-type GetServerVersionData struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
-}

pkg/apis/infrastructure/infra.go

@@ -189,3 +189,40 @@ func DisconnectInfra(projectID string, infraID string, cred types.Credentials) (
 		return DisconnectInfraData{}, err
 	}
 }
+
+// GetServerVersion fetches the GQL server version
+func GetServerVersion(endpoint string) (ServerVersionResponse, error) {
+
+	query, err := json.Marshal(ServerVersionQuery)
+	if err != nil {
+		return ServerVersionResponse{}, err
+	}
+	resp, err := apis.SendRequest(
+		apis.SendRequestParams{
+			Endpoint: endpoint + utils.GQLAPIPath,
+		},
+		query,
+		string(types.Post),
+	)
+	if err != nil {
+		return ServerVersionResponse{}, err
+	}
+	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	defer resp.Body.Close()
+	if err != nil {
+		return ServerVersionResponse{}, err
+	}
+	if resp.StatusCode == http.StatusOK {
+		var version ServerVersionResponse
+		err = json.Unmarshal(bodyBytes, &version)
+		if err != nil {
+			return ServerVersionResponse{}, err
+		}
+		if len(version.Errors) > 0 {
+			return ServerVersionResponse{}, errors.New(version.Errors[0].Message)
+		}
+		return version, nil
+	} else {
+		return ServerVersionResponse{}, errors.New(resp.Status)
+	}
+}

pkg/apis/infrastructure/query.go

@@ -30,4 +30,11 @@ const (
 						}
 					}
 					}`
+
+	ServerVersionQuery = `query getServerVersion{
+							getServerVersion{
+							key
+							value
+							}
+							}`
 )

pkg/apis/infrastructure/types.go

@@ -66,3 +66,15 @@ type DisconnectInfraGraphQLRequest struct {
 		InfraID   string `json:"infraID"`
 	} `json:"variables"`
 }
+
+type ServerVersionResponse struct {
+	Data   ServerVersionData `json:"data"`
+	Errors []struct {
+		Message string   `json:"message"`
+		Path    []string `json:"path"`
+	} `json:"errors"`
+}
+
+type ServerVersionData struct {
+	GetServerVersion models.ServerVersionResponse `json:"getServerVersion"`
+}

pkg/cmd/config/setAccount.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/litmuschaos/litmusctl/pkg/apis/experiment"
+	infra "github.com/litmuschaos/litmusctl/pkg/apis/infrastructure"
 
 	"github.com/golang-jwt/jwt"
 	"github.com/litmuschaos/litmusctl/pkg/apis"
@@ -177,7 +177,7 @@ var setAccountCmd = &cobra.Command{
 			utils.Red.Println("\nError: some flags are missing. Run 'litmusctl config set-account --help' for usage. ")
 		}
 
-		serverResp, err := experiment.GetServerVersion(authInput.Endpoint)
+		serverResp, err := infra.GetServerVersion(authInput.Endpoint)
 		var isCompatible bool
 		if err != nil {
 			utils.Red.Println("\nError: ", err)