Update migration changes and tests

Author: bhuvanshah7

azure-devops/azext_devops/dev/migration/arguments.py

@@ -31,7 +31,7 @@ def load_migration_arguments(self, _):
         context.argument('agent_pool', options_list='--agent-pool',
                          help='Agent pool name to use for migration work.')
         context.argument('skip_validation', options_list='--skip-validation',
-                         help='Comma-separated list of validation policies to skip.')
+                         help='Comma-separated list of validation policies to skip (e.g. MaxFileSize,ActivePullRequestCount).')
 
     with self.argument_context('devops migrations cutover set') as context:
         context.argument('cutover_date', options_list='--date',

azure-devops/azext_devops/dev/migration/migration.py

@@ -54,7 +54,6 @@ def create_migration(repository_id=None, target_repository=None, target_owner_us
                      validate_only=False, cutover_date=None, agent_pool=None,
                      skip_validation=None, organization=None, detect=None):
     agent_pool = _normalize_optional_text(agent_pool)
-    skip_validation = _normalize_optional_text(skip_validation)
     if not target_owner_user_id:
         raise CLIError('--target-owner-user-id must be specified.')
 
@@ -86,20 +85,34 @@ def resume_migration(repository_id=None, validate_only=False, migration=False, o
     if validate_only and migration:
         raise CLIError('Please specify only one of --validate-only or --migration.')
 
-    migration_data = get_migration(repository_id=repository_id, organization=organization, detect=detect)
+    organization = _resolve_org_for_auth(organization, detect)
+    migration_data = get_migration(repository_id=repository_id, organization=organization, detect=None)
+
+    if migration and _is_validate_only_succeeded(migration_data):
+        return _promote_to_full_migration(migration_data, repository_id, organization)
+
     if _is_migration_active(migration_data):
         status = migration_data.get('statusRequested') or migration_data.get('status')
         stage = migration_data.get('stage')
         raise CLIError('Migration is active (statusRequested: {}, stage: {}). Pause it before resuming or changing mode.'
                        .format(status, stage))
 
+    if _is_migration_terminal(migration_data):
+        status = _normalize_state(migration_data.get('status'))
+        is_val_only = migration_data.get('validateOnly') is True
+        if status == 'succeeded' and is_val_only:
+            raise CLIError('Validation already succeeded. Use --migration to promote to a full migration, '
+                           'or abandon and create a new one.')
+        if status == 'succeeded':
+            raise CLIError('Migration already succeeded. Use abandon to reset, then create a new migration.')
+
     validate_only_value = None
     if validate_only:
         validate_only_value = True
     elif migration:
         validate_only_value = False
 
-    return _update_migration(repository_id, organization, detect,
+    return _update_migration(repository_id, organization, None,
                              validate_only=validate_only_value, status_requested='active')
 
 
@@ -170,6 +183,41 @@ def _is_migration_active(migration):
     return False
 
 
+def _is_migration_terminal(migration):
+    if not isinstance(migration, dict):
+        return False
+    status = _normalize_state(migration.get('status'))
+    return status in ('succeeded', 'failed')
+
+
+def _is_validate_only_succeeded(migration):
+    if not isinstance(migration, dict):
+        return False
+    return (migration.get('validateOnly') is True
+            and _normalize_state(migration.get('status')) == 'succeeded')
+
+
+def _promote_to_full_migration(migration_data, repository_id, organization):
+    repository_id = _resolve_repository_id(repository_id)
+    client = _get_service_client(organization)
+    url = _build_migration_url(organization, repository_id)
+
+    payload = {
+        'targetRepository': migration_data.get('targetRepository'),
+        'targetOwnerUserId': migration_data.get('targetOwnerUserId'),
+        'validateOnly': False,
+        'skipValidation': 2147483647,
+    }
+    agent_pool = migration_data.get('agentPoolName')
+    if agent_pool:
+        payload['agentPoolName'] = agent_pool
+    cutover_date = migration_data.get('scheduledCutoverDate')
+    if cutover_date:
+        payload['scheduledCutoverDate'] = cutover_date
+
+    return _send_request(client, 'POST', url, payload)
+
+
 def _resolve_org_for_auth(organization, detect):
     return resolve_instance(detect=detect, organization=organization)
 
@@ -184,6 +232,7 @@ def _build_migration_url(base_url, repository_id=None):
 def _get_service_client(organization):
     config = Configuration(base_url=None)
     config.add_user_agent('devOpsCli/{}'.format(VERSION))
+    config.retry_policy.policy.status_forcelist = []
     connection = get_connection(organization)
     return ServiceClient(creds=connection._creds, config=config)  # pylint: disable=protected-access
 
@@ -196,7 +245,12 @@ def _send_request(client, method, url, content=None):
     }
     response = client.send(request=request, headers=headers, content=content)
     if response.status_code < 200 or response.status_code >= 300:
-        error_detail = getattr(response, 'text', None) or getattr(response, 'content', None) or ''
+        error_detail = ''
+        try:
+            body = response.json()
+            error_detail = body.get('message') or body.get('Message') or str(body)
+        except Exception:  # pylint: disable=broad-except
+            error_detail = getattr(response, 'text', None) or getattr(response, 'content', None) or ''
         raise CLIError('Request failed with status {}. {}'.format(response.status_code, error_detail))
 
     content_type = response.headers.get('Content-Type') if response.headers else None

azure-devops/azext_devops/tests/latest/migration/test_migration.py

@@ -104,7 +104,7 @@ def test_create_migration_payload_includes_optional_fields(self):
                 validate_only=True,
                 cutover_date='2030-12-31T11:59:00Z',
                 agent_pool='MigrationPool',
-                skip_validation='ActivePullRequestCount,PullRequestDeltaSize',
+                skip_validation=2147483647,
                 organization=self._TEST_ORG,
                 detect=False
             )
@@ -113,7 +113,7 @@ def test_create_migration_payload_includes_optional_fields(self):
             self.assertTrue(payload['validateOnly'])
             self.assertEqual(payload['scheduledCutoverDate'], '2030-12-31T11:59:00Z')
             self.assertEqual(payload['agentPoolName'], 'MigrationPool')
-            self.assertEqual(payload['skipValidation'], 'ActivePullRequestCount,PullRequestDeltaSize')
+            self.assertEqual(payload['skipValidation'], 2147483647)
 
     def test_create_migration_empty_agent_pool_omitted(self):
         with patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve, \
@@ -134,7 +134,7 @@ def test_create_migration_empty_agent_pool_omitted(self):
             payload = mock_send.call_args[0][3]
             self.assertNotIn('agentPoolName', payload)
 
-    def test_create_migration_omits_empty_skip_validation(self):
+    def test_create_migration_omits_none_skip_validation(self):
         with patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve, \
              patch('azext_devops.dev.migration.migration._get_service_client') as mock_client, \
              patch('azext_devops.dev.migration.migration._send_request') as mock_send:
@@ -146,15 +146,15 @@ def test_create_migration_omits_empty_skip_validation(self):
                 target_repository='https://example.ghe.com/OrgName/RepoName',
                 target_owner_user_id='GeoffCoxMSFT',
                 agent_pool='MigrationPool',
-                skip_validation='   ',
+                skip_validation=None,
                 organization=self._TEST_ORG,
                 detect=False
             )
 
             payload = mock_send.call_args[0][3]
             self.assertNotIn('skipValidation', payload)
 
-    def test_create_migration_trims_optional_fields(self):
+    def test_create_migration_trims_agent_pool(self):
         with patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve, \
              patch('azext_devops.dev.migration.migration._get_service_client') as mock_client, \
              patch('azext_devops.dev.migration.migration._send_request') as mock_send:
@@ -166,14 +166,14 @@ def test_create_migration_trims_optional_fields(self):
                 target_repository='https://example.ghe.com/OrgName/RepoName',
                 target_owner_user_id='GeoffCoxMSFT',
                 agent_pool='  MigrationPool  ',
-                skip_validation=' ActivePullRequestCount, PullRequestDeltaSize ',
+                skip_validation=42,
                 organization=self._TEST_ORG,
                 detect=False
             )
 
             payload = mock_send.call_args[0][3]
             self.assertEqual(payload['agentPoolName'], 'MigrationPool')
-            self.assertEqual(payload['skipValidation'], 'ActivePullRequestCount, PullRequestDeltaSize')
+            self.assertEqual(payload['skipValidation'], 42)
 
     def test_create_migration_passes_target_repository_to_api(self):
         with patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve, \
@@ -281,7 +281,7 @@ def test_resume_sets_validate_only(self):
              patch('azext_devops.dev.migration.migration._get_service_client') as mock_client, \
              patch('azext_devops.dev.migration.migration._send_request') as mock_send:
             mock_send.return_value = {}
-            mock_get.return_value = {'status': 'succeeded'}
+            mock_get.return_value = {'status': 'suspended'}
             mock_resolve.return_value = self._TEST_ORG
 
             resume_migration(repository_id='00000000-0000-0000-0000-000000000000',
@@ -325,6 +325,80 @@ def test_resume_without_flags_preserves_mode(self):
             self.assertNotIn('validateOnly', payload)
             self.assertEqual(payload['statusRequested'], 'active')
 
+    def test_resume_migration_promotes_validate_only_succeeded(self):
+        with patch('azext_devops.dev.migration.migration.get_migration') as mock_get, \
+             patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve, \
+             patch('azext_devops.dev.migration.migration._get_service_client') as mock_client, \
+             patch('azext_devops.dev.migration.migration._send_request') as mock_send:
+            mock_send.return_value = {}
+            mock_get.return_value = {
+                'status': 'succeeded',
+                'validateOnly': True,
+                'targetRepository': 'https://ghe.example.com/org/repo',
+                'targetOwnerUserId': 'testuser',
+                'agentPoolName': 'MyPool',
+                'scheduledCutoverDate': '2030-06-01T00:00:00Z',
+            }
+            mock_resolve.return_value = self._TEST_ORG
+
+            resume_migration(repository_id='00000000-0000-0000-0000-000000000000',
+                             migration=True,
+                             organization=self._TEST_ORG, detect=False)
+
+            args = mock_send.call_args[0]
+            self.assertEqual(args[1], 'POST')
+            payload = args[3]
+            self.assertFalse(payload['validateOnly'])
+            self.assertEqual(payload['skipValidation'], 2147483647)
+            self.assertEqual(payload['targetRepository'], 'https://ghe.example.com/org/repo')
+            self.assertEqual(payload['targetOwnerUserId'], 'testuser')
+            self.assertEqual(payload['agentPoolName'], 'MyPool')
+            self.assertEqual(payload['scheduledCutoverDate'], '2030-06-01T00:00:00Z')
+
+    def test_resume_migration_promote_omits_null_optional_fields(self):
+        with patch('azext_devops.dev.migration.migration.get_migration') as mock_get, \
+             patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve, \
+             patch('azext_devops.dev.migration.migration._get_service_client') as mock_client, \
+             patch('azext_devops.dev.migration.migration._send_request') as mock_send:
+            mock_send.return_value = {}
+            mock_get.return_value = {
+                'status': 'succeeded',
+                'validateOnly': True,
+                'targetRepository': 'https://ghe.example.com/org/repo',
+                'targetOwnerUserId': 'testuser',
+            }
+            mock_resolve.return_value = self._TEST_ORG
+
+            resume_migration(repository_id='00000000-0000-0000-0000-000000000000',
+                             migration=True,
+                             organization=self._TEST_ORG, detect=False)
+
+            payload = mock_send.call_args[0][3]
+            self.assertNotIn('agentPoolName', payload)
+            self.assertNotIn('scheduledCutoverDate', payload)
+
+    def test_resume_succeeded_without_migration_flag_errors(self):
+        with patch('azext_devops.dev.migration.migration.get_migration') as mock_get, \
+             patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve:
+            mock_get.return_value = {'status': 'succeeded', 'validateOnly': True}
+            mock_resolve.return_value = self._TEST_ORG
+
+            with self.assertRaises(CLIError) as ctx:
+                resume_migration(repository_id='00000000-0000-0000-0000-000000000000',
+                                 organization=self._TEST_ORG, detect=False)
+            self.assertIn('--migration', str(ctx.exception))
+
+    def test_resume_succeeded_full_migration_errors(self):
+        with patch('azext_devops.dev.migration.migration.get_migration') as mock_get, \
+             patch('azext_devops.dev.migration.migration.resolve_instance') as mock_resolve:
+            mock_get.return_value = {'status': 'succeeded', 'validateOnly': False}
+            mock_resolve.return_value = self._TEST_ORG
+
+            with self.assertRaises(CLIError) as ctx:
+                resume_migration(repository_id='00000000-0000-0000-0000-000000000000',
+                                 organization=self._TEST_ORG, detect=False)
+            self.assertIn('abandon', str(ctx.exception))
+
 
 if __name__ == '__main__':
     unittest.main()

azure-devops/azure_devops-1.0.3/azext_devops/devops_sdk/__init__.py

@@ -0,0 +1,4 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------