Skip to content

Commit 8dad463

Browse files
anusapananusapan
committed
Merge branch 'master' of https://github.com/Azure/azure-powershell into fix-breaking-changes
2 parents 19358fb + d34f16b commit 8dad463

File tree

187 files changed

+68739
-87047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+68739
-87047
lines changed

‎.azure-pipelines/powershell-core.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variables:
22
WindowsName: windows
33
WindowsImage: VS2017-Win2016
44
LinuxName: linux
5-
LinuxImage: Ubuntu-16.04
5+
LinuxImage: Ubuntu-18.04
66
MacOSName: macOS
77
MacOSImage: macOS-10.13
88
TestFramework: netcoreapp2.1
@@ -18,6 +18,9 @@ jobs:
1818
windows:
1919
OSName: ${{ variables.WindowsName }}
2020
ImageName: ${{ variables.WindowsImage }}
21+
linux:
22+
OSName: ${{ variables.LinuxName }}
23+
ImageName: ${{ variables.LinuxImage }}
2124
macOS:
2225
OSName: ${{ variables.MacOSName }}
2326
ImageName: ${{ variables.MacOSImage }}
@@ -40,6 +43,9 @@ jobs:
4043
windows:
4144
OSName: ${{ variables.WindowsName }}
4245
ImageName: ${{ variables.WindowsImage }}
46+
linux:
47+
OSName: ${{ variables.LinuxName }}
48+
ImageName: ${{ variables.LinuxImage }}
4349
macOS:
4450
OSName: ${{ variables.MacOSName }}
4551
ImageName: ${{ variables.MacOSImage }}
@@ -62,6 +68,9 @@ jobs:
6268
windows:
6369
OSName: ${{ variables.WindowsName }}
6470
ImageName: ${{ variables.WindowsImage }}
71+
linux:
72+
OSName: ${{ variables.LinuxName }}
73+
ImageName: ${{ variables.LinuxImage }}
6574
macOS:
6675
OSName: ${{ variables.MacOSName }}
6776
ImageName: ${{ variables.MacOSImage }}
@@ -74,4 +83,4 @@ jobs:
7483
osName: $(OSName)
7584
testFramework: ${{ variables.TestFramework }}
7685
testTarget: ${{ variables.TestTarget }}
77-
configuration: ${{ variables.Configuration }}
86+
configuration: ${{ variables.Configuration }}

‎.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: AzureRM module bug report
33
about: Report errors or unexpected behaviors for the AzureRM module
44
title: ''
5-
labels: ''
5+
labels: triage
66
assignees: ''
77

88
---

‎src/Accounts/Authentication.Test/Properties/Resources.resx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,21 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="InvalidProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\resources\invalidprofile.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
122+
<value>..\Resources\InvalidProfile.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123123
</data>
124124
<data name="ValidProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\resources\validprofile.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
125+
<value>..\Resources\ValidProfile.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127127
<data name="ValidProfile2" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\resources\validprofile2.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
128+
<value>..\Resources\ValidProfile2.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130130
<data name="ValidProfile3" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>..\resources\validprofile3.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
131+
<value>..\Resources\ValidProfile3.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133133
<data name="ValidProfileChina" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>..\resources\validprofilechina.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
134+
<value>..\Resources\ValidProfileChina.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135135
</data>
136136
<data name="ValidProfileChinaOld" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>..\resources\validprofilechinaold.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137+
<value>..\Resources\ValidProfileChinaOld.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
138138
</data>
139139
</root>

‎src/Blueprint/Blueprint/Az.Blueprint.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.2.5'
15+
ModuleVersion = '0.2.7'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'

‎src/Blueprint/Blueprint/ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
-->
2020
## Upcoming Release
2121

22+
## Version 0.2.7
23+
* Bug Fix: Use user assigned identity defined in the assignment file instead of cmdlet parameter during blueprint assignment (Set- cmdlet).
24+
* Update module version information in the .psd1 file
25+
26+
## Version 0.2.6
27+
* Bug Fix: Use user assigned identity defined in the assignment file instead of cmdlet parameter during blueprint assignment.
28+
2229
## Version 0.2.5
2330
* Add functionality to make sure Blueprint RP is registered before any service calls
2431

‎src/Blueprint/Blueprint/Cmdlets/BlueprintAssignment/SetAzureRMBlueprintAssignment.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class SetAzureRMBlueprintAssignment : BlueprintAssignmentCmdletBase
4040
[ValidateNotNullOrEmpty]
4141
public string Name { get; set; }
4242

43-
[Parameter(ParameterSetName = ParameterSetNames.UpdateBlueprintAssignmentByFile, Mandatory = true, HelpMessage = ParameterHelpMessages.BlueprintObject)]
43+
[Parameter(ParameterSetName = ParameterSetNames.UpdateBlueprintAssignmentByFile, Mandatory = false, HelpMessage = ParameterHelpMessages.BlueprintObject)]
4444
[Parameter(ParameterSetName = ParameterSetNames.UpdateBlueprintAssignment, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.BlueprintObject)]
4545
[ValidateNotNull]
4646
public PSBlueprintBase Blueprint { get; set; }
@@ -153,8 +153,15 @@ public override void ExecuteCmdlet()
153153
// Register Blueprint RP
154154
RegisterBlueprintRp(subscription);
155155

156-
if (!this.IsParameterBound(c => c.UserAssignedIdentity))
156+
if (!IsUserAssignedIdentity(assignmentObject.Identity))
157157
{
158+
// If user assigned identity is defined as the identity in the assignment
159+
// we consider the user assigned MSI, otherwise system assigned MSI.
160+
//
161+
// Assign owner permission to Blueprint SPN only if assignment is being done using
162+
// System assigned identity.
163+
// This is a no-op for user assigned identity.
164+
158165
var spnObjectId = GetBlueprintSpn(scope, Name);
159166
AssignOwnerPermission(subscription, spnObjectId);
160167
}

‎src/KeyVault/KeyVault/help/Get-AzKeyVaultCertificate.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,33 @@ Certificate : [Subject]
9494
[Thumbprint]
9595
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
9696
97+
KeyId : https://contoso.vault.azure.net:443/keys/TestCert01/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
98+
SecretId : https://contoso.vault.azure.net:443/secrets/TestCert01/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
9799
Thumbprint : XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
98100
Tags :
99101
Enabled : True
100102
Created : 2/8/2016 11:21:45 PM
101103
Updated : 2/8/2016 11:21:45 PM
102104
```
103105

104-
This command gets the certificate named TestCert01 from the key vault named ContosoKV01.
106+
### Example 2: Get cert and save it as pfx
107+
This command gets the certificate named TestCert01 from the key vault named ContosoKV01. To download the certificate as pfx file, run following command. These commands access SecretId and then save the content as a pfx file.
105108

106-
### Example 2: Get all the certificates that have been deleted but not purged for this key vault.
109+
```powershell
110+
$cert = Get-AzKeyVaultCertificate -VaultName "ContosoKV01" -Name "TestCert01"
111+
$secret = Get-AzKeyVaultSecret -VaultName $vaultName -Name $cert.SecretId
112+
113+
$secretByte = [Convert]::FromBase64String($secret.SecretValueText)
114+
$x509Cert = new-object System.Security.Cryptography.X509Certificates.X509Certificate2
115+
$x509Cert.Import($secretByte, "", "Exportable,PersistKeySet")
116+
$type = [System.Security.Cryptography.X509Certificates.X509ContentType]::Pfx
117+
$pfxFileByte = $x509Cert.Export($type, $password)
118+
119+
# Write to a file
120+
[System.IO.File]::WriteAllBytes("KeyValt.pfx", $pfxFileByte)
121+
```
122+
123+
### Example 3: Get all the certificates that have been deleted but not purged for this key vault.
107124
```powershell
108125
PS C:\> Get-AzKeyVaultCertificate -VaultName 'contoso' -InRemovedState
109126
@@ -135,7 +152,7 @@ Id : https://contoso.vault.azure.net:443/certificates/test2
135152

136153
This command gets all the certificates that have been previously deleted, but not purged, in the key vault named Contoso.
137154

138-
### Example 3: Gets the certificate MyCert that has been deleted but not purged for this key vault.
155+
### Example 4: Gets the certificate MyCert that has been deleted but not purged for this key vault.
139156
```powershell
140157
PS C:\> Get-AzKeyVaultCertificate -VaultName 'contoso' -Name 'test1' -InRemovedState
141158
@@ -178,7 +195,7 @@ Id : https://contoso.vault.azure.net:443/certificates/test1/7fe4
178195
This command gets the certificate named 'MyCert' that has been previously deleted, but not purged, in the key vault named Contoso.
179196
This command will return metadata such as the deletion date, and the scheduled purging date of this deleted certificate.
180197

181-
### Example 4: List certificates using filtering
198+
### Example 5: List certificates using filtering
182199
```powershell
183200
PS C:\> Get-AzKeyVaultCertificate -VaultName "ContosoKV01" -Name "test*"
184201

‎src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="1.2.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.2-preview" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/V2A/AsrV2ATests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void V2AAddPI()
119119
"\"");
120120
}
121121

122-
[Fact]
122+
[Fact(Skip = "Need to ReRecord")]
123123
[Trait(Category.AcceptanceType, Category.CheckIn)]
124124
public void V2ACreateRPI()
125125
{

0 commit comments

Comments
 (0)