Skip to content

Updating version to 2021-06-01 for recoveryservicesbackup #14678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leniatgh merged 21 commits into from
Jul 7, 2021
Merged

Updating version to 2021-06-01 for recoveryservicesbackup #14678

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ad97335
Updating version to 2021-06-01 for msi support for iaasvm
monjain Jun 4, 2021
8f0ef99
adding example files
monjain Jun 16, 2021
d3700cc
resolving comments
monjain Jun 17, 2021
eb7ef6f
fixing validation issue
monjain Jun 17, 2021
7e6434d
undoing package-lock changes
monjain Jun 17, 2021
93a7281
fixing validation errors
monjain Jun 17, 2021
ee8a024
fixing non-identical model issue
monjain Jun 17, 2021
d6d2d6f
fixing lintdiff error
monjain Jun 17, 2021
aadf4ab
fixing lintdiff error
monjain Jun 17, 2021
2076869
append
monjain Jun 17, 2021
68d8e5c
Update readme.md
monjain Jun 22, 2021
44ea4d7
adding suppression
monikajainms Jun 22, 2021
7ad3050
Update readme.md
monikajainms Jun 25, 2021
7ebf060
Update readme.md
monikajainms Jun 25, 2021
0c81aeb
contract update
monikajainms Jun 29, 2021
aa58e2f
renaming managedidentityid
monikajainms Jun 29, 2021
1efea50
fixing prettier check
monikajainms Jun 29, 2021
8aca71a
resolving conflicts
monikajainms Jul 1, 2021
67f5868
reversing the exposure of identity url
monikajainms Jul 6, 2021
7abc499
Update bms.json
monikajainms Jul 6, 2021
f3893d3
Update bms.json
monikajainms Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions ...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,9 @@
},
"servicePrincipalObjectId": {
"type": "string"
},
"identityDetails": {
"$ref": "#/definitions/IdentityDetails"
}
}
},
Expand Down Expand Up @@ -2543,6 +2546,10 @@
"bMSActiveRegion": {
"description": "Active region name of BMS Stamp",
"type": "string"
},
"identityInfo": {
"$ref": "#/definitions/IdentityInfo",
"description": "Managed Identity information to be used for accessing customer storage accounts."
}
},
"discriminator": "objectType"
Expand Down Expand Up @@ -3161,6 +3168,39 @@
},
"x-ms-discriminator-value": "IaasVMRestoreRequest"
},
"IdentityDetails": {
"type": "object",
"properties": {
"isSystemAssignedIdentity": {
"type": "boolean"
},
"managedIdentityArmUrl": {
"type": "string"
}
}
},
"IdentityInfo": {
"description": "Encapsulates Managed Identity related information",
"type": "object",
"properties": {
"objectType": {
"description": "Type of the specific object - used for deserializing",
"type": "string"
},
"isSystemAssignedIdentity": {
"description": "To differentiate if the managed identity is system assigned or user assigned",
"type": "boolean"
},
"managedIdentityArmUrl": {
"description": "Managed identity ARM URL\r\nOptional: Might not be required in the case of system assigned managed identity",
"type": "string"
},
"managedIdentityUrl": {
"description": "Managed Identity URL\r\nOptional: Will be required only in CRR flow, and not in non-CRR flow",
"type": "string"
}
}
},
Copy link
Contributor

@j5lim j5lim Jun 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this only change added in 2021-06-01 as well? Is there an example file show the usage of this? If not, can you please add it?

Copy link
Contributor

@j5lim j5lim Jun 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Next time please follow the ARM API Review Checklist that indicates how to make the very first commit for an efficient review (the second checkbox). Otherwise, it will be very hard to see what changed in the new api-version.

Copy link
Contributor

@jorgecotillo jorgecotillo Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 This is super important otherwise we'll need to review all the changes and will be adding comments to unmodified changes.

"InstantItemRecoveryTarget": {
"description": "Target details for file / folder restore.",
"type": "object",
Expand Down
15 changes: 12 additions & 3 deletions ...Microsoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/GetAccessToken_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
"containerName": "IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall",
"protectedItemName": "VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall",
"recoveryPointId": "26083826328862",
"api-version": "2018-12-20-preview",
"api-version": "2018-12-20",
"parameters": {
"properties": {
"tenantId": "33e01921-4d64-4f8c-a055-5bdaffd5e33d",
"audience": "https://RecoveryServices/IaasCoord/aadmgmt/ase",
"servicePrincipalObjectId": "5ecd8123-cf74-4037-83e9-9246b227b351"
"servicePrincipalObjectId": "5ecd8123-cf74-4037-83e9-9246b227b351",
"identityDetails": {
"isSystemAssignedIdentity": false,
"managedIdentityArmUrl": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/asmaskartestmsi"
}
}
}
},
Expand Down Expand Up @@ -40,7 +44,12 @@
"coordinatorServiceStampUri": "https://sea-bvtd2-coord1-t56tl.ext.trafficmanager.net",
"protectionServiceStampId": "253c2223-fefd-483d-912f-55fb46ce0eab",
"protectionServiceStampUri": "https://sea-bvtd2-prot1-t56tl.ext.trafficmanager.net",
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>1a2311d9-66f5-47d3-a9fb-7a37da63934b;BackUpOperationJobId;e1ebcf24-81a5-434e-b64b-cc81be65ae16</InstantRpGCId><IsBlockBlobEnabled>false</IsBlockBlobEnabled><IsManagedVirtualMachine>false</IsManagedVirtualMachine><OriginalSAOption>true</OriginalSAOption><OsType>Windows</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>CrashConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>NormalStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>"
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>1a2311d9-66f5-47d3-a9fb-7a37da63934b;BackUpOperationJobId;e1ebcf24-81a5-434e-b64b-cc81be65ae16</InstantRpGCId><IsBlockBlobEnabled>false</IsBlockBlobEnabled><IsManagedVirtualMachine>false</IsManagedVirtualMachine><OriginalSAOption>true</OriginalSAOption><OsType>Windows</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>CrashConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>NormalStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>",
"identityInfo": {
"isSystemAssignedIdentity": false,
"managedIdentityArmUrl": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/asmaskartestmsi",
"managedIdentityUrl": "https://control-westus.identity.azure-int.net/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.RecoveryServicesBVTD/vaults/asmaskarTestUmsi25106/credentials/v2/systemassigned?arpid=6ba6cefe-fb2a-4dc2-82e2-d77302c4d6cc"
}
}
}
},
Expand Down
14 changes: 12 additions & 2 deletions ...coveryServices/stable/2018-12-20/examples/AzureIaasVm/TriggerCrossRegionRestore_Post.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@
"resourceId": "1330837906418138160",
"resourceName": "sriniccyvault",
"subscriptionId": "f2edfd5d-5496-4683-b94f-b3588c579009",
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>f2edfd5d-5496-4683-b94f-b3588c579009;AzureBackup_sriniccylinux_1142937031;AzureBackup_20191009_060554;AzureBackupRG_centraluseuap_1</InstantRpGCId><IsBlockBlobEnabled>true</IsBlockBlobEnabled><IsManagedVirtualMachine>true</IsManagedVirtualMachine><OriginalSAOption>false</OriginalSAOption><OsType>Linux</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>FileSystemConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>PremiumVMOnPremiumStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>"
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>f2edfd5d-5496-4683-b94f-b3588c579009;AzureBackup_sriniccylinux_1142937031;AzureBackup_20191009_060554;AzureBackupRG_centraluseuap_1</InstantRpGCId><IsBlockBlobEnabled>true</IsBlockBlobEnabled><IsManagedVirtualMachine>true</IsManagedVirtualMachine><OriginalSAOption>false</OriginalSAOption><OsType>Linux</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>FileSystemConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>PremiumVMOnPremiumStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>",
"identityinfo": {
"isSystemAssignedIdentity": false,
"managedIdentityArmUrl": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/asmaskartestmsi",
"managedIdentityUrl": "https://control-westus.identity.azure-int.net/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.RecoveryServicesBVTD/vaults/asmaskarTestUmsi25106/credentials/v2/systemassigned?arpid=6ba6cefe-fb2a-4dc2-82e2-d77302c4d6cc"
}
},
"restoreRequest": {
"affinityGroup": "",
Expand All @@ -44,7 +49,12 @@
"virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet",
"zones": [
"2"
]
],
"identityInfo": {
"isSystemAssignedIdentity": false,
"managedIdentityArmUrl": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/asmaskartestmsi",
"managedIdentityUrl": "https://control-westus.identity.azure-int.net/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asmaskarRG1/providers/Microsoft.RecoveryServicesBVTD/vaults/asmaskarTestUmsi25106/credentials/v2/systemassigned?arpid=6ba6cefe-fb2a-4dc2-82e2-d77302c4d6cc"
}
}
}
},
Expand Down
Loading