From 6ced3e4323be8d4fb228c9cb13bbf1fc11072d41 Mon Sep 17 00:00:00 2001 From: zakramer Date: Tue, 29 Mar 2016 23:05:22 -0400 Subject: [PATCH 1/2] Updating Azure Gov STS and Traffic Manager Updating the STS URL for Azure Gov to the US Only STS that was stood up for Azure Gov. Adding the Traffic Manager Suffix Updating the Add-AzureAccount and Add-AzureRMAccount documentation to include AzureUSGovernment in the text and to change Environment to EnvironmentName to be easier to use. --- .../Models/AzureEnvironment.Methods.cs | 8 +++-- ...rosoft.Azure.Commands.Profile.dll-Help.xml | 18 +++++------ ...WindowsAzure.Commands.Profile.dll-Help.xml | 31 ++++++++++--------- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs b/src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs index e03beb5dd6e0..7dfe7da58f46 100644 --- a/src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs +++ b/src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs @@ -146,12 +146,12 @@ private string StorageFileEndpointFormat() { AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.USGovernmentGalleryEndpoint }, { AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.USGovernmentSqlDatabaseDnsSuffix }, { AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.USGovernmentGraphEndpoint }, - { AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, null }, + { AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.USGovernmentTrafficManagerDnsSuffix }, { AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.USGovernmentKeyVaultDnsSuffix}, { AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId}, { AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, null}, { AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null}, - {AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint} + { AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint } } } } @@ -391,7 +391,7 @@ public static class AzureEnvironmentConstants public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/"; - public const string USGovernmentActiveDirectoryEndpoint = "https://login.microsoftonline.com/"; + public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/"; public const string AzureGraphEndpoint = "https://graph.windows.net/"; @@ -403,6 +403,8 @@ public static class AzureEnvironmentConstants public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn"; + public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net"; + public const string AzureKeyVaultDnsSuffix = "vault.azure.net"; public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn"; diff --git a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml index 4c52732ba491..b091dc63aa29 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml +++ b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml @@ -1,4 +1,4 @@ - + @@ -22,9 +22,9 @@ Add-AzureRmAccount - Environment + EnvironmentName - Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. AzureEnvironment @@ -69,9 +69,9 @@ PSCredential - Environment + EnvironmentName - Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. AzureEnvironment @@ -109,9 +109,9 @@ PSCredential - Environment + EnvironmentName - Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. AzureEnvironment @@ -172,9 +172,9 @@ none - Environment + EnvironmentName - Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. AzureEnvironment diff --git a/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml b/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml index e8b25266768d..5a07536d2bce 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml +++ b/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml @@ -1,4 +1,4 @@ - + @@ -28,7 +28,8 @@ Environment - Specifies an Azure environment for the user account. This parameter is optional. The default is the AzureCloud environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack.To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional. + An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure, AzureChinaCloud for Azure operated by 21Vianet in China, and AzureUSGoverment for the Azure US Government Cloud. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack. To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. String @@ -52,7 +53,8 @@ Environment - Specifies an Azure environment for the user account. This parameter is optional. The default is the AzureCloud environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack.To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional. + An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure, AzureChinaCloud for Azure operated by 21Vianet in China, and AzureUSGoverment for the Azure US Government Cloud. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack. To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. String @@ -90,7 +92,8 @@ Environment - Specifies an Azure environment for the user account. This parameter is optional. The default is the AzureCloud environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack.To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional. + An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure, AzureChinaCloud for Azure operated by 21Vianet in China, and AzureUSGoverment for the Azure US Government Cloud. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack. To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. String @@ -1898,7 +1901,7 @@ PS C:\> - PS C:\> C:\PS>Get-AzureSubscription –SubscriptionName "MyProdSubscription" + PS C:\> C:\PS>Get-AzureSubscription -SubscriptionName "MyProdSubscription" This command gets only the "MyProdSubsciption" subscription. @@ -2141,7 +2144,7 @@ PS C:\> - PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings + PS C:\>Import-AzurePublishSettingsFile �PublishSettingsFile C:\Temp\MyAccount.publishsettings This command imports the "C:\Temp\MyAccount.publishsettings" file. @@ -2162,7 +2165,7 @@ PS C:\> - PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings -Environment AzureChinaCloud + PS C:\>Import-AzurePublishSettingsFile �PublishSettingsFile C:\Temp\MyAccount.publishsettings -Environment AzureChinaCloud This command imports the "C:\Temp\MyAccount.publishsettings" file and sets the Azure environment of all imported subscriptions to be AzureChinaCloud. This will overwrite the endpoints defined in the publish settings file. @@ -4512,7 +4515,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. X509Certificate2 @@ -4571,7 +4574,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. X509Certificate2 @@ -4630,7 +4633,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. X509Certificate2 @@ -4708,7 +4711,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. X509Certificate2 @@ -4880,7 +4883,7 @@ PS C:\> C:\PS> $thumbprint = <Thumbprint-2> C:\PS> $differentCert = Get-Item cert:\\CurrentUser\My\$thumbprint - C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering -Certificate $differentCert + C:\PS> Set-AzureSubscription �SubscriptionName ContosoEngineering -Certificate $differentCert These commands are very similar to the commands in Example 1. However, because the SubscriptionName parameter now identifies an existing subscription, Set-AzureSubscription uses the remaining parameters to change the values of the existing subscription rather than creating a new subscription @@ -4901,7 +4904,7 @@ PS C:\> - PS C:\> C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering -ServiceEndpoint "https://management.core.contoso.com" + PS C:\> C:\PS> Set-AzureSubscription �SubscriptionName ContosoEngineering -ServiceEndpoint "https://management.core.contoso.com" This command adds or changes a custom service endpoint for the ContosoEngineering subscription. @@ -4922,7 +4925,7 @@ PS C:\> - PS C:\> C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering –Certificate $null -ResourceManagerEndpoint $null + PS C:\> C:\PS> Set-AzureSubscription �SubscriptionName ContosoEngineering �Certificate $null -ResourceManagerEndpoint $null This command sets the values of the Certificate and ResourceManagerEndpoint properties to null ($null). This clears the values of those properties without changing other settings. From aa0e96be1a30ce869d4ec3831ffd23b2c1292058 Mon Sep 17 00:00:00 2001 From: zakramer Date: Tue, 29 Mar 2016 23:29:53 -0400 Subject: [PATCH 2/2] Reverting Changes by editor tool --- ...rosoft.Azure.Commands.Profile.dll-Help.xml | 12 ++++---- ...WindowsAzure.Commands.Profile.dll-Help.xml | 28 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml index b091dc63aa29..4c33730ff5f2 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml +++ b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml @@ -1,4 +1,4 @@ - + @@ -26,7 +26,7 @@ Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. - AzureEnvironment + String SubscriptionId @@ -73,7 +73,7 @@ Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. - AzureEnvironment + String SubscriptionId @@ -113,7 +113,7 @@ Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. - AzureEnvironment + String SubscriptionId @@ -176,9 +176,9 @@ Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. - AzureEnvironment + String - AzureEnvironment + String none diff --git a/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml b/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml index 5a07536d2bce..cce925ed640d 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml +++ b/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml @@ -1,4 +1,4 @@ - + @@ -1430,7 +1430,8 @@ Environment - Specifies an Azure environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx). + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional. + An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure, AzureChinaCloud for Azure operated by 21Vianet in China, and AzureUSGoverment for the Azure US Government Cloud. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack. To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. String @@ -1461,7 +1462,8 @@ Environment - Specifies an Azure environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx). + Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional. + An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure, AzureChinaCloud for Azure operated by 21Vianet in China, and AzureUSGoverment for the Azure US Government Cloud. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack. To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. String @@ -1901,7 +1903,7 @@ PS C:\> - PS C:\> C:\PS>Get-AzureSubscription -SubscriptionName "MyProdSubscription" + PS C:\> C:\PS>Get-AzureSubscription –SubscriptionName "MyProdSubscription" This command gets only the "MyProdSubsciption" subscription. @@ -2144,7 +2146,7 @@ PS C:\> - PS C:\>Import-AzurePublishSettingsFile �PublishSettingsFile C:\Temp\MyAccount.publishsettings + PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings This command imports the "C:\Temp\MyAccount.publishsettings" file. @@ -2165,7 +2167,7 @@ PS C:\> - PS C:\>Import-AzurePublishSettingsFile �PublishSettingsFile C:\Temp\MyAccount.publishsettings -Environment AzureChinaCloud + PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings -Environment AzureChinaCloud This command imports the "C:\Temp\MyAccount.publishsettings" file and sets the Azure environment of all imported subscriptions to be AzureChinaCloud. This will overwrite the endpoints defined in the publish settings file. @@ -4515,7 +4517,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. X509Certificate2 @@ -4574,7 +4576,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. X509Certificate2 @@ -4633,7 +4635,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. X509Certificate2 @@ -4711,7 +4713,7 @@ Certificate - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine�s personal certificate store. + Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. X509Certificate2 @@ -4883,7 +4885,7 @@ PS C:\> C:\PS> $thumbprint = <Thumbprint-2> C:\PS> $differentCert = Get-Item cert:\\CurrentUser\My\$thumbprint - C:\PS> Set-AzureSubscription �SubscriptionName ContosoEngineering -Certificate $differentCert + C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering -Certificate $differentCert These commands are very similar to the commands in Example 1. However, because the SubscriptionName parameter now identifies an existing subscription, Set-AzureSubscription uses the remaining parameters to change the values of the existing subscription rather than creating a new subscription @@ -4904,7 +4906,7 @@ PS C:\> - PS C:\> C:\PS> Set-AzureSubscription �SubscriptionName ContosoEngineering -ServiceEndpoint "https://management.core.contoso.com" + PS C:\> C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering -ServiceEndpoint "https://management.core.contoso.com" This command adds or changes a custom service endpoint for the ContosoEngineering subscription. @@ -4925,7 +4927,7 @@ PS C:\> - PS C:\> C:\PS> Set-AzureSubscription �SubscriptionName ContosoEngineering �Certificate $null -ResourceManagerEndpoint $null + PS C:\> C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering –Certificate $null -ResourceManagerEndpoint $null This command sets the values of the Certificate and ResourceManagerEndpoint properties to null ($null). This clears the values of those properties without changing other settings.