[ACR] az acr connected-registry resync: Add command to manually trigger a sync from the parent registry

src/azure-cli/azure/cli/command_modules/acr/_format.py

@@ -113,6 +113,7 @@ def connected_registry_list_output_format(result):
             "parent_id": parent_id,
             "loginServer_host": _get_value(reg, 'loginServer', 'host'),
             "parent_syncProperties_lastSyncTime": _get_value(reg, 'parent', 'syncProperties', 'lastSyncTime'),
+            "registrySyncResult_syncState": _get_value(reg, 'registrySyncResult', 'syncState'),
             "mode": _get_value(reg, 'mode'),
             "childs": []
         }
@@ -326,7 +327,8 @@ def _connected_registry_format_group(item):
         ('LOGIN SERVER', _get_value(item, 'loginServer', 'host')),
         ('LAST SYNC (UTC)', _get_value(item, 'parent', 'syncProperties', 'lastSyncTime')),
         ('SYNC SCHEDULE', _get_value(item, 'parent', 'syncProperties', 'schedule')),
-        ('SYNC WINDOW', _get_value(item, 'parent', 'syncProperties', 'syncWindow'))
+        ('SYNC WINDOW', _get_value(item, 'parent', 'syncProperties', 'syncWindow')),
+        ('SYNC STATE', _get_value(item, 'registrySyncResult', 'syncState'))
     ])
 
 
@@ -337,7 +339,8 @@ def _connected_registry_list_format_group(item):
         ('CONNECTION STATE', _get_value(item, 'connectionState')),
         ('PARENT', _get_value(item, 'parent_name')),
         ('LOGIN SERVER', _get_value(item, 'loginServer_host')),
-        ('LAST SYNC (UTC)', _get_value(item, 'parent_syncProperties_lastSyncTime'))
+        ('LAST SYNC (UTC)', _get_value(item, 'parent_syncProperties_lastSyncTime')),
+        ('SYNC STATE', _get_value(item, 'registrySyncResult_syncState'))
     ])
 
 

src/azure-cli/azure/cli/command_modules/acr/_help.py

@@ -1790,6 +1790,16 @@
     text: >
         az acr connected-registry repo -r mycloudregistry -n myconnectedregistry --remove repo1 --add repo2
 """
+
+helps['acr connected-registry resync'] = """
+type: command
+short-summary: Trigger a manual resync between the connected registry and its parent.
+long-summary: The connected registry agent must be online for the sync to execute. The returned syncState is typically 'Pending'; use 'az acr connected-registry show' to track progress.
+examples:
+  - name: Resync a connected registry 'myconnectedregistry'.
+    text: >
+        az acr connected-registry resync -r mycloudregistry -n myconnectedregistry
+"""
 # endregion
 
 # region private-endpoint-connection

src/azure-cli/azure/cli/command_modules/acr/commands.py

@@ -434,6 +434,7 @@ def load_command_table(self, _):
                   table_transformer=token_output_format)
         g.command('repo', 'acr_connected_registry_permissions_update',
                   deprecate_info=self.deprecate(redirect='permissions update', hide=True))
+        g.command('resync', 'acr_connected_registry_resync', is_preview=True)
 
     with self.command_group('acr connected-registry install', acr_connected_registry_util,
                             deprecate_info=self.deprecate(redirect='acr connected-registry get-settings',

src/azure-cli/azure/cli/command_modules/acr/connected_registry.py

@@ -693,3 +693,13 @@ def acr_connected_registry_permissions_update(cmd,
     _update_repo_permissions(cmd, resource_group_name, registry_name,
                              target_connected_registry, add_repos_set, remove_repos_set, msg=msg)
 # endregion
+
+
+def acr_connected_registry_resync(cmd,
+                                  client,
+                                  connected_registry_name,
+                                  registry_name,
+                                  resource_group_name=None):
+    _, resource_group_name = validate_managed_registry(
+        cmd, registry_name, resource_group_name)
+    return client.resync(resource_group_name, registry_name, connected_registry_name)