From ae0dc791a1504d01e68239d8ce3bb6ebaee7e4cf Mon Sep 17 00:00:00 2001 From: Udit Malik Date: Wed, 28 Jul 2021 00:00:00 +0530 Subject: [PATCH 1/5] fixing issues with swagger correctness. --- .../stable/2020-05-01/billing.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) 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 index f21b8f6c8c51..2a20a26959cb 100644 --- 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 @@ -4782,6 +4782,14 @@ "type": "string", "readOnly": true }, + "tags": { + "type": "object", + "description": "Dictionary of metadata associated with the invoice section.", + "additionalProperties": { + "type": "string" + }, + "maxItems": 1000 + }, "targetCloud": { "description": "Identifies the cloud environments that are associated with an invoice section. This is a system managed optional field and gets updated as the invoice section gets associated with accounts in various clouds.", "$ref": "#/definitions/TargetCloud", @@ -5332,6 +5340,12 @@ "$ref": "#/definitions/Product" } }, + "totalCount": { + "description": "Total number of records.", + "type": "number", + "format": "int32", + "readOnly": true + }, "nextLink": { "description": "The link (url) to the next page of results.", "type": "string", @@ -5679,6 +5693,14 @@ "description": "The sku description of the Azure plan for the subscription.", "type": "string", "readOnly": true + }, + "suspensionReasons": { + "description": "The suspension reason for a subscription. Applies only to legacy subscriptions", + "type": "array", + "readOnly": true, + "items": { + "type": "string" + } } } }, From 3dfcee478169ab24b922d7324e087e9501b68698 Mon Sep 17 00:00:00 2001 From: Udit Malik Date: Wed, 28 Jul 2021 00:39:42 +0530 Subject: [PATCH 2/5] adding example changes --- .../stable/2020-05-01/examples/InvoiceSection.json | 6 +++++- .../examples/InvoiceSectionsListByBillingProfile.json | 10 +++++++++- .../examples/ProductsListByBillingAccount.json | 3 ++- .../examples/ProductsListByBillingProfile.json | 3 ++- .../2020-05-01/examples/ProductsListByCustomer.json | 3 ++- .../examples/ProductsListByInvoiceSection.json | 3 ++- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSection.json index 0329f3a9ee64..fa869b1aa7d9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSection.json @@ -18,7 +18,11 @@ "costCategory": "Support" }, "state": "Active", - "systemId": "XX1X-XXAA-XXX-ZZZ" + "systemId": "XX1X-XXAA-XXX-ZZZ", + "tags": { + "pcCode": "A123456", + "costCategory": "Support" + } } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSectionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSectionsListByBillingProfile.json index 14dd48605423..06d0cff7c93c 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSectionsListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/InvoiceSectionsListByBillingProfile.json @@ -19,7 +19,11 @@ "costCategory": "Support" }, "state": "Active", - "systemId": "XX1X-XXAA-XXX-ZZZ" + "systemId": "XX1X-XXAA-XXX-ZZZ", + "tags": { + "pcCode": "A123456", + "costCategory": "Support" + } } }, { @@ -34,6 +38,10 @@ }, "state": "Restricted", "systemId": "YY1X-BBAA-XXX-ZZZ", + "tags": { + "pcCode": "Z223456", + "costCategory": "Marketing" + }, "targetCloud": "USSec" } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingAccount.json index 764393d75c29..26b95b564a27 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingAccount.json @@ -63,7 +63,8 @@ "billingProfileDisplayName": "Contoso operations billing" } } - ] + ], + "totalCount": 2 } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingProfile.json index 67a72146df6b..3c9a073308a3 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByBillingProfile.json @@ -64,7 +64,8 @@ "billingProfileDisplayName": "Contoso operations billing" } } - ] + ], + "totalCount": 2 } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByCustomer.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByCustomer.json index ff18e2fdfe07..58eff538fc7b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByCustomer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByCustomer.json @@ -68,7 +68,8 @@ "billingProfileDisplayName": "Contoso operations billing" } } - ] + ], + "totalCount": 2 } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByInvoiceSection.json index d2a538072eea..eaa006a7f14a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/ProductsListByInvoiceSection.json @@ -64,7 +64,8 @@ "billingProfileDisplayName": "Contoso operations billing" } } - ] + ], + "totalCount": 2 } } } From 92f85a630846a1bc4c14263dc04f25b525292b72 Mon Sep 17 00:00:00 2001 From: Udit Malik Date: Wed, 28 Jul 2021 23:23:54 +0530 Subject: [PATCH 3/5] updated description and max item count for labels and tags. --- .../Microsoft.Billing/stable/2020-05-01/billing.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index 2a20a26959cb..86aa3a1988e9 100644 --- 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 @@ -4762,7 +4762,7 @@ "additionalProperties": { "type": "string" }, - "maxItems": 1000 + "maxItems": 50 }, "state": { "description": "Identifies the state of an invoice section.", @@ -4788,7 +4788,7 @@ "additionalProperties": { "type": "string" }, - "maxItems": 1000 + "maxItems": 50 }, "targetCloud": { "description": "Identifies the cloud environments that are associated with an invoice section. This is a system managed optional field and gets updated as the invoice section gets associated with accounts in various clouds.", @@ -5695,7 +5695,7 @@ "readOnly": true }, "suspensionReasons": { - "description": "The suspension reason for a subscription. Applies only to legacy subscriptions", + "description": "The suspension reason for a subscription. Applies only to subscriptions in Microsoft Online Services Program (MOSP) billing accounts.", "type": "array", "readOnly": true, "items": { From c4cf685ba0713336d937ad54658501dad7b1aa50 Mon Sep 17 00:00:00 2001 From: Udit Malik Date: Thu, 29 Jul 2021 02:12:01 +0530 Subject: [PATCH 4/5] adding validation rules for tags. --- .../Microsoft.Billing/stable/2020-05-01/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 86aa3a1988e9..1ff2227852f1 100644 --- 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 @@ -4784,7 +4784,7 @@ }, "tags": { "type": "object", - "description": "Dictionary of metadata associated with the invoice section.", + "description": "Dictionary of metadata associated with the invoice section. Maximum key/value length supported of 256 characters. Keys/value should not empty value nor null. Keys can not contain < > % & \\ ? /", "additionalProperties": { "type": "string" }, From 5bb3a09cf03616aae9115477969bdfc87478d69f Mon Sep 17 00:00:00 2001 From: Udit Malik Date: Thu, 29 Jul 2021 12:45:58 +0530 Subject: [PATCH 5/5] fixing spell check. --- .../Microsoft.Billing/stable/2020-05-01/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 1ff2227852f1..d26a16a24c4a 100644 --- 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 @@ -5695,7 +5695,7 @@ "readOnly": true }, "suspensionReasons": { - "description": "The suspension reason for a subscription. Applies only to subscriptions in Microsoft Online Services Program (MOSP) billing accounts.", + "description": "The suspension reason for a subscription. Applies only to subscriptions in Microsoft Online Services Program billing accounts.", "type": "array", "readOnly": true, "items": {