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 <brwatkin@microsoft.com>
Azure · Jan 12, 2021 · c50923f · c50923f
1 parent 788507c
commit c50923f
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 27 deletions.
diff --git a/...cation/billing/resource-manager/Microsoft.Billing/preview/2017-02-27-preview/billing.json b/...cation/billing/resource-manager/Microsoft.Billing/preview/2017-02-27-preview/billing.json
@@ -83,6 +83,7 @@
             "in": "query",
             "required": false,
             "type": "integer",
+            "format": "int32",
             "minimum": 1,
             "maximum": 100
           },

diff --git a/...cation/billing/resource-manager/Microsoft.Billing/preview/2017-04-24-preview/billing.json b/...cation/billing/resource-manager/Microsoft.Billing/preview/2017-04-24-preview/billing.json
@@ -76,6 +76,7 @@
             "in": "query",
             "required": false,
             "type": "integer",
+            "format": "int32",
             "minimum": 1,
             "maximum": 100
           }
@@ -194,6 +195,7 @@
             "in": "query",
             "required": false,
             "type": "integer",
+            "format": "int32",
             "minimum": 1,
             "maximum": 100
           }

diff --git a/...cation/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json b/...cation/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billing.json
@@ -134,6 +134,7 @@
             "in": "query",
             "required": false,
             "type": "integer",
+            "format": "int32",
             "minimum": 1,
             "maximum": 100
           }
@@ -252,6 +253,7 @@
             "in": "query",
             "required": false,
             "type": "integer",
+            "format": "int32",
             "minimum": 1,
             "maximum": 100
           }

diff --git a/...tion/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billingV2.json b/...tion/billing/resource-manager/Microsoft.Billing/preview/2018-03-01-preview/billingV2.json
@@ -134,6 +134,7 @@
             "in": "query",
             "required": false,
             "type": "integer",
+            "format": "int32",
             "minimum": 1,
             "maximum": 100
           }

diff --git a/...cation/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/...cation/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json
@@ -421,7 +421,8 @@
               },
               "Retry-After": {
                 "description": "Recommends the retryable time after receiving this.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               },
               "Azure-AsyncOperation": {
                 "description": "URI to poll for the operation status",
@@ -736,7 +737,8 @@
               },
               "Retry-After": {
                 "description": "Recommends the retryable time after receiving this.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               },
               "Azure-AsyncOperation": {
                 "description": "URI to poll for the operation status",
@@ -1713,7 +1715,8 @@
               },
               "Retry-After": {
                 "description": "Recommends the retryable time after receiving this.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               },
               "Azure-AsyncOperation": {
                 "description": "URI to poll for the operation status",
@@ -1975,7 +1978,8 @@
               },
               "Retry-After": {
                 "description": "Recommends the retryable time after receiving this.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               },
               "Azure-AsyncOperation": {
                 "description": "URI to poll for the operation status",
@@ -3938,7 +3942,8 @@
               },
               "Retry-After": {
                 "description": "Recommends the retryable time after receiving this.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               },
               "Azure-AsyncOperation": {
                 "description": "URI to poll for the operation status",
@@ -4953,6 +4958,7 @@
         "invoiceDay": {
           "description": "Invoice day.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "currency": {
@@ -5869,6 +5875,7 @@
         "quantity": {
           "description": "Purchase quantity.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "customerId": {

diff --git a/...esource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json b/...esource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json
@@ -4,7 +4,7 @@
     "transferName": "transferName",
     "body": {
       "properties": {
-        "value": [
+        "productDetails": [
           {
             "productType": "AzureSubscription",
             "productId": "subscriptionId"

diff --git a/...ource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json b/...ource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json
@@ -5,7 +5,7 @@
     "invoiceSectionName": "invoiceSectionName",
     "body": {
       "properties": {
-        "billingProfileName": "billingProfileName",
+        "billingProfileId": "billingProfileId",
         "recipientEmailId": "user@contoso.com"
       }
     }

diff --git a/...cation/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json b/...cation/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json
@@ -687,7 +687,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -947,7 +948,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -2479,7 +2481,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -2746,7 +2749,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -6214,14 +6218,26 @@
       "type": "string",
       "description": "Error code of the transfer validation response.",
       "enum": [
+        "BillingAccountInactive",
+        "CrossBillingAccountNotAllowed",
+        "DestinationBillingProfileInactive",
+        "DestinationBillingProfileNotFound",
+        "DestinationBillingProfilePastDue",
+        "DestinationInvoiceSectionInactive",
+        "DestinationInvoiceSectionNotFound",
+        "InsufficientPermissionOnDestination",
+        "InsufficientPermissionOnSource",
+        "InvalidDestination",
         "InvalidSource",
+        "MarketplaceNotEnabledOnDestination",
+        "NotAvailableForDestinationMarket",
+        "ProductInactive",
+        "ProductNotFound",
+        "ProductTypeNotSupported",
+        "SourceBillingProfilePastDue",
+        "SourceInvoiceSectionInactive",
         "SubscriptionNotActive",
-        "InsufficientPermissionOnSource",
-        "InsufficientPermissionOnDestination",
-        "DestinationBillingProfilePastDue",
-        "SubscriptionTypeNotSupported",
-        "CrossBillingAccountNotAllowed",
-        "NotAvailableForDestinationMarket"
+        "SubscriptionTypeNotSupported"
       ],
       "x-ms-enum": {
         "name": "subscriptionTransferValidationErrorCode",
@@ -6866,6 +6882,7 @@
         "invoiceDay": {
           "description": "The day of the month when the invoice for the billing profile is generated.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "currency": {
@@ -8057,6 +8074,7 @@
         "quantity": {
           "description": "The quantity purchased in the transaction.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "invoiceSectionId": {

diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/billing.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/billing.json
@@ -588,7 +588,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -800,7 +801,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -1905,7 +1907,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -2264,7 +2267,8 @@
               },
               "Retry-After": {
                 "description": "Recommended time to wait before making another request to check the status of the operation. The time is specified in seconds.",
-                "type": "integer"
+                "type": "integer",
+                "format": "int32"
               }
             }
           },
@@ -3719,14 +3723,26 @@
       "type": "string",
       "description": "Error code of the transfer validation response.",
       "enum": [
+        "BillingAccountInactive",
+        "CrossBillingAccountNotAllowed",
+        "DestinationBillingProfileInactive",
+        "DestinationBillingProfileNotFound",
+        "DestinationBillingProfilePastDue",
+        "DestinationInvoiceSectionInactive",
+        "DestinationInvoiceSectionNotFound",
+        "InsufficientPermissionOnDestination",
+        "InsufficientPermissionOnSource",
+        "InvalidDestination",
         "InvalidSource",
+        "MarketplaceNotEnabledOnDestination",
+        "NotAvailableForDestinationMarket",
+        "ProductInactive",
+        "ProductNotFound",
+        "ProductTypeNotSupported",
+        "SourceBillingProfilePastDue",
+        "SourceInvoiceSectionInactive",
         "SubscriptionNotActive",
-        "InsufficientPermissionOnSource",
-        "InsufficientPermissionOnDestination",
-        "DestinationBillingProfilePastDue",
-        "SubscriptionTypeNotSupported",
-        "CrossBillingAccountNotAllowed",
-        "NotAvailableForDestinationMarket"
+        "SubscriptionTypeNotSupported"
       ],
       "x-ms-enum": {
         "name": "subscriptionTransferValidationErrorCode",
@@ -4346,6 +4362,7 @@
         "invoiceDay": {
           "description": "The day of the month when the invoice for the billing profile is generated.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "currency": {
@@ -5641,6 +5658,7 @@
         "quantity": {
           "description": "The quantity purchased in the transaction.",
           "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "invoiceSectionId": {