Merge branch...

Merge branch '7672-geo-remove-deprecated-wikis_count-and-repositories_count-fields-from-the-public-api-geo' into 'master'

Geo: Remove deprecated wikis_count and repositories_count fields from the public API

Closes #7672

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

doc/api/geo_nodes.md

@@ -192,12 +192,10 @@ Example response:
     "job_artifacts_failed_count": nil,
     "job_artifacts_synced_missing_on_primary_count": 0,
     "job_artifacts_synced_in_percentage": "0.00%",
-    "repositories_count": 41,
     "projects_count": 41,
     "repositories_failed_count": nil,
     "repositories_synced_count": nil,
     "repositories_synced_in_percentage": "0.00%",
-    "wikis_count": 41,
     "wikis_failed_count": nil,
     "wikis_synced_count": nil,
     "wikis_synced_in_percentage": "0.00%",
@@ -257,12 +255,10 @@ Example response:
     "job_artifacts_failed_count": 1,
     "job_artifacts_synced_missing_on_primary_count": 0,
     "job_artifacts_synced_in_percentage": "50.00%",
-    "repositories_count": 41,
     "projects_count": 41,
     "repositories_failed_count": 1,
     "repositories_synced_count": 40,
     "repositories_synced_in_percentage": "97.56%",
-    "wikis_count": 41,
     "wikis_failed_count": 0,
     "wikis_synced_count": 41,
     "wikis_synced_in_percentage": "100.00%",
@@ -300,7 +296,8 @@ Example response:
 ]
 ```
 
-Note: fields `wikis_count` and `repositories_count` are deprecated and will be deleted soon. Please use `projects_count` instead.
+NOTE: **Note:**
+In GitLab 12.0, deprecated fields `wikis_count` and `repositories_count` were removed. Use `projects_count` instead.
 
 ## Retrieve status about a specific Geo node
 
@@ -337,12 +334,10 @@ Example response:
   "job_artifacts_failed_count": 1,
   "job_artifacts_synced_missing_on_primary_count": 0,
   "job_artifacts_synced_in_percentage": "50.00%",
-  "repositories_count": 41,
   "projects_count": 41,
   "repositories_failed_count": 1,
   "repositories_synced_count": 40,
   "repositories_synced_in_percentage": "97.56%",
-  "wikis_count": 41,
   "wikis_failed_count": 0,
   "wikis_synced_count": 41,
   "wikis_synced_in_percentage": "100.00%",
@@ -362,7 +357,8 @@ Example response:
 
 Note: The `health_status` parameter can only be in an "Healthy" or "Unhealthy" state, while the `health` parameter can be empty, "Healthy", or contain the actual error message.
 
-Note: Fields `wikis_count` and `repositories_count` are deprecated and will be deleted soon. Please use `projects_count` instead.
+NOTE: **Note:**
+In GitLab 12.0, deprecated fields `wikis_count` and `repositories_count` were removed. Use `projects_count` instead.
 
 ## Retrieve project sync or verification failures that occurred on the current node
 

ee/app/assets/javascripts/geo_nodes/store/geo_nodes_store.js

@@ -80,32 +80,32 @@ export default class GeoNodesStore {
         failureCount: 0,
       },
       repositories: {
-        totalCount: rawNodeDetails.repositories_count || 0,
+        totalCount: rawNodeDetails.projects_count || 0,
         successCount: rawNodeDetails.repositories_synced_count || 0,
         failureCount: rawNodeDetails.repositories_failed_count || 0,
       },
       wikis: {
-        totalCount: rawNodeDetails.wikis_count || 0,
+        totalCount: rawNodeDetails.projects_count || 0,
         successCount: rawNodeDetails.wikis_synced_count || 0,
         failureCount: rawNodeDetails.wikis_failed_count || 0,
       },
       repositoriesChecksummed: {
-        totalCount: rawNodeDetails.repositories_count || 0,
+        totalCount: rawNodeDetails.projects_count || 0,
         successCount: rawNodeDetails.repositories_checksummed_count || 0,
         failureCount: rawNodeDetails.repositories_checksum_failed_count || 0,
       },
       wikisChecksummed: {
-        totalCount: rawNodeDetails.wikis_count || 0,
+        totalCount: rawNodeDetails.projects_count || 0,
         successCount: rawNodeDetails.wikis_checksummed_count || 0,
         failureCount: rawNodeDetails.wikis_checksum_failed_count || 0,
       },
       verifiedRepositories: {
-        totalCount: rawNodeDetails.repositories_count || 0,
+        totalCount: rawNodeDetails.projects_count || 0,
         successCount: rawNodeDetails.repositories_verified_count || 0,
         failureCount: rawNodeDetails.repositories_verification_failed_count || 0,
       },
       verifiedWikis: {
-        totalCount: rawNodeDetails.wikis_count || 0,
+        totalCount: rawNodeDetails.projects_count || 0,
         successCount: rawNodeDetails.wikis_verified_count || 0,
         failureCount: rawNodeDetails.wikis_verification_failed_count || 0,
       },

ee/app/models/geo_node_status.rb

@@ -23,8 +23,6 @@ class GeoNodeStatus < ApplicationRecord
 
   sha_attribute :storage_configuration_digest
 
-  # It's needed for backward compatibility as we expose them via public API
-  alias_attribute :wikis_count, :projects_count
   alias_attribute :repositories_count, :projects_count
 
   # Be sure to keep this consistent with Prometheus naming conventions

ee/changelogs/unreleased/7672-geo-remove-deprecated-wikis_count-and-repositories_count-fields-from-the-public-api-geo.yml

+---
+title: 'Geo: Remove deprecated wikis_count and repositories_count fields from the
+  public API'
+merge_request: 13025
+author:
+type: removed

ee/lib/ee/api/entities.rb

@@ -560,14 +560,12 @@ module EE
 
         expose :projects_count
 
-        expose :repositories_count # Deprecated
         expose :repositories_failed_count
         expose :repositories_synced_count
         expose :repositories_synced_in_percentage do |node|
           number_to_percentage(node.repositories_synced_in_percentage, precision: 2)
         end
 
-        expose :wikis_count # Deprecated
         expose :wikis_failed_count
         expose :wikis_synced_count
         expose :wikis_synced_in_percentage do |node|

ee/spec/fixtures/api/schemas/public_api/v4/geo_node_status.json

@@ -19,11 +19,9 @@
     "job_artifacts_synced_count",
     "job_artifacts_synced_missing_on_primary_count",
     "db_replication_lag_seconds",
-    "repositories_count",
     "projects_count",
     "repositories_failed_count",
     "repositories_synced_count",
-    "wikis_count",
     "wikis_failed_count",
     "wikis_synced_count",
     "repository_verification_enabled",
@@ -83,13 +81,11 @@
     "job_artifacts_synced_count": { "type": ["integer", "null"] },
     "job_artifacts_synced_missing_on_primary_count": { "type": ["integer", "null"] },
     "job_artifacts_synced_in_percentage": { "type": "string" },
-    "repositories_count": { "type": "integer" },
     "projects_count": { "type": "integer" },
     "repositories_failed_count": { "type": ["integer", "null"] },
     "repository_verification_enabled": { "type": "boolean" },
     "repositories_synced_count": { "type": ["integer", "null"] },
     "repositories_synced_in_percentage": { "type": "string" },
-    "wikis_count": { "type": "integer" },
     "wikis_failed_count": { "type": ["integer", "null"] },
     "wikis_synced_count": { "type": ["integer", "null"] },
     "wikis_synced_in_percentage": { "type": "string" },

ee/spec/javascripts/geo_nodes/mock_data.js

@@ -74,11 +74,10 @@ export const rawMockNodeDetails = {
   job_artifacts_synced_count: 0,
   job_artifacts_failed_count: 0,
   job_artifacts_synced_in_percentage: '0.00%',
-  repositories_count: 12,
   repositories_failed_count: 0,
   repositories_synced_count: 12,
   repositories_synced_in_percentage: '100.00%',
-  wikis_count: 12,
+  projects_count: 12,
   wikis_failed_count: 0,
   wikis_synced_count: 12,
   wikis_synced_in_percentage: '100.00%',

ee/spec/models/geo_node_status_spec.rb

@@ -416,7 +416,7 @@ describe GeoNodeStatus, :geo, :geo_fdw do
     end
 
     it 'returns 0 when project count is unknown' do
-      allow(subject).to receive(:repositories_count).and_return(nil)
+      allow(subject).to receive(:projects_count).and_return(nil)
 
       expect(subject.repositories_synced_in_percentage).to eq(0)
     end
@@ -441,7 +441,7 @@ describe GeoNodeStatus, :geo, :geo_fdw do
     end
 
     it 'returns 0 when project count is unknown' do
-      allow(subject).to receive(:wikis_count).and_return(nil)
+      allow(subject).to receive(:projects_count).and_return(nil)
 
       expect(subject.wikis_synced_in_percentage).to eq(0)
     end
@@ -555,7 +555,7 @@ describe GeoNodeStatus, :geo, :geo_fdw do
     end
 
     it 'returns 0 when project count is unknown' do
-      allow(subject).to receive(:repositories_count).and_return(nil)
+      allow(subject).to receive(:projects_count).and_return(nil)
 
       expect(subject.repositories_checksummed_in_percentage).to eq(0)
     end
@@ -617,7 +617,7 @@ describe GeoNodeStatus, :geo, :geo_fdw do
     end
 
     it 'returns 0 when project count is unknown' do
-      allow(subject).to receive(:wikis_count).and_return(nil)
+      allow(subject).to receive(:projects_count).and_return(nil)
 
       expect(subject.wikis_checksummed_in_percentage).to eq(0)
     end
@@ -840,7 +840,7 @@ describe GeoNodeStatus, :geo, :geo_fdw do
 
   describe '#[]' do
     it 'returns values for each attribute' do
-      expect(subject[:repositories_count]).to eq(4)
+      expect(subject[:projects_count]).to eq(4)
       expect(subject[:repositories_synced_count]).to eq(0)
     end
 

ee/spec/services/geo/metrics_update_service_spec.rb

@@ -52,7 +52,6 @@ describe Geo::MetricsUpdateService, :geo, :prometheus do
   let(:primary_data) do
     {
       status_message: nil,
-      repositories_count: 10,
       projects_count: 10,
       lfs_objects_count: 100,
       job_artifacts_count: 100,

ee/spec/services/geo/node_status_post_service_spec.rb

@@ -73,7 +73,7 @@ describe Geo::NodeStatusPostService, :geo do
         geo_node_id: secondary.id,
         status_message: nil,
         db_replication_lag_seconds: 0,
-        repositories_count: 10
+        projects_count: 10
       }))
     end
 
@@ -88,7 +88,7 @@ describe Geo::NodeStatusPostService, :geo do
         geo_node_id: secondary.id,
         status_message: nil,
         db_replication_lag_seconds: 0,
-        repositories_count: 10
+        projects_count: 10
       }))
     end
   end