Support skip-validation names and integer values

bhuvanshah7 · bhuvanshah7 · commit 74611f5a7535 · 2026-04-13T12:31:55.000-07:00
diff --git a/azure-devops/azext_devops/dev/migration/arguments.py b/azure-devops/azext_devops/dev/migration/arguments.py
@@ -31,7 +31,9 @@ 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 (e.g. MaxFileSize,ActivePullRequestCount).')
+                         help='Validation policies to skip. Accepts either a comma-separated list of '
+                              'policy names (for example, AgentPoolExists,MaxRepoSize) or a non-negative '
+                              'integer bitmask.')
 
     with self.argument_context('devops migrations cutover set') as context:
         context.argument('cutover_date', options_list='--date',
diff --git a/azure-devops/azext_devops/dev/migration/migration.py b/azure-devops/azext_devops/dev/migration/migration.py
@@ -17,6 +17,19 @@
 
 API_VERSION = '7.2-preview'
 MIGRATIONS_API_PATH = '/_apis/elm/migrations'
+_SKIP_VALIDATION_POLICIES = {
+    'none': 0,
+    'activepullrequestcount': 1,
+    'pullrequestdeltasize': 2,
+    'agentpoolexists': 4,
+    'maxfilesize': 8,
+    'maxpullrequestsize': 16,
+    'maxpushpacksize': 32,
+    'maxreferencenamelength': 64,
+    'maxreposize': 128,
+    'targetrepositorydoesnotexist': 256,
+    'all': 2147483647,
+}
 _NON_ACTIVE_STATES = {
     'succeeded',
     'failed',
@@ -47,6 +60,62 @@ def _normalize_optional_text(value):
     return normalized if normalized else None
 
 
+def _parse_skip_validation(skip_validation):
+    if skip_validation is None:
+        return None
+
+    if isinstance(skip_validation, int):
+        if skip_validation < 0:
+            raise CLIError('--skip-validation must be a non-negative integer or a comma-separated list '
+                           'of policy names.')
+        return skip_validation
+
+    normalized = _normalize_optional_text(skip_validation)
+    if normalized is None:
+        raise CLIError('--skip-validation cannot be empty. Provide a non-negative integer or a '
+                       'comma-separated list of policy names.')
+
+    if normalized.isdigit():
+        return int(normalized)
+
+    policies = [policy.strip() for policy in normalized.split(',')]
+    if any(not policy for policy in policies):
+        raise CLIError('--skip-validation contains an empty policy name. Provide a comma-separated '
+                       'list such as "AgentPoolExists,MaxRepoSize".')
+
+    mask = 0
+    invalid_policies = []
+    for policy in policies:
+        key = _normalize_state(policy)
+        if key not in _SKIP_VALIDATION_POLICIES:
+            invalid_policies.append(policy)
+            continue
+        value = _SKIP_VALIDATION_POLICIES[key]
+        if value == _SKIP_VALIDATION_POLICIES['all']:
+            return value
+        mask |= value
+
+    if invalid_policies:
+        raise CLIError('--skip-validation contains unsupported policy name(s): {}. Supported values: {}. '
+                       'You can also pass a non-negative integer bitmask.'
+                       .format(', '.join(invalid_policies),
+                               ', '.join([
+                                   'None',
+                                   'ActivePullRequestCount',
+                                   'PullRequestDeltaSize',
+                                   'AgentPoolExists',
+                                   'MaxFileSize',
+                                   'MaxPullRequestSize',
+                                   'MaxPushPackSize',
+                                   'MaxReferenceNameLength',
+                                   'MaxRepoSize',
+                                   'TargetRepositoryDoesNotExist',
+                                   'All'
+                               ])))
+
+    return mask
+
+
 def get_migration(repository_id=None, organization=None, detect=None):
     organization = _resolve_org_for_auth(organization, detect)
     repository_id = _resolve_repository_id(repository_id)
@@ -61,6 +130,7 @@ def create_migration(repository_id=None, target_repository=None, target_owner_us
     target_repository = _normalize_optional_text(target_repository)
     target_owner_user_id = _normalize_optional_text(target_owner_user_id)
     agent_pool = _normalize_optional_text(agent_pool)
+    skip_validation = _parse_skip_validation(skip_validation)
 
     if not target_repository:
         raise CLIError('--target-repository must be specified.')
diff --git a/azure-devops/azext_devops/tests/latest/migration/test_migration.py b/azure-devops/azext_devops/tests/latest/migration/test_migration.py
@@ -138,6 +138,87 @@ def test_create_migration_payload_includes_optional_fields(self):
             self.assertEqual(payload['agentPoolName'], 'MigrationPool')
             self.assertEqual(payload['skipValidation'], 2147483647)
 
+    def test_create_migration_skip_validation_accepts_integer_string(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:
+            mock_send.return_value = {}
+            mock_resolve.return_value = self._TEST_ORG
+
+            create_migration(
+                repository_id='00000000-0000-0000-0000-000000000000',
+                target_repository='https://example.ghe.com/OrgName/RepoName',
+                target_owner_user_id='GeoffCoxMSFT',
+                skip_validation='2147483647',
+                organization=self._TEST_ORG,
+                detect=False
+            )
+
+            payload = mock_send.call_args[0][3]
+            self.assertEqual(payload['skipValidation'], 2147483647)
+
+    def test_create_migration_skip_validation_accepts_policy_names(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:
+            mock_send.return_value = {}
+            mock_resolve.return_value = self._TEST_ORG
+
+            create_migration(
+                repository_id='00000000-0000-0000-0000-000000000000',
+                target_repository='https://example.ghe.com/OrgName/RepoName',
+                target_owner_user_id='GeoffCoxMSFT',
+                skip_validation='PullRequestDeltaSize, AgentPoolExists',
+                organization=self._TEST_ORG,
+                detect=False
+            )
+
+            payload = mock_send.call_args[0][3]
+            self.assertEqual(payload['skipValidation'], 6)
+
+    def test_create_migration_skip_validation_accepts_all_name(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:
+            mock_send.return_value = {}
+            mock_resolve.return_value = self._TEST_ORG
+
+            create_migration(
+                repository_id='00000000-0000-0000-0000-000000000000',
+                target_repository='https://example.ghe.com/OrgName/RepoName',
+                target_owner_user_id='GeoffCoxMSFT',
+                skip_validation='All',
+                organization=self._TEST_ORG,
+                detect=False
+            )
+
+            payload = mock_send.call_args[0][3]
+            self.assertEqual(payload['skipValidation'], 2147483647)
+
+    def test_create_migration_skip_validation_rejects_invalid_policy_name(self):
+        with self.assertRaises(CLIError) as ctx:
+            create_migration(
+                repository_id='00000000-0000-0000-0000-000000000000',
+                target_repository='https://example.ghe.com/OrgName/RepoName',
+                target_owner_user_id='GeoffCoxMSFT',
+                skip_validation='BogusPolicy',
+                organization=self._TEST_ORG,
+                detect=False
+            )
+        self.assertIn('unsupported policy name', str(ctx.exception))
+
+    def test_create_migration_skip_validation_rejects_empty_policy_name(self):
+        with self.assertRaises(CLIError) as ctx:
+            create_migration(
+                repository_id='00000000-0000-0000-0000-000000000000',
+                target_repository='https://example.ghe.com/OrgName/RepoName',
+                target_owner_user_id='GeoffCoxMSFT',
+                skip_validation='AgentPoolExists,,MaxRepoSize',
+                organization=self._TEST_ORG,
+                detect=False
+            )
+        self.assertIn('contains an empty policy name', str(ctx.exception))
+
     def test_create_migration_empty_agent_pool_omitted(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, \
diff --git a/doc/elm_migrations_tsg.md b/doc/elm_migrations_tsg.md
@@ -308,14 +308,15 @@ az devops migrations resume --detect false --repository-id <GUID> --validate-onl
 |---|---|---|---|
 | `--org` | URL | All | Azure DevOps org URL (e.g., `https://dev.azure.com/myorg`). Can be set as default. |
 | `--repository-id` | GUID | All except `list` | Azure Repos repository GUID. Get from `az repos show --query id`. |
+| `--target-repository` | URL | `create` | Target repository URL (e.g., `https://example.ghe.com/OrgName/RepoName`). Validated by the server. |
 | `--target-repository` | URL | `create` | Target repository URL (e.g., `https://example.ghe.com/OrgName/RepoName`). Must start with `http://` or `https://`. |
 | `--target-owner-user-id` | string | `create` | Target repository owner user ID. |
 | `--agent-pool` | string | `create` | Agent pool name for migration work. Optional. |
 | `--validate-only` | flag | `create`, `resume` | On `create`: run pre-migration checks only. On `resume`: switch to validate-only mode. |
 | `--migration` | flag | `resume` | Promote succeeded validate-only to full migration (`validateOnly=false`, `statusRequested=active`). Mutually exclusive with `--validate-only`. |
 | `--cutover-date` | ISO 8601 | `create` | Pre-schedule cutover at creation time. E.g., `2030-12-31T11:59:00Z`. |
 | `--date` | ISO 8601 | `cutover set` | Schedule cutover date/time. E.g., `2030-12-31T11:59:00Z`. |
-| `--skip-validation` | string | `create` | Comma-separated list of validation policies to skip. |
+| `--skip-validation` | string or int | `create` | Validation policies to skip. Accepts either comma-separated policy names (recommended) or a non-negative integer bitmask. |
 | `--include-inactive` | flag | `list` | Include completed, failed, and suspended migrations. |
 | `--detect` | flag | All | Auto-detect org from git remote (default: `true`). Use `--detect false` to disable. |
 
@@ -327,7 +328,7 @@ az devops migrations resume --detect false --repository-id <GUID> --validate-onl
 | **Stale default org in config** | Requests go to old/dev URL (e.g., `codedev.ms`) | Run `az devops configure -d organization=https://dev.azure.com/<your-org>` to update |
 | **Resume on an active migration** | Error: "Migration is active..." | Pause first with `az devops migrations pause`, then resume |
 | **Both `--validate-only` and `--migration` on resume** | Error: "Please specify only one..." | Use only one flag at a time |
-| **Missing `--target-repository` on create** | Error: "--target-repository must be specified." | Provide `--target-repository <URL>` |
+| **Missing `--agent-pool` on create** | Error: "--agent-pool must be specified." | Always provide `--agent-pool <PoolName>` |
 | **Invalid `--target-repository` format** | Error: "--target-repository must be a valid URL..." | Use a fully qualified URL starting with `http://` or `https://` |
 | **Invalid `--repository-id`** | Error: "--repository-id must be a valid GUID." | Use `az repos show --query id` to get the correct GUID |
 | **Bad date format** | Error: "must be a valid date or datetime string" | Use ISO 8601 format, e.g., `2030-12-31T11:59:00Z` |
@@ -359,6 +360,34 @@ az devops migrations resume --detect false --repository-id <GUID> --validate-onl
 1. Check date values are valid ISO 8601 strings (e.g., `2030-12-31T11:59:00Z`).
 2. Ensure `--target-repository` is a valid URL.
 3. Ensure `--agent-pool` matches a pool name the service recognizes.
+4. Ensure `--skip-validation` uses supported policy names or a non-negative integer bitmask.
+
+### skip-validation examples
+
+Recommended form using policy names:
+
+```powershell
+az devops migrations create --detect false --repository-id <GUID> --target-repository <TARGET_URL> --target-owner-user-id <OWNER> --skip-validation AgentPoolExists,MaxRepoSize
+```
+
+Advanced form using integer bitmask:
+
+```powershell
+az devops migrations create --detect false --repository-id <GUID> --target-repository <TARGET_URL> --target-owner-user-id <OWNER> --skip-validation 132
+```
+
+Supported policy names:
+- `None`
+- `ActivePullRequestCount`
+- `PullRequestDeltaSize`
+- `AgentPoolExists`
+- `MaxFileSize`
+- `MaxPullRequestSize`
+- `MaxPushPackSize`
+- `MaxReferenceNameLength`
+- `MaxRepoSize`
+- `TargetRepositoryDoesNotExist`
+- `All`
 
 ### Promote validate-only does not start
 
diff --git a/doc/migrations.md b/doc/migrations.md
@@ -36,11 +36,13 @@ Use all three fields together when troubleshooting state transitions.
 - `--target-owner-user-id` is required for create.
 - `--agent-pool` is optional for create.
 - `--cutover-date` / `--date` must be ISO 8601, for example: `2030-12-31T11:59:00Z`.
+- `--skip-validation` accepts either comma-separated policy names or a non-negative integer bitmask.
 
 Validation enforced by the CLI:
 
 - `--target-repository` must start with `http://` or `https://`.
 - `--repository-id` must be a valid GUID.
+- `--skip-validation` policy names must be recognized values.
 
 ### How to find `--repository-id`
 
@@ -129,6 +131,28 @@ az devops migrations create --org https://dev.azure.com/myorg \
   --validate-only
 ```
 
+### Create a migration with skip-validation
+
+Recommended form using policy names:
+
+```bash
+az devops migrations create --org https://dev.azure.com/myorg \
+  --repository-id 00000000-0000-0000-0000-000000000000 \
+  --target-repository https://example.ghe.com/OrgName/RepoName \
+  --target-owner-user-id OwnerId \
+  --skip-validation AgentPoolExists,MaxRepoSize
+```
+
+Advanced form using integer bitmask:
+
+```bash
+az devops migrations create --org https://dev.azure.com/myorg \
+  --repository-id 00000000-0000-0000-0000-000000000000 \
+  --target-repository https://example.ghe.com/OrgName/RepoName \
+  --target-owner-user-id OwnerId \
+  --skip-validation 132
+```
+
 ### Pause and resume
 
 ```bash
@@ -197,6 +221,9 @@ az devops migrations pause --org https://dev.azure.com/myorg \
 - Error: `--target-repository` must be valid.
   Ensure it is a fully qualified URL starting with `http://` or `https://`.
 
+- Error: `--skip-validation` contains unsupported policy names.
+  Use supported names such as `AgentPoolExists`, `MaxRepoSize`, or pass a non-negative integer bitmask.
+
 - Error: requests are sent to the wrong org.
   Use `--org <url> --detect false`, and verify defaults via `az devops configure -l`.
 
