Fix s360 error in Reservation Recommendations (#16767)

pednekarpraj · web-flow · commit 0d041777c9a6 · 2021-11-23T09:55:25.000+08:00
* Fix s360 error

* Fix errors

* Fix errors
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json
@@ -3391,6 +3391,8 @@
     },
     "LegacyReservationRecommendationProperties": {
       "description": "The properties of the reservation recommendation.",
+      "type": "object",
+      "discriminator": "scope",
       "properties": {
         "lookBackPeriod": {
           "description": "The number of days of usage to look back for recommendation.",
@@ -3465,8 +3467,7 @@
         },
         "scope": {
           "description": "Shared or single recommendation.",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         },
         "skuProperties": {
           "description": "List of sku properties",
@@ -3476,7 +3477,38 @@
           },
           "readOnly": true
         }
-      }
+      },
+      "required": [
+        "scope"
+      ]
+    },
+    "LegacySingleScopeReservationRecommendationProperties": {
+      "description": "The properties of the legacy reservation recommendation for single scope.",
+      "type": "object",
+      "x-ms-discriminator-value": "Single",
+      "properties": {
+        "subscriptionId": {
+          "description": "Subscription id associated with single scoped recommendation.",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/LegacyReservationRecommendationProperties"
+        }
+      ]
+    },
+    "LegacySharedScopeReservationRecommendationProperties": {
+      "description": "The properties of the legacy reservation recommendation for shared scope.",
+      "type": "object",
+      "x-ms-discriminator-value": "Shared",
+      "allOf": [
+        {
+          "$ref": "#/definitions/LegacyReservationRecommendationProperties"
+        }
+      ]
     },
     "SkuProperty": {
       "description": "The Sku property",
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByResourceGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByResourceGroup.json
@@ -23,7 +23,8 @@
               "totalCostWithReservedInstances": 0.0,
               "netSavings": 4.634521202630137,
               "firstUsageDate": "2018-03-06T00:00:00Z",
-              "scope": "Single"
+              "scope": "Single",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000"
             }
           },
           {
@@ -42,7 +43,8 @@
               "totalCostWithReservedInstances": 0.0,
               "netSavings": 7.2893157231780812,
               "firstUsageDate": "2018-03-06T00:00:00Z",
-              "scope": "Single"
+              "scope": "Single",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000"
             }
           }
         ],
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsBySubscription.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsBySubscription.json
@@ -23,7 +23,8 @@
               "totalCostWithReservedInstances": 0.0,
               "netSavings": 4.634521202630137,
               "firstUsageDate": "2018-03-06T00:00:00Z",
-              "scope": "Single"
+              "scope": "Single",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000"
             }
           },
           {
@@ -42,7 +43,8 @@
               "totalCostWithReservedInstances": 0.0,
               "netSavings": 7.2893157231780812,
               "firstUsageDate": "2018-03-06T00:00:00Z",
-              "scope": "Single"
+              "scope": "Single",
+              "subscriptionId": "00000000-0000-0000-0000-000000000000"
             }
           }
         ],
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json
@@ -34,7 +34,8 @@
                   "name": "Ram",
                   "value": "1"
                 }
-              ]
+              ],
+              "subscriptionId": "00000000-0000-0000-0000-000000000000"
             }
           },
           {
@@ -63,7 +64,8 @@
                   "name": "CPU",
                   "value": "1"
                 }
-              ]
+              ],
+              "subscriptionId": "00000000-0000-0000-0000-000000000000"
             }
           }
         ],

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`"totalCostWithReservedInstances": 0.0,`
`24`	`24`	`"netSavings": 4.634521202630137,`
`25`	`25`	`"firstUsageDate": "2018-03-06T00:00:00Z",`
`26`		`- "scope": "Single"`
	`26`	`+ "scope": "Single",`
	`27`	`+ "subscriptionId": "00000000-0000-0000-0000-000000000000"`
`27`	`28`	`}`
`28`	`29`	`},`
`29`	`30`	`{`
`@@ -42,7 +43,8 @@`
`42`	`43`	`"totalCostWithReservedInstances": 0.0,`
`43`	`44`	`"netSavings": 7.2893157231780812,`
`44`	`45`	`"firstUsageDate": "2018-03-06T00:00:00Z",`
`45`		`- "scope": "Single"`
	`46`	`+ "scope": "Single",`
	`47`	`+ "subscriptionId": "00000000-0000-0000-0000-000000000000"`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`	`],`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@`
`34`	`34`	`"name": "Ram",`
`35`	`35`	`"value": "1"`
`36`	`36`	`}`
`37`		`- ]`
	`37`	`+ ],`
	`38`	`+ "subscriptionId": "00000000-0000-0000-0000-000000000000"`
`38`	`39`	`}`
`39`	`40`	`},`
`40`	`41`	`{`
`@@ -63,7 +64,8 @@`
`63`	`64`	`"name": "CPU",`
`64`	`65`	`"value": "1"`
`65`	`66`	`}`
`66`		`- ]`
	`67`	`+ ],`
	`68`	`+ "subscriptionId": "00000000-0000-0000-0000-000000000000"`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`],`