Merge branch 'tc-geo-open-edit-primary-api' into 'master'

Make it possible to edit Geo primary through API

Closes #9454

See merge request gitlab-org/gitlab-ee!9328

doc/api/geo_nodes.md

@@ -70,7 +70,7 @@ Example response:
 
 ## Edit a Geo node
 
-Updates an existing Geo secondary node. The primary node cannot be edited.
+Updates settings of an existing Geo node.
 
 _This can only be run against a primary Geo node._
 
@@ -92,8 +92,8 @@ Example response:
 ```json
 {
   "id": 1,
-  "url": "https://primary.example.com/",
-  "primary": true,
+  "url": "https://secondary.example.com/",
+  "primary": false,
   "enabled": true,
   "current": true,
   "files_max_capacity": 10,
@@ -107,6 +107,9 @@ Example response:
 
 Removes the Geo node.
 
+NOTE: **Note:**
+Only a Geo primary node will accept this request.
+
 ```
 DELETE /geo_nodes/:id
 ```

ee/app/models/geo_node.rb

@@ -21,6 +21,7 @@ class GeoNode < ActiveRecord::Base
   validate :check_url_is_valid
 
   validates :primary, uniqueness: { message: 'node already exists' }, if: :primary
+  validates :enabled, if: :primary, acceptance: { message: 'Geo primary node cannot be disabled' }
 
   validates :access_key, presence: true
   validates :encrypted_secret_access_key, presence: true

ee/changelogs/unreleased/tc-geo-open-edit-primary-api.yml

+---
+title: Make it possible to edit Geo primary through API
+merge_request: 9328
+author:
+type: changed

ee/lib/api/geo_nodes.rb

@@ -138,7 +138,7 @@ module API
         #
         # Example request:
         #   PUT /geo_nodes/:id
-        desc 'Edit an existing Geo secondary node' do
+        desc 'Update an existing Geo node' do
           success EE::API::Entities::GeoNode
         end
         params do
@@ -153,9 +153,7 @@ module API
 
           update_params = declared_params(include_missing: false)
 
-          if geo_node.primary?
-            forbidden!('Primary node cannot be edited')
-          elsif geo_node.update(update_params)
+          if geo_node.update(update_params)
             present geo_node, with: EE::API::Entities::GeoNode
           else
             render_validation_error!(geo_node)

ee/spec/lib/gitlab/geo/jwt_request_decoder_spec.rb

@@ -13,8 +13,7 @@ describe Gitlab::Geo::JwtRequestDecoder do
     end
 
     it 'fails to decode when node is disabled' do
-      primary_node.enabled = false
-      primary_node.save
+      primary_node.update_attribute(:enabled, false)
 
       expect(subject.decode).to be_nil
     end

ee/spec/models/geo_node_spec.rb

@@ -27,6 +27,15 @@ describe GeoNode, type: :model do
     it { is_expected.to validate_numericality_of(:files_max_capacity).is_greater_than_or_equal_to(0) }
     it { is_expected.to validate_numericality_of(:verification_max_capacity).is_greater_than_or_equal_to(0) }
     it { is_expected.to validate_numericality_of(:minimum_reverification_interval).is_greater_than_or_equal_to(1) }
+
+    context 'primary node' do
+      it 'cannot be disabled' do
+        primary_node.enabled = false
+
+        expect(primary_node).not_to be_valid
+        expect(primary_node.errors).to include(:enabled)
+      end
+    end
   end
 
   context 'default values' do

ee/spec/requests/api/geo_nodes_spec.rb

@@ -223,6 +223,28 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
       expect(response).to match_response_schema('public_api/v4/geo_node', dir: 'ee')
       expect(json_response).to include(params)
     end
+
+    it 'can update primary' do
+      params = {
+        url: 'https://updated.example.com/'
+      }.stringify_keys
+
+      put api("/geo_nodes/#{primary.id}", admin), params: params
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/geo_node', dir: 'ee')
+      expect(json_response).to include(params)
+    end
+
+    it 'cannot disable a primary' do
+      params = {
+        enabled: false
+      }.stringify_keys
+
+      put api("/geo_nodes/#{primary.id}", admin), params: params
+
+      expect(response).to have_gitlab_http_status(400)
+    end
   end
 
   describe 'DELETE /geo_nodes/:id' do