Skip to content

Commit a842c08

Browse files
author
Hovsep Mkrtchyan
committed
Merge branch 'dev' of github.com:Azure/azure-powershell into TestOutputFix
# Conflicts: # src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs
2 parents b08fece + 83d1b10 commit a842c08

25 files changed

+107
-258
lines changed

‎ChangeLog.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
##2016.05.03 version 1.4.0
1+
##2016.05.04 version 1.4.0
2+
* Azure Resource Manager
3+
- Get-AzureRmLocation cmdley: New cmdlet Lists all public Azure locatiosn with available provider namespaces
4+
- Get-AzureRMResourceGroupDeploymentOperations: Improved output format
5+
- Get-AzureRMDeployment: Responses contain all error details
6+
- Added cmdlet help anbd examples
7+
- Normalized cmdlet parameter defaults and position
28
* Azure Storage
3-
* Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
49
* Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
510
- New-AzureRmStorageAccount
611
- Set-AzureRmStorageAccount
@@ -14,6 +19,32 @@
1419
- New-AzureStorageShareSASToken
1520
- New-AzureStorageShareStoredAccessPolicy
1621
- Set-AzureStorageShareStoredAccessPolicy
22+
* Azure Compute
23+
* Added cmdlets for Contaner Service support
24+
* Bug and help fixes
25+
* Azure Profile
26+
* Added support for German national cloud (AzureGermanCloud)
27+
* Azure APIManagement
28+
* Added Tenant Git Configuration cmdlets
29+
- Get-AzureRmApiManagementTenantGitAccess
30+
- Set-AzureRmApiManagementTenantGitAccess
31+
- Get-AzureRmApiManagementTenantSyncState
32+
- Publish-AzureRmApiManagementTenantGitConfiguration
33+
- Save-AzureRmApiManagementTenantGitConfiguration
34+
* Added ApiManagement Properties cmdlets
35+
- Get-AzureRmApiManagementProperty
36+
- New-AzureRmApiManagementProperty
37+
- Remove-AzureRmApiManagementProperty
38+
- Set-AzureRmApiManagementProperty
39+
* Added Logger cmdlets
40+
- Get-AzureRmApiManagementLogger
41+
- Remove-AzureRmApiManagementLogger
42+
- Set-AzureRmApiManagementLogger
43+
- New-AzureRmApiManagementLogger
44+
* Fixed cmdlet bugs
45+
- NewAzureRMApiManagementAPI: changed Path to optional
46+
- NewAzureRMApiManagementProduct: fixed issue with creating products without Subscriptions
47+
* Azure Recovery Services Backup
1748
* Added Recovery Services Backup cmdlets
1849
- Set-AzureRmRecoveryServicesVaultContext
1950
- Set-AzureRmRecoveryServicesBackupProperties

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,6 @@
595595
<Component Id="cmpC7297788AE102ED861765ADE84F7A59B" Guid="*">
596596
<File Id="filEA714AAE425D2451466447C9AFFE825E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRmProfileStartup.ps1" />
597597
</Component>
598-
<Component Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" Guid="*">
599-
<File Id="fil6EA712045B160BE36B4A3D2068D50F9F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\CheckVersions.ps1" />
600-
</Component>
601598
<Component Id="cmpCC409403AF670A9E0538AC743C61BD66" Guid="*">
602599
<File Id="fil68CB35902CE5A11BE50C9DE228B61D12" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Hyak.Common.dll" />
603600
</Component>
@@ -1572,9 +1569,6 @@
15721569
<Component Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" Guid="*">
15731570
<File Id="fil6D69005A7EDC2EEA35252F1E602D935C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRmProfileStartup.ps1" />
15741571
</Component>
1575-
<Component Id="cmp065EDC002BB63B6AA573F18152B7240F" Guid="*">
1576-
<File Id="fil559CC58FC4CFCF2A101739440A55FBC7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\CheckVersions.ps1" />
1577-
</Component>
15781572
<Component Id="cmp02E49F28BB0FA3174A478847B857A4D0" Guid="*">
15791573
<File Id="fil379E46A4E79152D00FBBBF3BF85A0BA2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Hyak.Common.dll" />
15801574
</Component>
@@ -1860,9 +1854,6 @@
18601854
<Component Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" Guid="*">
18611855
<File Id="filAF2791E9DF9A44B6D0F375786A415C61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRmProfileStartup.ps1" />
18621856
</Component>
1863-
<Component Id="cmp9002DD73D47754F2109499247914700F" Guid="*">
1864-
<File Id="filA918B8D44812C6306881A86655EAA785" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\CheckVersions.ps1" />
1865-
</Component>
18661857
<Component Id="cmpD738842B230F04E64FD98E3E850E6338" Guid="*">
18671858
<File Id="fil73F9971478A8661859398F414D5BDE00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Hyak.Common.dll" />
18681859
</Component>
@@ -5261,7 +5252,6 @@
52615252
<ComponentRef Id="cmp4F1B147652795AAF834377CCD9CAF2A7" />
52625253
<ComponentRef Id="cmp0BDDC10BCAFF9EC25710B20367203609" />
52635254
<ComponentRef Id="cmpC7297788AE102ED861765ADE84F7A59B" />
5264-
<ComponentRef Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" />
52655255
<ComponentRef Id="cmpCC409403AF670A9E0538AC743C61BD66" />
52665256
<ComponentRef Id="cmp8F649774D57C8E90EC765D8FCE36E32A" />
52675257
<ComponentRef Id="cmp97D0BCD046DCE5E1A3DA3611DDBA27AB" />
@@ -5580,7 +5570,6 @@
55805570
<ComponentRef Id="cmp9F97686A6D38F8B72B2FB1D62529AF0F" />
55815571
<ComponentRef Id="cmpA398972142ABD0AC819F613EE832B65C" />
55825572
<ComponentRef Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" />
5583-
<ComponentRef Id="cmp065EDC002BB63B6AA573F18152B7240F" />
55845573
<ComponentRef Id="cmp02E49F28BB0FA3174A478847B857A4D0" />
55855574
<ComponentRef Id="cmp53B7AE5C484C188098FEE906B381461C" />
55865575
<ComponentRef Id="cmp246D81BDC7381CDCA512555564D15DF8" />
@@ -5674,7 +5663,6 @@
56745663
<ComponentRef Id="cmpBBEEE168902DFD205E35F47468881929" />
56755664
<ComponentRef Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" />
56765665
<ComponentRef Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" />
5677-
<ComponentRef Id="cmp9002DD73D47754F2109499247914700F" />
56785666
<ComponentRef Id="cmpD738842B230F04E64FD98E3E850E6338" />
56795667
<ComponentRef Id="cmp2BE62623A92CD0986F0915CB16373E90" />
56805668
<ComponentRef Id="cmp95E80D6E42ED3C994C89564D15A4E501" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/ApiManagementClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ public TenantConfigurationLongRunningOperation BeginSaveTenantGitConfiguration(
16891689
context.ServiceName,
16901690
saveConfigurationParams);
16911691

1692-
return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Save-AzureRmApiManagement", longrunningResponse);
1692+
return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Save-AzureRmApiManagementTenantGitConfiguration", longrunningResponse);
16931693
}
16941694

16951695
public TenantConfigurationLongRunningOperation BeginPublishTenantGitConfiguration(
@@ -1707,7 +1707,7 @@ public TenantConfigurationLongRunningOperation BeginPublishTenantGitConfiguratio
17071707
context.ServiceName,
17081708
deployConfigurationParams);
17091709

1710-
return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagement", longrunningResponse);
1710+
return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagementTenantGitConfiguration", longrunningResponse);
17111711
}
17121712

17131713
public TenantConfigurationLongRunningOperation BeginValidateTenantGitConfiguration(
@@ -1725,7 +1725,7 @@ public TenantConfigurationLongRunningOperation BeginValidateTenantGitConfigurati
17251725
context.ServiceName,
17261726
deployConfigurationParams);
17271727

1728-
return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagement -ValidateOnly", longrunningResponse);
1728+
return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagementTenantGitConfiguration -ValidateOnly", longrunningResponse);
17291729
}
17301730

17311731
public PsApiManagementTenantConfigurationSyncState GetTenantConfigurationSyncState(

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/AzureApiManagementCmdletBase.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ protected TenantConfigurationLongRunningOperation WaitForOperationToComplete(Ten
107107

108108
protected void ExecuteTenantConfigurationLongRunningCmdletWrap(
109109
Func<TenantConfigurationLongRunningOperation> func,
110-
bool passThru = false,
111-
object passThruValue = null)
110+
bool passThru = false)
112111
{
113112
try
114113
{
@@ -121,12 +120,21 @@ protected void ExecuteTenantConfigurationLongRunningCmdletWrap(
121120
longRunningOperation.OperationResult.Error.Message
122121
: longRunningOperation.OperationName;
123122

123+
WriteObject(longRunningOperation.OperationResult);
124+
if (longRunningOperation.OperationResult.Error != null)
125+
{
126+
WriteObject(longRunningOperation.OperationResult.Error);
127+
if (longRunningOperation.OperationResult.Error.Details != null)
128+
{
129+
WriteObject(longRunningOperation.OperationResult.Error.Details, true);
130+
}
131+
}
132+
124133
WriteErrorWithTimestamp(errorMessage);
125-
WriteObject(passThruValue ?? longRunningOperation.OperationResult);
126134
}
127135
else if (passThru)
128136
{
129-
WriteObject(passThruValue ?? longRunningOperation.OperationResult);
137+
WriteObject(longRunningOperation.OperationResult);
130138
}
131139
}
132140
catch (ArgumentException ex)

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagementProduct.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,10 @@ public override void ExecuteApiManagementCmdlet()
8888
string productId = ProductId ?? Guid.NewGuid().ToString("N");
8989

9090
bool? approvalRequired = null;
91-
if (SubscriptionRequired.HasValue && SubscriptionRequired.Value)
92-
{
93-
approvalRequired = ApprovalRequired ?? false;
94-
}
95-
9691
Int32? subscriptionsLimit = null;
9792
if (SubscriptionRequired.HasValue && SubscriptionRequired.Value)
9893
{
94+
approvalRequired = ApprovalRequired ?? false;
9995
subscriptionsLimit = SubscriptionsLimit ?? 1;
10096
}
10197

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagmentProperty.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class NewAzureApiManagementProperty : AzureApiManagementCmdletBase
5757
ValueFromPipelineByPropertyName = true,
5858
Mandatory = false,
5959
HelpMessage = "Determines whether the value is a secret and should be encrypted or not." +
60-
" This parameter is optional. Default Value is not Secret.")]
60+
" This parameter is optional. Default Value is false.")]
6161
public SwitchParameter Secret { get; set; }
6262

6363
[Parameter(

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/PublishAzureApiManagementTenantConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class PublishAzureApiManagementTenantConfiguration : AzureApiManagementCm
5858
ValueFromPipelineByPropertyName = true,
5959
Mandatory = false,
6060
HelpMessage = "If specified then instance of Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOperationResult" +
61-
" type representing the operation result.")]
61+
" type representing the operation result will be written to output.")]
6262
public SwitchParameter PassThru { get; set; }
6363

6464
public override void ExecuteApiManagementCmdlet()

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SaveAzureApiManagementTenantConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class SaveAzureApiManagementTenantConfiguration : AzureApiManagementCmdle
5151
Mandatory = false,
5252
HelpMessage = "If specified then instance of" +
5353
" Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOperationResult type" +
54-
" representing the operation result.")]
54+
" representing the operation result will be written to output.")]
5555
public SwitchParameter PassThru { get; set; }
5656

5757
public override void ExecuteApiManagementCmdlet()

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class SetAzureApiManagementLogger : AzureApiManagementCmdletBase
6868
Mandatory = false,
6969
HelpMessage = "If specified then instance of " +
7070
"Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementLogger type " +
71-
" representing the modified logger.")]
71+
" representing the modified logger will be written to output.")]
7272
public SwitchParameter PassThru { get; set; }
7373

7474
public override void ExecuteApiManagementCmdlet()

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementOpenIdConnectProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class SetAzureApiManagementOpenIdConnectProvider : AzureApiManagementCmdl
7171
Mandatory = false,
7272
HelpMessage = "If specified then instance of " +
7373
"Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOpenIdConnectProvider type" +
74-
" representing the modified OpenId Connect Provider.")]
74+
" representing the modified OpenId Connect Provider will be written to output.")]
7575
public SwitchParameter PassThru { get; set; }
7676

7777
public override void ExecuteApiManagementCmdlet()

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementProperty.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class SetAzureApiManagementProperty : AzureApiManagementCmdletBase
6969
Mandatory = false,
7070
HelpMessage = "If specified then instance of " +
7171
"Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementProperty type " +
72-
"representing the modified property.")]
72+
"representing the modified property will be written to output.")]
7373
public SwitchParameter PassThru { get; set; }
7474

7575
public override void ExecuteApiManagementCmdlet()

‎src/ResourceManager/Profile/AzureRM.Profile.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RequiredModules = @()
5151
RequiredAssemblies = @()
5252

5353
# Script files (.ps1) that are run in the caller's environment prior to importing this module
54-
ScriptsToProcess = @('CheckVersions.ps1')
54+
ScriptsToProcess = @()
5555

5656
# Type files (.ps1xml) to be loaded when importing this module
5757
TypesToProcess = @()

‎src/ResourceManager/Profile/CheckVersions.ps1

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@
188188
<Compile Include="MockSubscriptionClientFactory.cs" />
189189
<Compile Include="NullClient.cs" />
190190
<Compile Include="ProfileController.cs" />
191-
<Compile Include="ProfileModuleTests.cs" />
192191
<Compile Include="RPRegistrationDelegatingHandlerTests.cs" />
193192
<Compile Include="SubscriptionCmdletTests.cs" />
194193
<Compile Include="TenantCmdletTests.cs" />
@@ -204,12 +203,6 @@
204203
</Content>
205204
<None Include="MSSharedLibKey.snk" />
206205
<None Include="packages.config" />
207-
<None Include="FakeModuleRepo\AzureRM.ApiManagement.998.9.8.nupkg">
208-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
209-
</None>
210-
<None Include="FakeModuleRepo\AzureRM.Profile.999.9.8.nupkg">
211-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
212-
</None>
213206
<None Include="SessionRecords\Microsoft.Azure.Commands.Profile.Test.ProfileModuleTests\WarningOnIncompatibleVersions.json">
214207
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
215208
</None>
@@ -225,9 +218,6 @@
225218
<None Include="SessionRecords\Microsoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests\SetAzureRmContextWorks.json">
226219
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
227220
</None>
228-
<Content Include="ProfileModuleTests.ps1">
229-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230-
</Content>
231221
</ItemGroup>
232222
<ItemGroup>
233223
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">

‎src/ResourceManager/Profile/Commands.Profile.Test/FakeModuleRepo/AzureRM.ApiManagement.998.9.8.nupkg

-3.63 KB
Binary file not shown.

‎src/ResourceManager/Profile/Commands.Profile.Test/FakeModuleRepo/AzureRM.Profile.999.9.8.nupkg

-4.44 KB
Binary file not shown.

‎src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)