Skip to content

Commit c50923f

Browse files
bradenwatkinsBraden Watkins
bradenwatkins
and
Braden Watkins
authored
Added move validation enum values & fix S360 linting issues (#12275)
* Added new move product validation error codes * Added integer formats to fix S360 swagger lint validation * Fixed ModelValidation errors for v2018-11-01-preview Co-authored-by: Braden Watkins <[email protected]>
1 parent 788507c commit c50923f

File tree

9 files changed

+76
-27
lines changed

9 files changed

+76
-27
lines changed

‎specification/billing/resource-manager/Microsoft.Billing/preview/2017-02-27-preview/billing.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
"in": "query",
8484
"required": false,
8585
"type": "integer",
86+
"format": "int32",
8687
"minimum": 1,
8788
"maximum": 100
8889
},

‎specification/billing/resource-manager/Microsoft.Billing/preview/2017-04-24-preview/billing.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"in": "query",
7777
"required": false,
7878
"type": "integer",
79+
"format": "int32",
7980
"minimum": 1,
8081
"maximum": 100
8182
}
@@ -194,6 +195,7 @@
194195
"in": "query",
195196
"required": false,
196197
"type": "integer",
198+
"format": "int32",
197199
"minimum": 1,
198200
"maximum": 100
199201
}

‎specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
"in": "query",
135135
"required": false,
136136
"type": "integer",
137+
"format": "int32",
137138
"minimum": 1,
138139
"maximum": 100
139140
}
@@ -252,6 +253,7 @@
252253
"in": "query",
253254
"required": false,
254255
"type": "integer",
256+
"format": "int32",
255257
"minimum": 1,
256258
"maximum": 100
257259
}

‎specification/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billingV2.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
"in": "query",
135135
"required": false,
136136
"type": "integer",
137+
"format": "int32",
137138
"minimum": 1,
138139
"maximum": 100
139140
}

‎specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,8 @@
421421
},
422422
"Retry-After": {
423423
"description": "Recommends the retryable time after receiving this.",
424-
"type": "integer"
424+
"type": "integer",
425+
"format": "int32"
425426
},
426427
"Azure-AsyncOperation": {
427428
"description": "URI to poll for the operation status",
@@ -736,7 +737,8 @@
736737
},
737738
"Retry-After": {
738739
"description": "Recommends the retryable time after receiving this.",
739-
"type": "integer"
740+
"type": "integer",
741+
"format": "int32"
740742
},
741743
"Azure-AsyncOperation": {
742744
"description": "URI to poll for the operation status",
@@ -1713,7 +1715,8 @@
17131715
},
17141716
"Retry-After": {
17151717
"description": "Recommends the retryable time after receiving this.",
1716-
"type": "integer"
1718+
"type": "integer",
1719+
"format": "int32"
17171720
},
17181721
"Azure-AsyncOperation": {
17191722
"description": "URI to poll for the operation status",
@@ -1975,7 +1978,8 @@
19751978
},
19761979
"Retry-After": {
19771980
"description": "Recommends the retryable time after receiving this.",
1978-
"type": "integer"
1981+
"type": "integer",
1982+
"format": "int32"
19791983
},
19801984
"Azure-AsyncOperation": {
19811985
"description": "URI to poll for the operation status",
@@ -3938,7 +3942,8 @@
39383942
},
39393943
"Retry-After": {
39403944
"description": "Recommends the retryable time after receiving this.",
3941-
"type": "integer"
3945+
"type": "integer",
3946+
"format": "int32"
39423947
},
39433948
"Azure-AsyncOperation": {
39443949
"description": "URI to poll for the operation status",
@@ -4953,6 +4958,7 @@
49534958
"invoiceDay": {
49544959
"description": "Invoice day.",
49554960
"type": "integer",
4961+
"format": "int32",
49564962
"readOnly": true
49574963
},
49584964
"currency": {
@@ -5869,6 +5875,7 @@
58695875
"quantity": {
58705876
"description": "Purchase quantity.",
58715877
"type": "integer",
5878+
"format": "int32",
58725879
"readOnly": true
58735880
},
58745881
"customerId": {

‎specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"transferName": "transferName",
55
"body": {
66
"properties": {
7-
"value": [
7+
"productDetails": [
88
{
99
"productType": "AzureSubscription",
1010
"productId": "subscriptionId"

‎specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"invoiceSectionName": "invoiceSectionName",
66
"body": {
77
"properties": {
8-
"billingProfileName": "billingProfileName",
8+
"billingProfileId": "billingProfileId",
99
"recipientEmailId": "[email protected]"
1010
}
1111
}

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,8 @@
687687
},
688688
"Retry-After": {
689689
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
690-
"type": "integer"
690+
"type": "integer",
691+
"format": "int32"
691692
}
692693
}
693694
},
@@ -947,7 +948,8 @@
947948
},
948949
"Retry-After": {
949950
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
950-
"type": "integer"
951+
"type": "integer",
952+
"format": "int32"
951953
}
952954
}
953955
},
@@ -2479,7 +2481,8 @@
24792481
},
24802482
"Retry-After": {
24812483
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
2482-
"type": "integer"
2484+
"type": "integer",
2485+
"format": "int32"
24832486
}
24842487
}
24852488
},
@@ -2746,7 +2749,8 @@
27462749
},
27472750
"Retry-After": {
27482751
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
2749-
"type": "integer"
2752+
"type": "integer",
2753+
"format": "int32"
27502754
}
27512755
}
27522756
},
@@ -6214,14 +6218,26 @@
62146218
"type": "string",
62156219
"description": "Error code of the transfer validation response.",
62166220
"enum": [
6221+
"BillingAccountInactive",
6222+
"CrossBillingAccountNotAllowed",
6223+
"DestinationBillingProfileInactive",
6224+
"DestinationBillingProfileNotFound",
6225+
"DestinationBillingProfilePastDue",
6226+
"DestinationInvoiceSectionInactive",
6227+
"DestinationInvoiceSectionNotFound",
6228+
"InsufficientPermissionOnDestination",
6229+
"InsufficientPermissionOnSource",
6230+
"InvalidDestination",
62176231
"InvalidSource",
6232+
"MarketplaceNotEnabledOnDestination",
6233+
"NotAvailableForDestinationMarket",
6234+
"ProductInactive",
6235+
"ProductNotFound",
6236+
"ProductTypeNotSupported",
6237+
"SourceBillingProfilePastDue",
6238+
"SourceInvoiceSectionInactive",
62186239
"SubscriptionNotActive",
6219-
"InsufficientPermissionOnSource",
6220-
"InsufficientPermissionOnDestination",
6221-
"DestinationBillingProfilePastDue",
6222-
"SubscriptionTypeNotSupported",
6223-
"CrossBillingAccountNotAllowed",
6224-
"NotAvailableForDestinationMarket"
6240+
"SubscriptionTypeNotSupported"
62256241
],
62266242
"x-ms-enum": {
62276243
"name": "subscriptionTransferValidationErrorCode",
@@ -6866,6 +6882,7 @@
68666882
"invoiceDay": {
68676883
"description": "The day of the month when the invoice for the billing profile is generated.",
68686884
"type": "integer",
6885+
"format": "int32",
68696886
"readOnly": true
68706887
},
68716888
"currency": {
@@ -8057,6 +8074,7 @@
80578074
"quantity": {
80588075
"description": "The quantity purchased in the transaction.",
80598076
"type": "integer",
8077+
"format": "int32",
80608078
"readOnly": true
80618079
},
80628080
"invoiceSectionId": {

‎specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/billing.json‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,8 @@
588588
},
589589
"Retry-After": {
590590
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
591-
"type": "integer"
591+
"type": "integer",
592+
"format": "int32"
592593
}
593594
}
594595
},
@@ -800,7 +801,8 @@
800801
},
801802
"Retry-After": {
802803
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
803-
"type": "integer"
804+
"type": "integer",
805+
"format": "int32"
804806
}
805807
}
806808
},
@@ -1905,7 +1907,8 @@
19051907
},
19061908
"Retry-After": {
19071909
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
1908-
"type": "integer"
1910+
"type": "integer",
1911+
"format": "int32"
19091912
}
19101913
}
19111914
},
@@ -2264,7 +2267,8 @@
22642267
},
22652268
"Retry-After": {
22662269
"description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
2267-
"type": "integer"
2270+
"type": "integer",
2271+
"format": "int32"
22682272
}
22692273
}
22702274
},
@@ -3719,14 +3723,26 @@
37193723
"type": "string",
37203724
"description": "Error code of the transfer validation response.",
37213725
"enum": [
3726+
"BillingAccountInactive",
3727+
"CrossBillingAccountNotAllowed",
3728+
"DestinationBillingProfileInactive",
3729+
"DestinationBillingProfileNotFound",
3730+
"DestinationBillingProfilePastDue",
3731+
"DestinationInvoiceSectionInactive",
3732+
"DestinationInvoiceSectionNotFound",
3733+
"InsufficientPermissionOnDestination",
3734+
"InsufficientPermissionOnSource",
3735+
"InvalidDestination",
37223736
"InvalidSource",
3737+
"MarketplaceNotEnabledOnDestination",
3738+
"NotAvailableForDestinationMarket",
3739+
"ProductInactive",
3740+
"ProductNotFound",
3741+
"ProductTypeNotSupported",
3742+
"SourceBillingProfilePastDue",
3743+
"SourceInvoiceSectionInactive",
37233744
"SubscriptionNotActive",
3724-
"InsufficientPermissionOnSource",
3725-
"InsufficientPermissionOnDestination",
3726-
"DestinationBillingProfilePastDue",
3727-
"SubscriptionTypeNotSupported",
3728-
"CrossBillingAccountNotAllowed",
3729-
"NotAvailableForDestinationMarket"
3745+
"SubscriptionTypeNotSupported"
37303746
],
37313747
"x-ms-enum": {
37323748
"name": "subscriptionTransferValidationErrorCode",
@@ -4346,6 +4362,7 @@
43464362
"invoiceDay": {
43474363
"description": "The day of the month when the invoice for the billing profile is generated.",
43484364
"type": "integer",
4365+
"format": "int32",
43494366
"readOnly": true
43504367
},
43514368
"currency": {
@@ -5641,6 +5658,7 @@
56415658
"quantity": {
56425659
"description": "The quantity purchased in the transaction.",
56435660
"type": "integer",
5661+
"format": "int32",
56445662
"readOnly": true
56455663
},
56465664
"invoiceSectionId": {

0 commit comments

Comments
 (0)