Fixing live validation correctness error for BackupProtectableItems_List (#23600)

iwrinshow · Shashwat Trivedi · suxi-ms · commit b012ea20e9de · 2023-04-24T21:10:09.000+08:00
* Fixing live validation correctness error for BackupProtectableItems_List

* Fixing bms.json for PrivateEndpointConnection addition of groupIds

* Making changes in the version 2023-01-01

---------

Co-authored-by: Shashwat Trivedi &lt;shtriv@microsoft.com&gt;
diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-01-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-01-01/bms.json
@@ -4717,6 +4717,23 @@
           "$ref": "#/definitions/PrivateEndpoint",
           "description": "Gets or sets private endpoint associated with the private endpoint connection"
         },
+        "groupIds": {
+          "description": "Group Ids for the Private Endpoint",
+          "type": "array",
+          "items": {
+            "description": "GroupId for the PrivateEndpointConnection - AzureBackup, AzureBackup_secondary or AzureSiteRecovery",
+            "enum": [
+              "AzureBackup",
+              "AzureBackup_secondary",
+              "AzureSiteRecovery"
+            ],
+            "type": "string",
+            "x-ms-enum": {
+              "name": "VaultSubResourceType",
+              "modelAsString": true
+            }
+          }
+        },
         "privateLinkServiceConnectionState": {
           "$ref": "#/definitions/PrivateLinkServiceConnectionState",
           "description": "Gets or sets private link service connection state"
@@ -4759,7 +4776,7 @@
           "description": "Gets or sets description",
           "type": "string"
         },
-        "actionRequired": {
+        "actionsRequired": {
           "description": "Gets or sets actions required",
           "type": "string"
         }
@@ -10096,15 +10113,15 @@
       ],
       "x-ms-discriminator-value": "SAPHanaDBInstance"
     },
-    "AzureVmWorkloadSAPHanaHSR": {
-      "description": "Azure VM workload-specific protectable item representing SAP HANA Dbinstance.",
+    "AzureVmWorkloadSAPHanaHSRProtectableItem": {
+      "description": "Azure VM workload-specific protectable item representing HANA HSR.",
       "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/AzureVmWorkloadProtectableItem"
         }
       ],
-      "x-ms-discriminator-value": "SAPHanaHSR"
+      "x-ms-discriminator-value": "HanaHSRContainer"
     },
     "AzureVmWorkloadSAPHanaSystemWorkloadItem": {
       "description": "Azure VM workload-specific workload item representing SAP HANA System.",
diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-01-01/examples/PrivateEndpointConnection/GetPrivateEndpointConnection.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-01-01/examples/PrivateEndpointConnection/GetPrivateEndpointConnection.json
@@ -20,7 +20,10 @@
           "privateLinkServiceConnectionState": {
             "status": "Approved",
             "description": "Approved by johndoe@company.com"
-          }
+          },
+          "groupIds": [
+            "AzureBackup_secondary"
+          ]
         }
       }
     }
diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-01-01/examples/PrivateEndpointConnection/PutPrivateEndpointConnection.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-01-01/examples/PrivateEndpointConnection/PutPrivateEndpointConnection.json
@@ -14,7 +14,10 @@
         "privateLinkServiceConnectionState": {
           "status": "Approved",
           "description": "Approved by johndoe@company.com"
-        }
+        },
+        "groupIds": [
+          "AzureBackup_secondary"
+        ]
       }
     }
   },
@@ -32,7 +35,10 @@
           "privateLinkServiceConnectionState": {
             "status": "Approved",
             "description": "Approved by johndoe@company.com"
-          }
+          },
+          "groupIds": [
+            "AzureBackup_secondary"
+          ]
         }
       },
       "headers": {
@@ -53,7 +59,10 @@
           "privateLinkServiceConnectionState": {
             "status": "Approved",
             "description": "Approved by johndoe@company.com"
-          }
+          },
+          "groupIds": [
+            "AzureBackup_secondary"
+          ]
         }
       }
     }
diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/bms.json
@@ -4717,6 +4717,23 @@
           "$ref": "#/definitions/PrivateEndpoint",
           "description": "Gets or sets private endpoint associated with the private endpoint connection"
         },
+        "groupIds": {
+          "description": "Group Ids for the Private Endpoint",
+          "type": "array",
+          "items": {
+            "description": "GroupId for the PrivateEndpointConnection - AzureBackup, AzureBackup_secondary or AzureSiteRecovery",
+            "enum": [
+              "AzureBackup",
+              "AzureBackup_secondary",
+              "AzureSiteRecovery"
+            ],
+            "type": "string",
+            "x-ms-enum": {
+              "name": "VaultSubResourceType",
+              "modelAsString": true
+            }
+          }
+        },
         "privateLinkServiceConnectionState": {
           "$ref": "#/definitions/PrivateLinkServiceConnectionState",
           "description": "Gets or sets private link service connection state"
@@ -4759,7 +4776,7 @@
           "description": "Gets or sets description",
           "type": "string"
         },
-        "actionRequired": {
+        "actionsRequired": {
           "description": "Gets or sets actions required",
           "type": "string"
         }
@@ -10166,15 +10183,15 @@
       ],
       "x-ms-discriminator-value": "SAPHanaDBInstance"
     },
-    "AzureVmWorkloadSAPHanaHSR": {
-      "description": "Azure VM workload-specific protectable item representing SAP HANA Dbinstance.",
+    "AzureVmWorkloadSAPHanaHSRProtectableItem": {
+      "description": "Azure VM workload-specific protectable item representing HANA HSR.",
       "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/AzureVmWorkloadProtectableItem"
         }
       ],
-      "x-ms-discriminator-value": "SAPHanaHSR"
+      "x-ms-discriminator-value": "HanaHSRContainer"
     },
     "AzureVmWorkloadSAPHanaSystemWorkloadItem": {
       "description": "Azure VM workload-specific workload item representing SAP HANA System.",
diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/examples/PrivateEndpointConnection/GetPrivateEndpointConnection.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/examples/PrivateEndpointConnection/GetPrivateEndpointConnection.json
@@ -20,7 +20,10 @@
           "privateLinkServiceConnectionState": {
             "status": "Approved",
             "description": "Approved by johndoe@company.com"
-          }
+          },
+          "groupIds": [
+            "AzureBackup_secondary"
+          ]
         }
       }
     }
diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/examples/PrivateEndpointConnection/PutPrivateEndpointConnection.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/examples/PrivateEndpointConnection/PutPrivateEndpointConnection.json
@@ -14,7 +14,10 @@
         "privateLinkServiceConnectionState": {
           "status": "Approved",
           "description": "Approved by johndoe@company.com"
-        }
+        },
+        "groupIds": [
+          "AzureBackup_secondary"
+        ]
       }
     }
   },
@@ -32,7 +35,10 @@
           "privateLinkServiceConnectionState": {
             "status": "Approved",
             "description": "Approved by johndoe@company.com"
-          }
+          },
+          "groupIds": [
+            "AzureBackup_secondary"
+          ]
         }
       },
       "headers": {
@@ -53,7 +59,10 @@
           "privateLinkServiceConnectionState": {
             "status": "Approved",
             "description": "Approved by johndoe@company.com"
-          }
+          },
+          "groupIds": [
+            "AzureBackup_secondary"
+          ]
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@`
`20`	`20`	`"privateLinkServiceConnectionState": {`
`21`	`21`	`"status": "Approved",`
`22`	`22`	`"description": "Approved by [email protected]"`
`23`		`- }`
	`23`	`+ },`
	`24`	`+ "groupIds": [`
	`25`	`+ "AzureBackup_secondary"`
	`26`	`+ ]`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,10 @@`
`14`	`14`	`"privateLinkServiceConnectionState": {`
`15`	`15`	`"status": "Approved",`
`16`	`16`	`"description": "Approved by [email protected]"`
`17`		`- }`
	`17`	`+ },`
	`18`	`+ "groupIds": [`
	`19`	`+ "AzureBackup_secondary"`
	`20`	`+ ]`
`18`	`21`	`}`
`19`	`22`	`}`
`20`	`23`	`},`
`@@ -32,7 +35,10 @@`
`32`	`35`	`"privateLinkServiceConnectionState": {`
`33`	`36`	`"status": "Approved",`
`34`	`37`	`"description": "Approved by [email protected]"`
`35`		`- }`
	`38`	`+ },`
	`39`	`+ "groupIds": [`
	`40`	`+ "AzureBackup_secondary"`
	`41`	`+ ]`
`36`	`42`	`}`
`37`	`43`	`},`
`38`	`44`	`"headers": {`
`@@ -53,7 +59,10 @@`
`53`	`59`	`"privateLinkServiceConnectionState": {`
`54`	`60`	`"status": "Approved",`
`55`	`61`	`"description": "Approved by [email protected]"`
`56`		`- }`
	`62`	`+ },`
	`63`	`+ "groupIds": [`
	`64`	`+ "AzureBackup_secondary"`
	`65`	`+ ]`
`57`	`66`	`}`
`58`	`67`	`}`
`59`	`68`	`}`