From aee0c7fba4ee3e799061e3c71046bb05f0e68904 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:02:12 -0800
Subject: [PATCH 01/23] UsageV3 S360 Updates

Corrected three items that were flagging for swagger compliance in S360.

Added definitions for 202 responses and added 'error' as a property to definition for 'ErrorResponse'.
---
 .../preview/2015-06-01-preview/commerce.json  | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 9d532d1f748e..779c2ddc73f4 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -88,6 +88,12 @@
               "$ref": "#/definitions/UsageAggregationListResult"
             }
           },
+          "202": {
+            "description": "Response indicating that a request has been accepted for processing. However, the processing has not been completed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -137,6 +143,12 @@
               "$ref": "#/definitions/ResourceRateCardInfo"
             }
           },
+          "202": {
+            "description": "Response indicating that a request has been accepted for processing. However, the processing has not been completed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -470,14 +482,16 @@
       "description": "Describes the format of Error response.",
       "type": "object",
       "properties": {
-        "code": {
-          "description": "Error code",
-          "type": "string"
-        },
-        "message": {
-          "description": "Error message indicating why the operation failed.",
-          "type": "string"
-        }
+        "error": {
+          "code": {
+            "description": "Error code",
+            "type": "string"
+          },
+          "message": {
+            "description": "Error message indicating why the operation failed.",
+            "type": "string"
+          }
+        }        
       }
     }
   },

From ec6e9631da2713484dc7ece691a0d4ae2b73b098 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:36:34 -0800
Subject: [PATCH 02/23] Removed 202 Response for Ratecard

Removed the 202 response for Ratecard

Ratecard is a different service that is not getting flagged for in S360 and does not support 202 response code.
---
 .../preview/2015-06-01-preview/commerce.json                | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 779c2ddc73f4..e286ea6cb1f7 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -143,12 +143,6 @@
               "$ref": "#/definitions/ResourceRateCardInfo"
             }
           },
-          "202": {
-            "description": "Response indicating that a request has been accepted for processing. However, the processing has not been completed.",
-            "schema": {
-              "$ref": "#/definitions/ErrorResponse"
-            }
-          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {

From db07b0877a5f5fc139af37fe4c9e0340657faa3e Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Wed, 15 Feb 2023 14:55:58 -0800
Subject: [PATCH 03/23] Undo ErrorMessage Properties

Swagger will not let ErrorResponse contain an error property with subproperties.

Reverting ErrorResponse to contain "code" and "message" as its properties.
---
 .../preview/2015-06-01-preview/commerce.json     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index e286ea6cb1f7..a9a5e84dc37f 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -476,15 +476,13 @@
       "description": "Describes the format of Error response.",
       "type": "object",
       "properties": {
-        "error": {
-          "code": {
-            "description": "Error code",
-            "type": "string"
-          },
-          "message": {
-            "description": "Error message indicating why the operation failed.",
-            "type": "string"
-          }
+        "code": {
+          "description": "Error code",
+          "type": "string"
+        },
+        "message": {
+          "description": "Error message indicating why the operation failed.",
+          "type": "string"
         }        
       }
     }

From 84ba8cf11590f540b2c10d6ac3b10a3c6e8d6811 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Fri, 17 Feb 2023 08:51:03 -0800
Subject: [PATCH 04/23] Ran Prettier

Ran prettier in order to address Pull Request check.
---
 .../Microsoft.Commerce/preview/2015-06-01-preview/commerce.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index a9a5e84dc37f..f25830f21bbb 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -483,7 +483,7 @@
         "message": {
           "description": "Error message indicating why the operation failed.",
           "type": "string"
-        }        
+        }
       }
     }
   },

From 3100822b380bd7e62171dade6ce234d3e80cf1db Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Fri, 17 Feb 2023 13:52:58 -0800
Subject: [PATCH 05/23] Added xm-ms-long-running-operation Property

Added xm-ms-long-running-operation Property to the UsageAggregates_List get call in order to justify the addition of the 202 response.
---
 .../Microsoft.Commerce/preview/2015-06-01-preview/commerce.json  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index f25830f21bbb..9bc3a0ee4381 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -27,6 +27,7 @@
         "externalDocs": {
           "url": "https://docs.microsoft.com/rest/api/commerce/usageaggregates"
         },
+        "x-ms-long-running-operation":  true,
         "parameters": [
           {
             "name": "reportedStartTime",

From d06261eeead285440118271c94474e5b96b308ab Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:27:31 -0800
Subject: [PATCH 06/23] Added x-ms-long-running-operation-options

Added x-ms-long-running-operation-options.

Adding a 202 response requires that these options be set.
---
 .../preview/2015-06-01-preview/commerce.json                  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 9bc3a0ee4381..c487521dbc45 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -28,6 +28,10 @@
           "url": "https://docs.microsoft.com/rest/api/commerce/usageaggregates"
         },
         "x-ms-long-running-operation":  true,
+        "x-ms-long-running-operation-options" : {
+          "final-state-via" : "location",
+          "final-state-schema": "#/definitions/UsageAggregationListResult"
+      },
         "parameters": [
           {
             "name": "reportedStartTime",

From 965a3255d7c86c2792feaa9b5e8220feabd57327 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:29:23 -0800
Subject: [PATCH 07/23] Prettier Run

Reran prettier after the last commit to correct formatting issues.
---
 .../preview/2015-06-01-preview/commerce.json              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index c487521dbc45..d3cc6aa137f0 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -27,11 +27,11 @@
         "externalDocs": {
           "url": "https://docs.microsoft.com/rest/api/commerce/usageaggregates"
         },
-        "x-ms-long-running-operation":  true,
-        "x-ms-long-running-operation-options" : {
-          "final-state-via" : "location",
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location",
           "final-state-schema": "#/definitions/UsageAggregationListResult"
-      },
+        },
         "parameters": [
           {
             "name": "reportedStartTime",

From fe55db36f0e60fae6eb540f5e8caa2b56faa61ec Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:39:18 -0800
Subject: [PATCH 08/23] Added x-ms-example for GetUsageAggregates_List

Added x-ms-example for GetUsageAggregates_List. PR check was flagging because there was no example present. Will create the referenced json file in the next commit.
---
 .../preview/2015-06-01-preview/commerce.json                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index d3cc6aa137f0..586f82e6f0a9 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -27,6 +27,11 @@
         "externalDocs": {
           "url": "https://docs.microsoft.com/rest/api/commerce/usageaggregates"
         },
+        "x-ms-examples": {
+          "GetUsageAggregates_List": {
+            "$ref": "./examples/GetUsageAggregates_List.json"
+          }
+        },
         "x-ms-long-running-operation": true,
         "x-ms-long-running-operation-options": {
           "final-state-via": "location",

From 8adaf21ba22f680ab10d002ac033e6ae4f9b7973 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 09:19:53 -0800
Subject: [PATCH 09/23] Added example file for UsageAggregates List

There was previously no example for UsageAggregates List, but there was one for RateCard.

The following documentation was used to generate this example file.
https://learn.microsoft.com/en-us/previous-versions/azure/reference/mt219001(v=azure.100)?redirectedfrom=MSDN#sample-responses
---
 .../examples/GetUsageAggregatesList.json      | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
new file mode 100644
index 000000000000..fb9dacce762e
--- /dev/null
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -0,0 +1,38 @@
+{
+  "title": "Get UsageAggregatesList",
+  "parameters": {
+    "subscriptionId": "f68815e6-3c41-45ef-bbd8-5f83303c396b",
+    "api-version": "2015-06-01-preview",
+    "reportedStartTime": "2014-05-01T00:00:00+00:00",
+    "reportedEndTime": "2015-06-01T00:00:00+00:00",
+    "aggregationGranularity": "daily",
+    "showDetails": "true"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          "id": "/subscriptions/f68815e6-3c41-45ef-bbd8-5f83303c396b/providers/Microsoft.Commerce/UsageAggregates/Daily_BRSDT_20140501_0000",
+          "name": "Daily_BRSDT_20140501_0000",
+          "type": "Microsoft.Commerce/UsageAggregate",
+          "properties": {
+              "subscriptionId": "f68815e6-3c41-45ef-bbd8-5f83303c396b",
+              "usageStartTime": "2015-03-03T00:00:00+00:00",
+              "usageEndTime": "2015-03-04T00:00:00+00:00",
+              "meterName": "Standard IO – Page Blob/Disk (GB)",
+              "meterCategory": "Storage",
+              "meterSubCategory": "Geo Redundant",
+              "unit": "GB",
+              "meterId": "0e9d0c9b-ab6d-4312-9c7e-3794e22af9c4",
+              "infoFields": {
+                  "meteredRegion": "West US",
+                  "meteredService": "Storage",
+                  "project": "devtestvhdsd37a7bb567f9"
+              },
+              "quantity": 0.057865
+          }
+        ]
+      }
+    }
+  }
+}

From 6d3a7ac192389724ddbaa28017e61c2e051fda68 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 09:32:48 -0800
Subject: [PATCH 10/23] Corrected Formatting for UsageAggregatesList Example

Value Array was missing brackets for its element.
---
 .../examples/GetUsageAggregatesList.json         | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
index fb9dacce762e..cbcc027506ba 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -12,10 +12,11 @@
     "200": {
       "body": {
         "value": [
-          "id": "/subscriptions/f68815e6-3c41-45ef-bbd8-5f83303c396b/providers/Microsoft.Commerce/UsageAggregates/Daily_BRSDT_20140501_0000",
-          "name": "Daily_BRSDT_20140501_0000",
-          "type": "Microsoft.Commerce/UsageAggregate",
-          "properties": {
+          {
+            "id": "/subscriptions/f68815e6-3c41-45ef-bbd8-5f83303c396b/providers/Microsoft.Commerce/UsageAggregates/Daily_BRSDT_20140501_0000",
+            "name": "Daily_BRSDT_20140501_0000",
+            "type": "Microsoft.Commerce/UsageAggregate",
+            "properties": {
               "subscriptionId": "f68815e6-3c41-45ef-bbd8-5f83303c396b",
               "usageStartTime": "2015-03-03T00:00:00+00:00",
               "usageEndTime": "2015-03-04T00:00:00+00:00",
@@ -25,11 +26,12 @@
               "unit": "GB",
               "meterId": "0e9d0c9b-ab6d-4312-9c7e-3794e22af9c4",
               "infoFields": {
-                  "meteredRegion": "West US",
-                  "meteredService": "Storage",
-                  "project": "devtestvhdsd37a7bb567f9"
+                "meteredRegion": "West US",
+                "meteredService": "Storage",
+                "project": "devtestvhdsd37a7bb567f9"
               },
               "quantity": 0.057865
+            }
           }
         ]
       }

From e2c79ac8c18c9246c69e306374139a7c8d363929 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 09:38:27 -0800
Subject: [PATCH 11/23] Corrected Example File Name

Corrected the file name to exclude an underscore.
---
 .../preview/2015-06-01-preview/commerce.json                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 586f82e6f0a9..8dc0ec9890ec 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -28,8 +28,8 @@
           "url": "https://docs.microsoft.com/rest/api/commerce/usageaggregates"
         },
         "x-ms-examples": {
-          "GetUsageAggregates_List": {
-            "$ref": "./examples/GetUsageAggregates_List.json"
+          "GetUsageAggregatesList": {
+            "$ref": "./examples/GetUsageAggregatesList.json"
           }
         },
         "x-ms-long-running-operation": true,

From 9d55593ebd06093ef2a0fba0048887dfb14aa4ff Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:43:49 -0800
Subject: [PATCH 12/23] Added Location Header to 202 Response

Added location header to the 202 response.
---
 .../preview/2015-06-01-preview/commerce.json                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 8dc0ec9890ec..523922a6f856 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -100,6 +100,11 @@
           },
           "202": {
             "description": "Response indicating that a request has been accepted for processing. However, the processing has not been completed.",
+            "headers": {
+              "Location": {
+                type: 'string',
+              }
+            },
             "schema": {
               "$ref": "#/definitions/ErrorResponse"
             }

From 370ac6a5bf885939ccce9f56bf9203fd835240ea Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:45:55 -0800
Subject: [PATCH 13/23] Corrected Location to use double quotes

Corrected formatting issue with the previous commit that added a location header to the 202 response.
---
 .../Microsoft.Commerce/preview/2015-06-01-preview/commerce.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 523922a6f856..672ab1d49820 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -102,7 +102,7 @@
             "description": "Response indicating that a request has been accepted for processing. However, the processing has not been completed.",
             "headers": {
               "Location": {
-                type: 'string',
+                "type": "string"
               }
             },
             "schema": {

From 32c5ae1bcc0c8fe048a87ca563ca9f5cd8562210 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 13:10:28 -0800
Subject: [PATCH 14/23] Updated Example Fields

Updated infofields to match the example given in the api documentation.
---
 .../preview/2015-06-01-preview/commerce.json              | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 672ab1d49820..a30e9acba41a 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -172,6 +172,14 @@
   "definitions": {
     "InfoField": {
       "properties": {
+        "meteredRegion": {
+          "type": "string",
+          "description": "Identifies the name of region."
+        },
+        "meteredService": {
+          "type": "string",
+          "description": "Identifies the name of the service."
+        },
         "project": {
           "type": "string",
           "description": "Identifies the name of the instance provisioned by the user."

From e3be7351109fb3ac905eaf5278a1327e55f9de12 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Tue, 21 Feb 2023 13:10:56 -0800
Subject: [PATCH 15/23] Added 202 Response

Added a 202 response to the example file.
---
 .../examples/GetUsageAggregatesList.json               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
index cbcc027506ba..4da8db3c0252 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -5,7 +5,7 @@
     "api-version": "2015-06-01-preview",
     "reportedStartTime": "2014-05-01T00:00:00+00:00",
     "reportedEndTime": "2015-06-01T00:00:00+00:00",
-    "aggregationGranularity": "daily",
+    "aggregationGranularity": "Daily",
     "showDetails": "true"
   },
   "responses": {
@@ -35,6 +35,14 @@
           }
         ]
       }
+    },
+    "202": {
+      "body": {
+        "error": {
+          "code": "aaaaaaaaaaaaaaaaaaaaaa",
+          "message": "aaaaaaaaaaaaaaaaaaaaaa"
+        }      
+      }
     }
   }
 }

From 443f9df20bd4156a39ee9dafcc7c836fcc953106 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Thu, 23 Feb 2023 16:38:22 -0800
Subject: [PATCH 16/23] GetUsageAggregatesList.json Prettier Update

Reran Prettier script on GetUsageAggregatesList.json
---
 .../examples/GetUsageAggregatesList.json               | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
index 4da8db3c0252..cbcc027506ba 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -5,7 +5,7 @@
     "api-version": "2015-06-01-preview",
     "reportedStartTime": "2014-05-01T00:00:00+00:00",
     "reportedEndTime": "2015-06-01T00:00:00+00:00",
-    "aggregationGranularity": "Daily",
+    "aggregationGranularity": "daily",
     "showDetails": "true"
   },
   "responses": {
@@ -35,14 +35,6 @@
           }
         ]
       }
-    },
-    "202": {
-      "body": {
-        "error": {
-          "code": "aaaaaaaaaaaaaaaaaaaaaa",
-          "message": "aaaaaaaaaaaaaaaaaaaaaa"
-        }      
-      }
     }
   }
 }

From ebbcd6ff7a1d65aa46b1e31b1ccfa68949e09eff Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:10:43 -0800
Subject: [PATCH 17/23] Updated case 'Daily' and Example 202 Response

Updated case 'Daily' and Example 202 Response. These changes were made previously, but lost at some point.
---
 .../examples/GetUsageAggregatesList.json               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
index cbcc027506ba..5d1c62aadbf3 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -5,7 +5,7 @@
     "api-version": "2015-06-01-preview",
     "reportedStartTime": "2014-05-01T00:00:00+00:00",
     "reportedEndTime": "2015-06-01T00:00:00+00:00",
-    "aggregationGranularity": "daily",
+    "aggregationGranularity": "Daily",
     "showDetails": "true"
   },
   "responses": {
@@ -35,6 +35,14 @@
           }
         ]
       }
+    },
+    "202": {
+      "body": {
+        "error": {
+          "code": "aaaaaaaaaaaaaaaaaaaaaa",
+          "message": "aaaaaaaaaaaaaaaaaaaa"
+        }
+      }
     }
   }
 }

From 2252fc62eb69d8c196b53f7daa0a14785c405b03 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:31:38 -0800
Subject: [PATCH 18/23] Removed Error from 202 Body

Error property not allowed in the response.
---
 .../2015-06-01-preview/examples/GetUsageAggregatesList.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
index 5d1c62aadbf3..e1a4af4ea7cb 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -38,10 +38,8 @@
     },
     "202": {
       "body": {
-        "error": {
-          "code": "aaaaaaaaaaaaaaaaaaaaaa",
-          "message": "aaaaaaaaaaaaaaaaaaaa"
-        }
+        "code": "aaaaaaaaaaaaaaaaaaaaaa",
+        "message": "aaaaaaaaaaaaaaaaaaaa"
       }
     }
   }

From 09e843658e7f50f3917fb2d64c41b213f3a7e3e6 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Mon, 27 Feb 2023 10:56:42 -0800
Subject: [PATCH 19/23] Removed InfoFields properties.

Removed all subproperties for InfoFields. Our api no longer returns any properties for InfoFields.
---
 .../2015-06-01-preview/examples/GetUsageAggregatesList.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
index e1a4af4ea7cb..b00db8f32156 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/examples/GetUsageAggregatesList.json
@@ -25,11 +25,7 @@
               "meterSubCategory": "Geo Redundant",
               "unit": "GB",
               "meterId": "0e9d0c9b-ab6d-4312-9c7e-3794e22af9c4",
-              "infoFields": {
-                "meteredRegion": "West US",
-                "meteredService": "Storage",
-                "project": "devtestvhdsd37a7bb567f9"
-              },
+              "infoFields": {},
               "quantity": 0.057865
             }
           }

From 00f2b164df32f6db5355b0750d56e718d8b8eb5a Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Mon, 27 Feb 2023 10:59:35 -0800
Subject: [PATCH 20/23] Removed Infofields properties.

Removed Infofields properties. Our api no longer returns any of these properties in a 200 response.
---
 .../preview/2015-06-01-preview/commerce.json      | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index a30e9acba41a..4aa8cfc4c1f9 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -171,20 +171,7 @@
   },
   "definitions": {
     "InfoField": {
-      "properties": {
-        "meteredRegion": {
-          "type": "string",
-          "description": "Identifies the name of region."
-        },
-        "meteredService": {
-          "type": "string",
-          "description": "Identifies the name of the service."
-        },
-        "project": {
-          "type": "string",
-          "description": "Identifies the name of the instance provisioned by the user."
-        }
-      },
+      "properties": {},
       "description": "Key-value pairs of instance details in the legacy format."
     },
     "UsageSample": {

From 95bf03e972fb51757a490a10ca21d6c8fc7b577b Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Mon, 27 Feb 2023 11:03:10 -0800
Subject: [PATCH 21/23] Removed InfoFields Properties

Removed Property from InfoFields. This should have been removed along with the other properties in the previous commit.
---
 .../Microsoft.Commerce/preview/2015-06-01-preview/commerce.json  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index 4aa8cfc4c1f9..b95c71a87afd 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -171,7 +171,6 @@
   },
   "definitions": {
     "InfoField": {
-      "properties": {},
       "description": "Key-value pairs of instance details in the legacy format."
     },
     "UsageSample": {

From 01250ea308eeeddffd1317d248f78621035bdcae Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Thu, 2 Mar 2023 07:41:41 -0800
Subject: [PATCH 22/23] Removed LongRunning operation

Removed longrunning operation from UsageAggregates_List.
---
 .../preview/2015-06-01-preview/commerce.json                 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index b95c71a87afd..dadd55e11c4a 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -32,11 +32,6 @@
             "$ref": "./examples/GetUsageAggregatesList.json"
           }
         },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "location",
-          "final-state-schema": "#/definitions/UsageAggregationListResult"
-        },
         "parameters": [
           {
             "name": "reportedStartTime",

From c80b871abefc9725d7cccc14a0b2f56161629906 Mon Sep 17 00:00:00 2001
From: Joe Beach <125317918+JoeBeach-msft@users.noreply.github.com>
Date: Thu, 2 Mar 2023 10:02:16 -0800
Subject: [PATCH 23/23] Removed Location Header

Location header no longer needed.
---
 .../preview/2015-06-01-preview/commerce.json                 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
index dadd55e11c4a..026faaeb4bfd 100644
--- a/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
+++ b/specification/commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json
@@ -95,11 +95,6 @@
           },
           "202": {
             "description": "Response indicating that a request has been accepted for processing. However, the processing has not been completed.",
-            "headers": {
-              "Location": {
-                "type": "string"
-              }
-            },
             "schema": {
               "$ref": "#/definitions/ErrorResponse"
             }