Merge branch '228722_01-re-add-project-and-wiki-counts' into 'master'

Geo - Re-Add Old Count Properties to API

See merge request gitlab-org/gitlab!38361

doc/api/geo_nodes.md

@@ -325,9 +325,11 @@ Example response:
     "design_repositories_failed_count": nil,
     "design_repositories_synced_in_percentage": "0.00%",
     "projects_count": 41,
+    "repositories_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%",
@@ -402,9 +404,11 @@ Example response:
     "design_repositories_failed_count": nil,
     "design_repositories_synced_in_percentage": "0.00%",
     "projects_count": 41,
+    "repositories_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%",
@@ -448,9 +452,6 @@ Example response:
 ]
 ```
 
-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
 
 ```plaintext
@@ -495,9 +496,11 @@ Example response:
   "design_repositories_failed_count": nil,
   "design_repositories_synced_in_percentage": "0.00%",
   "projects_count": 41,
+  "repositories_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%",
@@ -517,9 +520,6 @@ 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: **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
 
 This only works on a secondary node.

ee/changelogs/unreleased/228722_01-re-add-project-and-wiki-counts.yml

+---
+title: Geo API - Expose repositories_count and wikis_count
+merge_request: 38361
+author:
+type: changed

ee/lib/ee/api/entities/geo_node_status.rb

@@ -19,6 +19,10 @@ module EE
           end
         end
 
+        # Aliased from :project_count
+        expose :repositories_count
+        expose :wikis_count
+
         expose :replication_slots_count
         expose :replication_slots_used_count
 

ee/spec/factories/geo_node_statuses.rb

@@ -27,8 +27,10 @@ FactoryBot.define do
       design_repositories_failed_count { 3 }
       design_repositories_synced_count { 200 }
       projects_count { 10 }
+      repositories_count { 10 }
       repositories_synced_count { 5 }
       repositories_failed_count { 0 }
+      wikis_count { 10 }
       wikis_synced_count { 4 }
       wikis_failed_count { 1 }
       repositories_checksummed_count { 600 }

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

@@ -33,8 +33,10 @@
     "design_repositories_synced_count",
     "repositories_replication_enabled",
     "projects_count",
+    "repositories_count",
     "repositories_failed_count",
     "repositories_synced_count",
+    "wikis_count",
     "wikis_failed_count",
     "wikis_synced_count",
     "repository_verification_enabled",
@@ -113,10 +115,12 @@
     "design_repositories_synced_in_percentage": { "type": "string" },
     "repositories_replication_enabled": { "type": ["boolean", "null"] },
     "projects_count": { "type": "integer" },
+    "repositories_count": { "type": "integer" },
     "repositories_failed_count": { "type": ["integer", "null"] },
     "repository_verification_enabled": { "type": ["boolean", "null"] },
     "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" },