Update project clusters API

- Expose fields managed and enabled where missing
- Update tests to use the new fields
- Update handbook to mention the fields

doc/api/project_clusters.md

@@ -21,7 +21,7 @@ GET /projects/:id/clusters
 Parameters:
 
 | Attribute | Type    | Required | Description                                           |
-| --------- | ---- | -------- | ----------- |
+| --------- | ------- | -------- | ----------------------------------------------------- |
 | `id`      | integer | yes      | The ID of the project owned by the authenticated user |
 
 Example request:
@@ -39,6 +39,8 @@ Example response:
     "name":"cluster-1",
     "domain":"example.com",
     "created_at":"2019-01-02T20:18:12.563Z",
+    "managed": true,
+    "enabled": true,
     "provider_type":"user",
     "platform_type":"kubernetes",
     "environment_scope":"*",
@@ -89,7 +91,7 @@ GET /projects/:id/clusters/:cluster_id
 Parameters:
 
 | Attribute    | Type    | Required | Description                                           |
-| --------- | ---- | -------- | ----------- |
+| ------------ | ------- | -------- | ----------------------------------------------------- |
 | `id`         | integer | yes      | The ID of the project owned by the authenticated user |
 | `cluster_id` | integer | yes      | The ID of the cluster                                 |
 
@@ -107,6 +109,8 @@ Example response:
   "name":"cluster-1",
   "domain":"example.com",
   "created_at":"2019-01-02T20:18:12.563Z",
+  "managed": true,
+  "enabled": true,
   "provider_type":"user",
   "platform_type":"kubernetes",
   "environment_scope":"*",
@@ -180,7 +184,7 @@ POST /projects/:id/clusters/user
 Parameters:
 
 | Attribute                                            | Type    | Required | Description                                                                                         |
-| --------- | ---- | -------- | ----------- |
+| ---------------------------------------------------- | ------- | -------- | --------------------------------------------------------------------------------------------------- |
 | `id`                                                 | integer | yes      | The ID of the project owned by the authenticated user                                               |
 | `name`                                               | string  | yes      | The name of the cluster                                                                             |
 | `domain`                                             | string  | no       | The [base domain](../user/project/clusters/index.md#base-domain) of the cluster                     |
@@ -210,6 +214,8 @@ Example response:
   "id":24,
   "name":"cluster-5",
   "created_at":"2019-01-03T21:53:40.610Z",
+  "managed": true,
+  "enabled": true,
   "provider_type":"user",
   "platform_type":"kubernetes",
   "environment_scope":"*",
@@ -274,12 +280,14 @@ PUT /projects/:id/clusters/:cluster_id
 Parameters:
 
 | Attribute                                   | Type    | Required | Description                                                                                         |
-| --------- | ---- | -------- | ----------- |
+| ------------------------------------------- | ------- | -------- | --------------------------------------------------------------------------------------------------- |
 | `id`                                        | integer | yes      | The ID of the project owned by the authenticated user                                               |
 | `cluster_id`                                | integer | yes      | The ID of the cluster                                                                               |
 | `name`                                      | string  | no       | The name of the cluster                                                                             |
 | `domain`                                    | string  | no       | The [base domain](../user/project/clusters/index.md#base-domain) of the cluster                     |
 | `management_project_id`                     | integer | no       | The ID of the [management project](../user/clusters/management_project.md) for the cluster          |
+| `enabled`                                   | boolean | no       | Determines if cluster is active or not, defaults to true                                            |
+| `managed`                                   | boolean | no       | Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true |
 | `platform_kubernetes_attributes[api_url]`   | string  | no       | The URL to access the Kubernetes API                                                                |
 | `platform_kubernetes_attributes[token]`     | string  | no       | The token to authenticate against Kubernetes                                                        |
 | `platform_kubernetes_attributes[ca_cert]`   | string  | no       | TLS certificate. Required if API is using a self-signed TLS certificate.                            |
@@ -307,6 +315,8 @@ Example response:
   "name":"new-cluster-name",
   "domain":"new-domain.com",
   "created_at":"2019-01-03T21:53:40.610Z",
+  "managed": true,
+  "enabled": true,
   "provider_type":"user",
   "platform_type":"kubernetes",
   "environment_scope":"*",
@@ -381,7 +391,7 @@ DELETE /projects/:id/clusters/:cluster_id
 Parameters:
 
 | Attribute    | Type    | Required | Description                                           |
-| --------- | ---- | -------- | ----------- |
+| ------------ | ------- | -------- | ----------------------------------------------------- |
 | `id`         | integer | yes      | The ID of the project owned by the authenticated user |
 | `cluster_id` | integer | yes      | The ID of the cluster                                 |
 

lib/api/entities/cluster.rb

@@ -3,7 +3,7 @@
 module API
   module Entities
     class Cluster < Grape::Entity
-      expose :id, :name, :created_at, :domain
+      expose :id, :name, :created_at, :domain, :enabled, :managed
       expose :provider_type, :platform_type, :environment_scope, :cluster_type, :namespace_per_environment
       expose :user, using: Entities::UserBasic
       expose :platform_kubernetes, using: Entities::Platform::Kubernetes

lib/api/project_clusters.rb

@@ -83,6 +83,8 @@ module API
         optional :environment_scope, type: String, desc: 'The associated environment to the cluster'
         optional :namespace_per_environment, default: true, type: Boolean, desc: 'Deploy each environment to a separate Kubernetes namespace'
         optional :management_project_id, type: Integer, desc: 'The ID of the management project'
+        optional :enabled, type: Boolean, default: true, desc: 'Determines if cluster is active or not, defaults to true'
+        optional :managed, type: Boolean, default: true, desc: 'Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true'
         optional :platform_kubernetes_attributes, type: Hash, desc: %q(Platform Kubernetes data) do
           optional :api_url, type: String, desc: 'URL to access the Kubernetes API'
           optional :token, type: String, desc: 'Token to authenticate against Kubernetes'

spec/requests/api/project_clusters_spec.rb

@@ -88,6 +88,8 @@ RSpec.describe API::ProjectClusters do
         expect(json_response['environment_scope']).to eq('*')
         expect(json_response['cluster_type']).to eq('project_type')
         expect(json_response['domain']).to eq('example.com')
+        expect(json_response['enabled']).to eq('true')
+        expect(json_response['managed']).to eq('true')
       end
 
       it 'returns project information' do