Skip to content

Commit 5ae13ea

Browse files
DeepakRajendranMsftDeepakRajendranMsft
committed
Pull from dev
2 parents ed6bc96 + 24eebc9 commit 5ae13ea

File tree

600 files changed

+99458
-28282
lines changed

Some content is hidden

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

600 files changed

+99458
-28282
lines changed

‎ChangeLog.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
##2016.05.03 version 1.4.0
2+
* Azure Storage
3+
* Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
4+
* Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
5+
- New-AzureRmStorageAccount
6+
- Set-AzureRmStorageAccount
7+
* Add "Add" and "Create" permission to Blob SAS cmdlets
8+
- New-AzureStorageBlobSASToken
9+
- New-AzureStorageContainerSASToken
10+
- New-AzureStorageContainerStoredAccessPolicy
11+
- Set-AzureStorageContainerStoredAccessPolicy
12+
* Add "Create" permission to File SAS cmdlets
13+
- New-AzureStorageFileSASToken
14+
- New-AzureStorageShareSASToken
15+
- New-AzureStorageShareStoredAccessPolicy
16+
- Set-AzureStorageShareStoredAccessPolicy
17+
* Added Recovery Services Backup cmdlets
18+
- Set-AzureRmRecoveryServicesVaultContext
19+
- Set-AzureRmRecoveryServicesBackupProperties
20+
- Get-AzureRmRecoveryServicesBackupProperties
21+
- Get-AzureRmRecoveryServicesVaultSettingsFile
22+
- Backup-AzureRmRecoveryServicesBackupItem
23+
- Get-AzureRmRecoveryServicesBackupContainer
24+
- Get-AzureRmRecoveryServicesBackupManagementServer
25+
- Unregister-AzureRmRecoveryServicesBackupContainer
26+
- Unregister-AzureRmRecoveryServicesBackupManagementServer
27+
- Disable-AzureRmRecoveryServicesBackupProtection
28+
- Enable-AzureRmRecoveryServicesBackupProtection
29+
- Get-AzureRmRecoveryServicesBackupItem
30+
- Get-AzureRmRecoveryServicesBackupJob
31+
- Get-AzureRmRecoveryServicesBackupJobDetails
32+
- Stop-AzureRmRecoveryServicesBackupJob
33+
- Wait-AzureRmRecoveryServicesBackupJob
34+
- Get-AzureRmRecoveryServicesBackupRetentionPolicyObject
35+
- Get-AzureRmRecoveryServicesBackupProtectionPolicy
36+
- Get-AzureRmRecoveryServicesBackupSchedulePolicyObject
37+
- New-AzureRmRecoveryServicesBackupProtectionPolicy
38+
- Remove-AzureRmRecoveryServicesBackupProtectionPolicy
39+
- Set-AzureRmRecoveryServicesBackupProtectionPolicy
40+
- Get-AzureRmRecoveryServicesBackupRecoveryPoint
41+
- Restore-AzureRmRecoveryServicesBackupItem
42+
143
##2016.04.19 version 1.3.2
244
* Add support for specifying NIC/VMSS as application gateway backend address
345
* Fix HDI ADL cluster creation and live test

‎setup/azurecmdfiles.wxi

Lines changed: 134 additions & 4 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Authentication.Test/AzureRMProfileTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void LoadingProfileWorks()
217217
AzureSession.DataStore = dataStore;
218218
dataStore.WriteFile(path, contents);
219219
var profile = new AzureRMProfile(path);
220-
Assert.Equal(4, profile.Environments.Count);
220+
Assert.Equal(5, profile.Environments.Count);
221221
Assert.Equal("3c0ff8a7-e8bb-40e8-ae66-271343379af6", profile.Context.Tenant.Id.ToString());
222222
Assert.Equal("contoso.com", profile.Context.Tenant.Domain);
223223
Assert.Equal("00000000-0000-0000-0000-000000000000", profile.Context.Subscription.Id.ToString());

‎src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<Compile Include="Interfaces\IClientFactory.cs" />
150150
<Compile Include="Interfaces\IDataStore.cs" />
151151
<Compile Include="Interfaces\IProfileSerializer.cs" />
152+
<Compile Include="LegacySupport.cs" />
152153
<Compile Include="Models\AzureAccount.cs" />
153154
<Compile Include="Models\AzureAccount.Methods.cs" />
154155
<Compile Include="Models\AzureContext.cs" />

‎src/Common/Commands.Common.Authentication/stuff/Models/AzureTenant.cs renamed to ‎src/Common/Commands.Common.Authentication/LegacySupport.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
15+
using Microsoft.Azure.Commands.Common.Authentication;
1616

17-
namespace Microsoft.Azure.Common.Authentication.Models
17+
namespace Microsoft.Azure.Common.Authentication
1818
{
1919
/// <summary>
20-
/// Represents an AD tenant.
20+
/// Provide backward compatibility for setting User Agent values
2121
/// </summary>
22-
[Serializable]
23-
public class AzureTenant
22+
public static class AzureSession
2423
{
2524
/// <summary>
26-
/// Gets or sets the tenant id.
25+
/// The ClientFactory used to produce management clients in this session
2726
/// </summary>
28-
public Guid Id { get; set; }
29-
30-
/// <summary>
31-
/// Gets or sets the tenant domain.
32-
/// </summary>
33-
public string Domain { get; set; }
27+
public static IClientFactory ClientFactory
28+
{
29+
get { return Commands.Common.Authentication.AzureSession.ClientFactory; }
30+
}
3431
}
3532
}

‎src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,32 @@ private string StorageFileEndpointFormat()
154154
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint }
155155
}
156156
}
157+
},
158+
{
159+
EnvironmentName.AzureGermanCloud,
160+
new AzureEnvironment
161+
{
162+
Name = EnvironmentName.AzureGermanCloud,
163+
Endpoints = new Dictionary<AzureEnvironment.Endpoint, string>
164+
{
165+
{ AzureEnvironment.Endpoint.PublishSettingsFileUrl, AzureEnvironmentConstants.GermanPublishSettingsFileUrl },
166+
{ AzureEnvironment.Endpoint.ServiceManagement, AzureEnvironmentConstants.GermanServiceEndpoint },
167+
{ AzureEnvironment.Endpoint.ResourceManager, AzureEnvironmentConstants.GermanResourceManagerEndpoint },
168+
{ AzureEnvironment.Endpoint.ManagementPortalUrl, AzureEnvironmentConstants.GermanManagementPortalUrl },
169+
{ AzureEnvironment.Endpoint.ActiveDirectory, AzureEnvironmentConstants.GermanActiveDirectoryEndpoint },
170+
{ AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId, AzureEnvironmentConstants.GermanServiceEndpoint },
171+
{ AzureEnvironment.Endpoint.StorageEndpointSuffix, AzureEnvironmentConstants.GermanStorageEndpointSuffix },
172+
{ AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.GermanGalleryEndpoint },
173+
{ AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.GermanSqlDatabaseDnsSuffix },
174+
{ AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.GermanGraphEndpoint },
175+
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.GermanTrafficManagerDnsSuffix },
176+
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.GermanKeyVaultDnsSuffix },
177+
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId },
178+
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.GermanGraphEndpoint }
179+
}
180+
}
157181
}
182+
158183
};
159184

160185
public Uri GetEndpointAsUri(AzureEnvironment.Endpoint endpoint)
@@ -337,88 +362,74 @@ public enum Endpoint
337362
public static class EnvironmentName
338363
{
339364
public const string AzureCloud = "AzureCloud";
340-
341365
public const string AzureChinaCloud = "AzureChinaCloud";
342-
343366
public const string AzureUSGovernment = "AzureUSGovernment";
367+
public const string AzureGermanCloud = "AzureGermanCloud";
344368
}
345369

346370
public static class AzureEnvironmentConstants
347371
{
348372
public const string AzureServiceEndpoint = "https://management.core.windows.net/";
349-
350373
public const string ChinaServiceEndpoint = "https://management.core.chinacloudapi.cn/";
351-
352374
public const string USGovernmentServiceEndpoint = "https://management.core.usgovcloudapi.net/";
375+
public const string GermanServiceEndpoint = "https://management.core.cloudapi.de/";
353376

354377
public const string AzureResourceManagerEndpoint = "https://management.azure.com/";
355-
356378
public const string ChinaResourceManagerEndpoint = "https://management.chinacloudapi.cn/";
357-
358379
public const string USGovernmentResourceManagerEndpoint = "https://management.usgovcloudapi.net/";
380+
public const string GermanResourceManagerEndpoint = "https://management.microsoftazure.de/";
359381

360382
public const string GalleryEndpoint = "https://gallery.azure.com/";
361-
362383
public const string ChinaGalleryEndpoint = "https://gallery.chinacloudapi.cn/";
363-
364384
public const string USGovernmentGalleryEndpoint = "https://gallery.usgovcloudapi.net/";
385+
public const string GermanGalleryEndpoint = "https://gallery.cloudapi.de/";
365386

366387
public const string AzurePublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301775";
367-
368388
public const string ChinaPublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301776";
369-
370389
public const string USGovernmentPublishSettingsFileUrl = "https://manage.windowsazure.us/publishsettings/index";
390+
public const string GermanPublishSettingsFileUrl = "https://manage.microsoftazure.de/publishsettings/index";
371391

372392
public const string AzureManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=254433";
373-
374393
public const string ChinaManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=301902";
375-
376394
public const string USGovernmentManagementPortalUrl = "https://manage.windowsazure.us";
395+
public const string GermanManagementPortalUrl = "http://portal.microsoftazure.de/";
377396

378397
public const string AzureStorageEndpointSuffix = "core.windows.net";
379-
380398
public const string ChinaStorageEndpointSuffix = "core.chinacloudapi.cn";
381-
382399
public const string USGovernmentStorageEndpointSuffix = "core.usgovcloudapi.net";
400+
public const string GermanStorageEndpointSuffix = "core.cloudapi.de";
383401

384402
public const string AzureSqlDatabaseDnsSuffix = ".database.windows.net";
385-
386403
public const string ChinaSqlDatabaseDnsSuffix = ".database.chinacloudapi.cn";
387-
388404
public const string USGovernmentSqlDatabaseDnsSuffix = ".database.usgovcloudapi.net";
405+
public const string GermanSqlDatabaseDnsSuffix = ".database.cloudapi.de";
389406

390407
public const string AzureActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
391-
392408
public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
393-
394409
public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/";
410+
public const string GermanActiveDirectoryEndpoint = "https://login.microsoftonline.de/";
395411

396412
public const string AzureGraphEndpoint = "https://graph.windows.net/";
397-
398413
public const string ChinaGraphEndpoint = "https://graph.chinacloudapi.cn/";
399-
400414
public const string USGovernmentGraphEndpoint = "https://graph.windows.net/";
415+
public const string GermanGraphEndpoint = "https://graph.cloudapi.de/";
401416

402417
public const string AzureTrafficManagerDnsSuffix = "trafficmanager.net";
403-
404418
public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
405-
406419
public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
420+
public const string GermanTrafficManagerDnsSuffix = "azuretrafficmanager.de";
407421

408422
public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
409-
410423
public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";
411-
412424
public const string USGovernmentKeyVaultDnsSuffix = "vault.usgovcloudapi.net";
425+
public const string GermanKeyVaultDnsSuffix = "vault.microsoftazure.de";
413426

414427
public const string AzureKeyVaultServiceEndpointResourceId = "https://vault.azure.net";
415-
416428
public const string ChinaKeyVaultServiceEndpointResourceId = "https://vault.azure.cn";
417-
418429
public const string USGovernmentKeyVaultServiceEndpointResourceId = "https://vault.usgovcloudapi.net";
430+
public const string GermanAzureKeyVaultServiceEndpointResourceId = "https://vault.microsoftazure.de";
419431

420432
public const string AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "azuredatalakeanalytics.net";
421-
422433
public const string AzureDataLakeStoreFileSystemEndpointSuffix = "azuredatalakestore.net";
423434
}
424435
}

‎src/Common/Commands.Common.Authentication/stuff/Authentication/AadAuthenticationException.cs

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

‎src/Common/Commands.Common.Authentication/stuff/Authentication/AccessTokenCredential.cs

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

0 commit comments

Comments
 (0)