remove server

Author: ilia-medvedev-codefresh

codefresh/cfclient/gitops_environments.go

@@ -31,12 +31,12 @@ type GitopsEnvironment struct {
 // GitopsCluster represents a cluster within a GitOps environment.
 type GitopsEnvironmentCluster struct {
 	Name        string   `json:"name"`
-	Server      string   `json:"server"`
 	RuntimeName string   `json:"runtimeName"`
 	Namespaces  []string `json:"namespaces"`
 }
 
 type GitopsEnvironmentResponse struct {
+	Errors            []GraphQLError     `json:"errors,omitempty"`
 	Data struct {
 		Environment       GitopsEnvironment `json:"environment,omitempty"`
 		CreateEnvironment GitopsEnvironment `json:"createEnvironment,omitempty"`
@@ -124,6 +124,10 @@ func (client *Client) CreateGitopsEnvironment(environment *GitopsEnvironment) (*
 		return nil, err
 	}
 
+	if len(gitopsEnvironmentResponse.Errors) > 0 {
+		return nil, fmt.Errorf("CreateGitopsEnvironment - %s", gitopsEnvironmentResponse.Errors)
+	}
+
 	return &gitopsEnvironmentResponse.Data.CreateEnvironment, nil
 }
 
@@ -161,6 +165,10 @@ func (client *Client) DeleteGitopsEnvironment(id string) (*GitopsEnvironment, er
 		return nil, err
 	}
 
+	if len(gitopsEnvironmentResponse.Errors) > 0 {
+		return nil, fmt.Errorf("DeleteGitopsEnvironment - %s", gitopsEnvironmentResponse.Errors)
+	}
+
 	return &gitopsEnvironmentResponse.Data.DeleteEnvironment, nil
 }
 
@@ -190,5 +198,9 @@ func (client *Client) UpdateGitopsEnvironment(environment *GitopsEnvironment) (*
 		return nil, err
 	}
 
+	if len(gitopsEnvironmentResponse.Errors) > 0 {
+		return nil, fmt.Errorf("UpdateGitopsEnvironment - %s", gitopsEnvironmentResponse.Errors)
+	}
+
 	return &gitopsEnvironmentResponse.Data.UpdateEnvironment, nil
 }

codefresh/cfclient/gql_client.go

@@ -14,6 +14,11 @@ type GraphQLRequest struct {
 	Variables map[string]interface{} `json:"variables,omitempty"`
 }
 
+type GraphQLError struct {
+	Message  string `json:"message,omitempty"`
+	Extensions string `json:"extensions,omitempty"`
+}
+
 func (client *Client) SendGqlRequest(request GraphQLRequest) ([]byte, error) {
 	jsonRequest, err := json.Marshal(request)
 	if err != nil {

codefresh/resource_gitops_environment.go

@@ -45,12 +45,6 @@ func resourceGitopsEnvironment() *schema.Resource {
 							Required:    true,
 							Description: "Target cluster name",
 						},
-						"server": {
-							Type:        schema.TypeString,
-							Optional:    true,
-							Description: "Target cluster server url. Defaults to `https://kubernetes.default.svc` which is the default in-cluster url",
-							Default:     "https://kubernetes.default.svc",
-						},
 						"runtime_name": {
 							Type:        schema.TypeString,
 							Required:    true,
@@ -196,7 +190,6 @@ func flattenClusters(clusters []cfclient.GitopsEnvironmentCluster) []map[string]
 	for _, cluster := range clusters {
 		m := make(map[string]interface{})
 		m["name"] = cluster.Name
-		m["server"] = cluster.Server
 		m["runtime_name"] = cluster.RuntimeName
 		m["namespaces"] = cluster.Namespaces
 		res = append(res, m)
@@ -212,7 +205,6 @@ func expandClusters(list []interface{}) []cfclient.GitopsEnvironmentCluster {
 		clusterMap := item.(map[string]interface{})
 		cluster := cfclient.GitopsEnvironmentCluster{
 			Name:        clusterMap["name"].(string),
-			Server:      clusterMap["server"].(string),
 			RuntimeName: clusterMap["runtime_name"].(string),
 			Namespaces:  datautil.ConvertStringArr(clusterMap["namespaces"].([]interface{})),
 		}

codefresh/resource_gitops_environment_test.go

@@ -24,7 +24,6 @@ func TestAccCodefreshGitopsEnvironmentsResource(t *testing.T) {
 					"NON_PROD",
 					[]cfclient.GitopsEnvironmentCluster{{
 						Name:        "in-cluster2",
-						Server:      "https://kubernetes.default.svc",
 						RuntimeName: "test-runtime",
 						Namespaces:  []string{"test-ns-1", "test-ns2"},
 					}},
@@ -50,13 +49,11 @@ func TestAccCodefreshGitopsEnvironmentsResource(t *testing.T) {
 					[]cfclient.GitopsEnvironmentCluster{
 						{
 							Name:        "in-cluster2",
-							Server:      "https://kubernetes.default.svc",
 							RuntimeName: "test-runtime",
 							Namespaces:  []string{"test-ns-1", "test-ns2"},
 						},
 						{
 							Name:        "in-cluster3",
-							Server:      "https://kubernetes2.default.svc",
 							RuntimeName: "test-runtime-2",
 							Namespaces:  []string{"test-ns-3"},
 						},
@@ -115,10 +112,9 @@ func testAccCodefreshGitopsEnvironmentConfig(name, kind string, clusters []cfcli
 		ns := fmt.Sprintf("[\"%s\"]", strings.Join(c.Namespaces, "\", \""))
 		block := fmt.Sprintf(`  cluster {
     name        = "%s"
-    server      = "%s"
     runtime_name = "%s"
     namespaces  = %s
-  }`, c.Name, c.Server, c.RuntimeName, ns)
+  }`, c.Name, c.RuntimeName, ns)
 		clusterBlocks = append(clusterBlocks, block)
 	}
 	labelsStr := fmt.Sprintf("[\"%s\"]", strings.Join(labelPairs, "\", \""))