Skip to content

Commit 752c7a5

Browse files
sarkar-rajarshiwilliamzhao87mikeharder
authored
[ACS JobRouter][GA] Change discriminators to enum instead of string for 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]>
1 parent 68dc5ca commit 752c7a5

File tree

39 files changed

+529
-169
lines changed

39 files changed

+529
-169
lines changed

‎specification/communication/Communication.JobRouter/client.tsp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ interface JobRouterAdministrationRestClient {
2222

2323
getDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getDistributionPolicy;
2424

25+
@access(Access.internal, "csharp")
2526
listDistributionPolicies is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listDistributionPolicies;
2627

2728
deleteDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteDistributionPolicy;
@@ -32,6 +33,7 @@ interface JobRouterAdministrationRestClient {
3233

3334
getClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getClassificationPolicy;
3435

36+
@access(Access.internal, "csharp")
3537
listClassificationPolicies is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listClassificationPolicies;
3638

3739
deleteClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteClassificationPolicy;
@@ -42,6 +44,7 @@ interface JobRouterAdministrationRestClient {
4244

4345
getExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getExceptionPolicy;
4446

47+
@access(Access.internal, "csharp")
4548
listExceptionPolicies is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listExceptionPolicies;
4649

4750
deleteExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteExceptionPolicy;
@@ -52,6 +55,7 @@ interface JobRouterAdministrationRestClient {
5255

5356
getQueue is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getQueue;
5457

58+
@access(Access.internal, "csharp")
5559
listQueues is AzureCommunicationRoutingService.JobRouterAdministrationOperations.listQueues;
5660

5761
deleteQueue is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteQueue;
@@ -90,6 +94,7 @@ interface JobRouterRestClient {
9094
@access(Access.internal, "java")
9195
close is AzureCommunicationRoutingService.JobRouterOperations.close;
9296

97+
@access(Access.internal, "csharp")
9398
listJobs is AzureCommunicationRoutingService.JobRouterOperations.listJobs;
9499

95100
#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 {
118123

119124
deleteWorker is AzureCommunicationRoutingService.JobRouterOperations.deleteWorker;
120125

126+
@access(Access.internal, "csharp")
121127
listWorkers is AzureCommunicationRoutingService.JobRouterOperations.listWorkers;
122128
}

‎specification/communication/Communication.JobRouter/examples/2023-11-01/ClassificationPolicies_CreateClassificationPolicy.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"kind": "conditional",
1414
"condition": {
15-
"kind": "expression-rule",
15+
"kind": "expression",
1616
"language": "powerFx",
1717
"expression": "1 = 1"
1818
},
@@ -26,7 +26,7 @@
2626
}
2727
],
2828
"prioritizationRule": {
29-
"kind": "static-rule",
29+
"kind": "static",
3030
"value": "2"
3131
}
3232
}
@@ -41,7 +41,7 @@
4141
{
4242
"kind": "conditional",
4343
"condition": {
44-
"kind": "expression-rule",
44+
"kind": "expression",
4545
"language": "powerFx",
4646
"expression": "1 = 1"
4747
},
@@ -55,7 +55,7 @@
5555
}
5656
],
5757
"prioritizationRule": {
58-
"kind": "static-rule",
58+
"kind": "static",
5959
"value": "2"
6060
},
6161
"workerSelectorAttachments": [],
@@ -71,7 +71,7 @@
7171
{
7272
"kind": "conditional",
7373
"condition": {
74-
"kind": "expression-rule",
74+
"kind": "expression",
7575
"language": "powerFx",
7676
"expression": "1 = 1"
7777
},
@@ -85,7 +85,7 @@
8585
}
8686
],
8787
"prioritizationRule": {
88-
"kind": "static-rule",
88+
"kind": "static",
8989
"value": "2"
9090
},
9191
"workerSelectorAttachments": [],

‎specification/communication/Communication.JobRouter/examples/2023-11-01/ClassificationPolicies_GetClassificationPolicy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{
1717
"kind": "conditional",
1818
"condition": {
19-
"kind": "expression-rule",
19+
"kind": "expression",
2020
"language": "powerFx",
2121
"expression": "1 = 1"
2222
},
@@ -30,12 +30,12 @@
3030
}
3131
],
3232
"prioritizationRule": {
33-
"kind": "static-rule",
33+
"kind": "static",
3434
"value": "2"
3535
},
3636
"workerSelectorAttachments": [
3737
{
38-
"kind": "pass-through",
38+
"kind": "passThrough",
3939
"key": "language",
4040
"labelOperator": "equal"
4141
}

‎specification/communication/Communication.JobRouter/examples/2023-11-01/ClassificationPolicies_ListClassificationPoliciesWithPageSize.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
"fallbackQueueId": "MainQueue",
1717
"queueSelectorAttachments": [
1818
{
19-
"kind": "rule-engine",
19+
"kind": "ruleEngine",
2020
"rule": {
21-
"kind": "expression-rule",
21+
"kind": "expression",
2222
"language": "powerFx",
2323
"expression": "If(job.Escalated = true, \"SecondaryQueue\", \"MainQueue\")"
2424
}
2525
}
2626
],
2727
"prioritizationRule": {
28-
"kind": "static-rule",
28+
"kind": "static",
2929
"value": "2"
3030
},
3131
"workerSelectorAttachments": [],
@@ -37,16 +37,16 @@
3737
"fallbackQueueId": "MainQueue",
3838
"queueSelectorAttachments": [
3939
{
40-
"kind": "rule-engine",
40+
"kind": "ruleEngine",
4141
"rule": {
42-
"kind": "expression-rule",
42+
"kind": "expression",
4343
"language": "powerFx",
4444
"expression": "If(job.VIP = true, \"VIPQueue\", \"MainQueue\")"
4545
}
4646
}
4747
],
4848
"prioritizationRule": {
49-
"kind": "static-rule",
49+
"kind": "static",
5050
"value": "1"
5151
},
5252
"workerSelectorAttachments": [],

‎specification/communication/Communication.JobRouter/examples/2023-11-01/ClassificationPolicies_UpdateClassificationPolicy.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{
2020
"kind": "conditional",
2121
"condition": {
22-
"kind": "expression-rule",
22+
"kind": "expression",
2323
"language": "powerFx",
2424
"expression": "1 = 1"
2525
},
@@ -33,7 +33,7 @@
3333
}
3434
],
3535
"prioritizationRule": {
36-
"kind": "static-rule",
36+
"kind": "static",
3737
"value": "2"
3838
},
3939
"workerSelectorAttachments": [],
@@ -49,7 +49,7 @@
4949
{
5050
"kind": "conditional",
5151
"condition": {
52-
"kind": "expression-rule",
52+
"kind": "expression",
5353
"language": "powerFx",
5454
"expression": "1 = 1"
5555
},
@@ -63,7 +63,7 @@
6363
}
6464
],
6565
"prioritizationRule": {
66-
"kind": "static-rule",
66+
"kind": "static",
6767
"value": "2"
6868
},
6969
"workerSelectorAttachments": [],

‎specification/communication/Communication.JobRouter/examples/2023-11-01/DistributionPolicies_CreateDistributionPolicy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"distributionPolicyId": "d9033d56-659c-437a-b5b7-4f3b14301dd4",
88
"resource": {
99
"mode": {
10-
"kind": "longest-idle",
10+
"kind": "longestIdle",
1111
"minConcurrentOffers": 1,
1212
"maxConcurrentOffers": 5,
1313
"bypassSelectors": false
@@ -23,7 +23,7 @@
2323
"name": "Main",
2424
"offerExpiresAfterSeconds": 300,
2525
"mode": {
26-
"kind": "longest-idle",
26+
"kind": "longestIdle",
2727
"minConcurrentOffers": 1,
2828
"maxConcurrentOffers": 5,
2929
"bypassSelectors": false
@@ -37,7 +37,7 @@
3737
"name": "Main",
3838
"offerExpiresAfterSeconds": 300,
3939
"mode": {
40-
"kind": "longest-idle",
40+
"kind": "longestIdle",
4141
"minConcurrentOffers": 1,
4242
"maxConcurrentOffers": 5,
4343
"bypassSelectors": false

‎specification/communication/Communication.JobRouter/examples/2023-11-01/DistributionPolicies_GetDistributionPolicy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"name": "Main",
1414
"offerExpiresAfterSeconds": 300,
1515
"mode": {
16-
"kind": "longest-idle",
16+
"kind": "longestIdle",
1717
"minConcurrentOffers": 1,
1818
"maxConcurrentOffers": 5,
1919
"bypassSelectors": false

‎specification/communication/Communication.JobRouter/examples/2023-11-01/DistributionPolicies_ListDistributionPoliciesWithPageSize.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"name": "Secondary",
1616
"offerExpiresAfterSeconds": 300,
1717
"mode": {
18-
"kind": "round-robin",
18+
"kind": "roundRobin",
1919
"minConcurrentOffers": 1,
2020
"maxConcurrentOffers": 2,
2121
"bypassSelectors": false
@@ -27,7 +27,7 @@
2727
"name": "Main",
2828
"offerExpiresAfterSeconds": 300,
2929
"mode": {
30-
"kind": "longest-idle",
30+
"kind": "longestIdle",
3131
"minConcurrentOffers": 1,
3232
"maxConcurrentOffers": 5,
3333
"bypassSelectors": false

‎specification/communication/Communication.JobRouter/examples/2023-11-01/DistributionPolicies_UpdateDistributionPolicy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"distributionPolicyId": "d9033d56-659c-437a-b5b7-4f3b14301dd4",
88
"resource": {
99
"mode": {
10-
"kind": "longest-idle",
10+
"kind": "longestIdle",
1111
"minConcurrentOffers": 1,
1212
"maxConcurrentOffers": 5,
1313
"bypassSelectors": false
@@ -23,7 +23,7 @@
2323
"name": "Main",
2424
"offerExpiresAfterSeconds": 300,
2525
"mode": {
26-
"kind": "longest-idle",
26+
"kind": "longestIdle",
2727
"minConcurrentOffers": 1,
2828
"maxConcurrentOffers": 5,
2929
"bypassSelectors": false
@@ -37,7 +37,7 @@
3737
"name": "Main",
3838
"offerExpiresAfterSeconds": 300,
3939
"mode": {
40-
"kind": "longest-idle",
40+
"kind": "longestIdle",
4141
"minConcurrentOffers": 1,
4242
"maxConcurrentOffers": 5,
4343
"bypassSelectors": false

‎specification/communication/Communication.JobRouter/examples/2023-11-01/ExceptionPolicies_CreateExceptionPolicy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
],
2222
"trigger": {
23-
"kind": "wait-time",
23+
"kind": "waitTime",
2424
"thresholdSeconds": 20
2525
}
2626
}
@@ -36,7 +36,7 @@
3636
{
3737
"id": "MaxWaitTimeExceeded",
3838
"trigger": {
39-
"kind": "wait-time",
39+
"kind": "waitTime",
4040
"thresholdSeconds": 20
4141
},
4242
"actions": [
@@ -62,7 +62,7 @@
6262
{
6363
"id": "MaxWaitTimeExceeded",
6464
"trigger": {
65-
"kind": "wait-time",
65+
"kind": "waitTime",
6666
"thresholdSeconds": 20
6767
},
6868
"actions": [

0 commit comments

Comments
 (0)