From 5b9d40f6324dddef60cb69c3dc50833921cbec61 Mon Sep 17 00:00:00 2001 From: iwrinshow <36922102+iwrinshow@users.noreply.github.com> Date: Wed, 19 Apr 2023 10:48:10 +0530 Subject: [PATCH 1/3] Fixing live validation correctness error for BackupProtectableItems_List --- .../Microsoft.RecoveryServices/stable/2023-01-01/bms.json | 6 +++--- .../Microsoft.RecoveryServices/stable/2023-02-01/bms.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 index e843bd9d4f1c..300c4dac1649 100644 --- 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 @@ -10096,15 +10096,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/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2023-02-01/bms.json index 001062355111..37b6a5179d68 100644 --- 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 @@ -10166,15 +10166,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.", From d83ce3979945b88e27def11a811871c9e2d80531 Mon Sep 17 00:00:00 2001 From: Shashwat Trivedi Date: Wed, 19 Apr 2023 13:20:08 +0530 Subject: [PATCH 2/3] Fixing bms.json for PrivateEndpointConnection addition of groupIds --- .../stable/2023-02-01/bms.json | 19 ++++++++++++++++++- .../GetPrivateEndpointConnection.json | 5 ++++- .../PutPrivateEndpointConnection.json | 15 ++++++++++++--- 3 files changed, 34 insertions(+), 5 deletions(-) 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 index 001062355111..4e24748de743 100644 --- 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" } 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 index f5cccbf12183..95bace857909 100644 --- 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 index 68072a80cc48..ccbda157f9f2 100644 --- 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" + ] } } } From c1258226313af170d89f34cd7b3be6ed3da25b20 Mon Sep 17 00:00:00 2001 From: Shashwat Trivedi Date: Wed, 19 Apr 2023 16:36:23 +0530 Subject: [PATCH 3/3] Making changes in the version 2023-01-01 --- .../stable/2023-01-01/bms.json | 19 ++++++++++++++++++- .../GetPrivateEndpointConnection.json | 5 ++++- .../PutPrivateEndpointConnection.json | 15 ++++++++++++--- 3 files changed, 34 insertions(+), 5 deletions(-) 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 index e843bd9d4f1c..24244182e98f 100644 --- 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" } 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 index 5b2f44b6d18a..9496a9b27a37 100644 --- 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 index 62deb9ba6657..59900eb0791c 100644 --- 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" + ] } } }