Skip to content

Commit 9814af2

Browse files
markcowlmarkcowl
authored
Merge pull request #2458 from MabOneSdk/release-hotfix
[RS Backup] RBAC Fix
2 parents 3f141e4 + 63994b7 commit 9814af2

File tree

19 files changed

+292
-216
lines changed

19 files changed

+292
-216
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<Reference Include="Microsoft.Azure.Common">
4141
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
45+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4646
</Reference>
4747
<Reference Include="System" />
4848
<Reference Include="System.Core" />

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public static List<RecoveryPointBase> GetPSAzureRecoveryPoints(ServiceClientMode
6060
WorkloadType = item.WorkloadType,
6161
RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
6262
SourceVMStorageType = recPoint.SourceVMStorageType,
63+
SourceResourceId = item.SourceResourceId,
6364
};
6465
result.Add(rpBase);
6566
}
@@ -98,6 +99,7 @@ public static RecoveryPointBase GetPSAzureRecoveryPoints(ServiceClientModel.Reco
9899
Id = rpResponse.RecPoint.Id,
99100
WorkloadType = item.WorkloadType,
100101
RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
102+
SourceResourceId = item.SourceResourceId,
101103
};
102104
return result;
103105
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.0-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.1-preview" targetFramework="net45" />
66
</packages>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureVmRecoveryPoint.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public class AzureVmRecoveryPoint : RecoveryPointBase
3535
/// </summary>
3636
public string SourceVMStorageType { get; set; }
3737

38+
/// <summary>
39+
/// ARM ID of the VM represented by the recovery point
40+
/// </summary>
41+
public string SourceResourceId { get; set; }
42+
3843
public AzureVmRecoveryPoint()
3944
{
4045

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ public class ItemBase : ItemContext
178178
/// </summary>
179179
public DateTime? LatestRecoveryPoint { get; set; }
180180

181+
/// <summary>
182+
/// ARM ID of the resource represented by the item
183+
/// </summary>
184+
public string SourceResourceId { get; set; }
185+
181186
public ItemBase(ServiceClientModel.ProtectedItemResource protectedItemResource,
182187
string containerName, ContainerType containerType)
183188
: base((ServiceClientModel.ProtectedItem)protectedItemResource.Properties, containerName, containerType)
@@ -186,6 +191,7 @@ public ItemBase(ServiceClientModel.ProtectedItemResource protectedItemResource,
186191
Name = protectedItemResource.Name;
187192
Id = protectedItemResource.Id;
188193
LatestRecoveryPoint = protectedItem.LastRecoveryPoint;
194+
SourceResourceId = protectedItem.SourceResourceId;
189195
}
190196
}
191197

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<Prefer32Bit>false</Prefer32Bit>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
37+
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
39+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.0-preview" targetFramework="net45" />
3+
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.1-preview" targetFramework="net45" />
44
</packages>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<SpecificVersion>False</SpecificVersion>
4545
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
49+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
5050
</Reference>
5151
<Reference Include="System" />
5252
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)