[ACS JobRouter][GA] Change discriminators to enum instead of string f…

…or all polymorphic base class (#26658) * change discriminators to enum instead of string * Mark list methods as internal * update examples * update typespec-ts option * update examples * Suppress DISCRIMINATOR_NOT_REQUIRED and INVALID_DISCRIMINATOR_TYPE * Update projected list method names for csharp * Revert * add missing package-dir in tspconfig --------- Co-authored-by: williamzhao87 <[email protected]> Co-authored-by: Mike Harder <[email protected]>
Azure · Nov 14, 2023 · 752c7a5 · 752c7a5
1 parent 68dc5ca
commit 752c7a5
Show file tree

Hide file tree

Showing 39 changed files with 529 additions and 169 deletions.
diff --git a/specification/communication/Communication.JobRouter/client.tsp b/specification/communication/Communication.JobRouter/client.tsp
@@ -22,6 +22,7 @@ interface JobRouterAdministrationRestClient {
 
   getDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getDistributionPolicy;
 
+  @access(Access.internal, "csharp")
   listDistributionPolicies is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listDistributionPolicies;
 
   deleteDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteDistributionPolicy;
@@ -32,6 +33,7 @@ interface JobRouterAdministrationRestClient {
 
   getClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getClassificationPolicy;
 
+  @access(Access.internal, "csharp")
   listClassificationPolicies is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listClassificationPolicies;
 
   deleteClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteClassificationPolicy;
@@ -42,6 +44,7 @@ interface JobRouterAdministrationRestClient {
 
   getExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getExceptionPolicy;
 
+  @access(Access.internal, "csharp")
   listExceptionPolicies is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listExceptionPolicies;
 
   deleteExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteExceptionPolicy;
@@ -52,6 +55,7 @@ interface JobRouterAdministrationRestClient {
 
   getQueue is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getQueue;
 
+  @access(Access.internal, "csharp")
   listQueues is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listQueues;
 
   deleteQueue is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteQueue;
@@ -90,6 +94,7 @@ interface JobRouterRestClient {
   @access(Access.internal, "java")
   close is AzureCommunicationRoutingService.JobRouterOperations.close;
 
+  @access(Access.internal, "csharp")
   listJobs is AzureCommunicationRoutingService.JobRouterOperations.listJobs;
 
   #suppress "@azure-tools/typespec-azure-core/no-explicit-routes-resource-ops" "Need to revist how to correctly define singletons https://github.com/Azure/azure-rest-api-specs/issues/25605#issuecomment-1736265997"
@@ -118,5 +123,6 @@ interface JobRouterRestClient {
 
   deleteWorker is AzureCommunicationRoutingService.JobRouterOperations.deleteWorker;
 
+  @access(Access.internal, "csharp")
   listWorkers is AzureCommunicationRoutingService.JobRouterOperations.listWorkers;
 }
diff --git a/...tion.JobRouter/examples/2023-11-01/ClassificationPolicies_CreateClassificationPolicy.json b/...tion.JobRouter/examples/2023-11-01/ClassificationPolicies_CreateClassificationPolicy.json
@@ -12,7 +12,7 @@
         {
           "kind": "conditional",
           "condition": {
-            "kind": "expression-rule",
+            "kind": "expression",
             "language": "powerFx",
             "expression": "1 = 1"
           },
@@ -26,7 +26,7 @@
         }
       ],
       "prioritizationRule": {
-        "kind": "static-rule",
+        "kind": "static",
         "value": "2"
       }
     }
@@ -41,7 +41,7 @@
           {
             "kind": "conditional",
             "condition": {
-              "kind": "expression-rule",
+              "kind": "expression",
               "language": "powerFx",
               "expression": "1 = 1"
             },
@@ -55,7 +55,7 @@
           }
         ],
         "prioritizationRule": {
-          "kind": "static-rule",
+          "kind": "static",
           "value": "2"
         },
         "workerSelectorAttachments": [],
@@ -71,7 +71,7 @@
           {
             "kind": "conditional",
             "condition": {
-              "kind": "expression-rule",
+              "kind": "expression",
               "language": "powerFx",
               "expression": "1 = 1"
             },
@@ -85,7 +85,7 @@
           }
         ],
         "prioritizationRule": {
-          "kind": "static-rule",
+          "kind": "static",
           "value": "2"
         },
         "workerSelectorAttachments": [],

diff --git a/...ication.JobRouter/examples/2023-11-01/ClassificationPolicies_GetClassificationPolicy.json b/...ication.JobRouter/examples/2023-11-01/ClassificationPolicies_GetClassificationPolicy.json
@@ -16,7 +16,7 @@
           {
             "kind": "conditional",
             "condition": {
-              "kind": "expression-rule",
+              "kind": "expression",
               "language": "powerFx",
               "expression": "1 = 1"
             },
@@ -30,12 +30,12 @@
           }
         ],
         "prioritizationRule": {
-          "kind": "static-rule",
+          "kind": "static",
           "value": "2"
         },
         "workerSelectorAttachments": [
           {
-            "kind": "pass-through",
+            "kind": "passThrough",
             "key": "language",
             "labelOperator": "equal"
           }

diff --git a/...er/examples/2023-11-01/ClassificationPolicies_ListClassificationPoliciesWithPageSize.json b/...er/examples/2023-11-01/ClassificationPolicies_ListClassificationPoliciesWithPageSize.json
@@ -16,16 +16,16 @@
             "fallbackQueueId": "MainQueue",
             "queueSelectorAttachments": [
               {
-                "kind": "rule-engine",
+                "kind": "ruleEngine",
                 "rule": {
-                  "kind": "expression-rule",
+                  "kind": "expression",
                   "language": "powerFx",
                   "expression": "If(job.Escalated = true, \"SecondaryQueue\", \"MainQueue\")"
                 }
               }
             ],
             "prioritizationRule": {
-              "kind": "static-rule",
+              "kind": "static",
               "value": "2"
             },
             "workerSelectorAttachments": [],
@@ -37,16 +37,16 @@
             "fallbackQueueId": "MainQueue",
             "queueSelectorAttachments": [
               {
-                "kind": "rule-engine",
+                "kind": "ruleEngine",
                 "rule": {
-                  "kind": "expression-rule",
+                  "kind": "expression",
                   "language": "powerFx",
                   "expression": "If(job.VIP = true, \"VIPQueue\", \"MainQueue\")"
                 }
               }
             ],
             "prioritizationRule": {
-              "kind": "static-rule",
+              "kind": "static",
               "value": "1"
             },
             "workerSelectorAttachments": [],

diff --git a/...tion.JobRouter/examples/2023-11-01/ClassificationPolicies_UpdateClassificationPolicy.json b/...tion.JobRouter/examples/2023-11-01/ClassificationPolicies_UpdateClassificationPolicy.json
@@ -19,7 +19,7 @@
           {
             "kind": "conditional",
             "condition": {
-              "kind": "expression-rule",
+              "kind": "expression",
               "language": "powerFx",
               "expression": "1 = 1"
             },
@@ -33,7 +33,7 @@
           }
         ],
         "prioritizationRule": {
-          "kind": "static-rule",
+          "kind": "static",
           "value": "2"
         },
         "workerSelectorAttachments": [],
@@ -49,7 +49,7 @@
           {
             "kind": "conditional",
             "condition": {
-              "kind": "expression-rule",
+              "kind": "expression",
               "language": "powerFx",
               "expression": "1 = 1"
             },
@@ -63,7 +63,7 @@
           }
         ],
         "prioritizationRule": {
-          "kind": "static-rule",
+          "kind": "static",
           "value": "2"
         },
         "workerSelectorAttachments": [],

diff --git a/...nication.JobRouter/examples/2023-11-01/DistributionPolicies_CreateDistributionPolicy.json b/...nication.JobRouter/examples/2023-11-01/DistributionPolicies_CreateDistributionPolicy.json
@@ -7,7 +7,7 @@
     "distributionPolicyId": "d9033d56-659c-437a-b5b7-4f3b14301dd4",
     "resource": {
       "mode": {
-        "kind": "longest-idle",
+        "kind": "longestIdle",
         "minConcurrentOffers": 1,
         "maxConcurrentOffers": 5,
         "bypassSelectors": false
@@ -23,7 +23,7 @@
         "name": "Main",
         "offerExpiresAfterSeconds": 300,
         "mode": {
-          "kind": "longest-idle",
+          "kind": "longestIdle",
           "minConcurrentOffers": 1,
           "maxConcurrentOffers": 5,
           "bypassSelectors": false
@@ -37,7 +37,7 @@
         "name": "Main",
         "offerExpiresAfterSeconds": 300,
         "mode": {
-          "kind": "longest-idle",
+          "kind": "longestIdle",
           "minConcurrentOffers": 1,
           "maxConcurrentOffers": 5,
           "bypassSelectors": false

diff --git a/...mmunication.JobRouter/examples/2023-11-01/DistributionPolicies_GetDistributionPolicy.json b/...mmunication.JobRouter/examples/2023-11-01/DistributionPolicies_GetDistributionPolicy.json
@@ -13,7 +13,7 @@
         "name": "Main",
         "offerExpiresAfterSeconds": 300,
         "mode": {
-          "kind": "longest-idle",
+          "kind": "longestIdle",
           "minConcurrentOffers": 1,
           "maxConcurrentOffers": 5,
           "bypassSelectors": false

diff --git a/...Router/examples/2023-11-01/DistributionPolicies_ListDistributionPoliciesWithPageSize.json b/...Router/examples/2023-11-01/DistributionPolicies_ListDistributionPoliciesWithPageSize.json
@@ -15,7 +15,7 @@
             "name": "Secondary",
             "offerExpiresAfterSeconds": 300,
             "mode": {
-              "kind": "round-robin",
+              "kind": "roundRobin",
               "minConcurrentOffers": 1,
               "maxConcurrentOffers": 2,
               "bypassSelectors": false
@@ -27,7 +27,7 @@
             "name": "Main",
             "offerExpiresAfterSeconds": 300,
             "mode": {
-              "kind": "longest-idle",
+              "kind": "longestIdle",
               "minConcurrentOffers": 1,
               "maxConcurrentOffers": 5,
               "bypassSelectors": false

diff --git a/...nication.JobRouter/examples/2023-11-01/DistributionPolicies_UpdateDistributionPolicy.json b/...nication.JobRouter/examples/2023-11-01/DistributionPolicies_UpdateDistributionPolicy.json
@@ -7,7 +7,7 @@
     "distributionPolicyId": "d9033d56-659c-437a-b5b7-4f3b14301dd4",
     "resource": {
       "mode": {
-        "kind": "longest-idle",
+        "kind": "longestIdle",
         "minConcurrentOffers": 1,
         "maxConcurrentOffers": 5,
         "bypassSelectors": false
@@ -23,7 +23,7 @@
         "name": "Main",
         "offerExpiresAfterSeconds": 300,
         "mode": {
-          "kind": "longest-idle",
+          "kind": "longestIdle",
           "minConcurrentOffers": 1,
           "maxConcurrentOffers": 5,
           "bypassSelectors": false
@@ -37,7 +37,7 @@
         "name": "Main",
         "offerExpiresAfterSeconds": 300,
         "mode": {
-          "kind": "longest-idle",
+          "kind": "longestIdle",
           "minConcurrentOffers": 1,
           "maxConcurrentOffers": 5,
           "bypassSelectors": false

diff --git a/.../Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_CreateExceptionPolicy.json b/.../Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_CreateExceptionPolicy.json
@@ -20,7 +20,7 @@
             }
           ],
           "trigger": {
-            "kind": "wait-time",
+            "kind": "waitTime",
             "thresholdSeconds": 20
           }
         }
@@ -36,7 +36,7 @@
           {
             "id": "MaxWaitTimeExceeded",
             "trigger": {
-              "kind": "wait-time",
+              "kind": "waitTime",
               "thresholdSeconds": 20
             },
             "actions": [
@@ -62,7 +62,7 @@
           {
             "id": "MaxWaitTimeExceeded",
             "trigger": {
-              "kind": "wait-time",
+              "kind": "waitTime",
               "thresholdSeconds": 20
             },
             "actions": [

diff --git a/...ion/Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_GetExceptionPolicy.json b/...ion/Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_GetExceptionPolicy.json
@@ -15,7 +15,7 @@
           {
             "id": "MaxWaitTimeExceeded",
             "trigger": {
-              "kind": "wait-time",
+              "kind": "waitTime",
               "thresholdSeconds": 20
             },
             "actions": [

diff --git a/...on.JobRouter/examples/2023-11-01/ExceptionPolicies_ListExceptionPoliciesWithPageSize.json b/...on.JobRouter/examples/2023-11-01/ExceptionPolicies_ListExceptionPoliciesWithPageSize.json
@@ -17,7 +17,7 @@
               {
                 "id": "MaxWaitTimeExceeded",
                 "trigger": {
-                  "kind": "wait-time",
+                  "kind": "waitTime",
                   "thresholdSeconds": 20
                 },
                 "actions": [
@@ -41,7 +41,7 @@
               {
                 "id": "MaxWaitTimeExceeded",
                 "trigger": {
-                  "kind": "wait-time",
+                  "kind": "waitTime",
                   "thresholdSeconds": 50
                 },
                 "actions": [

diff --git a/.../Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_UpdateExceptionPolicy.json b/.../Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_UpdateExceptionPolicy.json
@@ -20,7 +20,7 @@
             }
           ],
           "trigger": {
-            "kind": "wait-time",
+            "kind": "waitTime",
             "thresholdSeconds": 20
           }
         }
@@ -36,7 +36,7 @@
           {
             "id": "MaxWaitTimeExceeded",
             "trigger": {
-              "kind": "wait-time",
+              "kind": "waitTime",
               "thresholdSeconds": 20
             },
             "actions": [
@@ -62,7 +62,7 @@
           {
             "id": "MaxWaitTimeExceeded",
             "trigger": {
-              "kind": "wait-time",
+              "kind": "waitTime",
               "thresholdSeconds": 20
             },
             "actions": [

diff --git a/specification/communication/Communication.JobRouter/examples/2023-11-01/Jobs_CreateJob.json b/specification/communication/Communication.JobRouter/examples/2023-11-01/Jobs_CreateJob.json
@@ -19,7 +19,7 @@
       ],
       "labels": {},
       "matchingMode": {
-        "kind": "queue-and-match"
+        "kind": "queueAndMatch"
       }
     }
   },
@@ -48,7 +48,7 @@
         "assignments": {},
         "notes": [],
         "matchingMode": {
-          "kind": "queue-and-match"
+          "kind": "queueAndMatch"
         },
         "etag": "etag"
       }
@@ -77,7 +77,7 @@
         "assignments": {},
         "notes": [],
         "matchingMode": {
-          "kind": "queue-and-match"
+          "kind": "queueAndMatch"
         },
         "etag": "etag"
       }