Skip to content

Updating the Azure US Gov Cloud STS and Traffic Manager #2029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zakramer wants to merge 2 commits into from
Closed

Updating the Azure US Gov Cloud STS and Traffic Manager #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ced3e4
Updating Azure Gov STS and Traffic Manager
zakramer Mar 30, 2016
aa0e96b
Reverting Changes by editor tool
zakramer Mar 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
}
}
Expand Down Expand Up @@ -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/";

Expand All @@ -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";
Expand Down
26 changes: 13 additions & 13 deletions src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<command:syntaxItem>
<maml:name>Add-AzureRmAccount</maml:name>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>Environment</maml:name>
<maml:name>EnvironmentName</maml:name>
<maml:description>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
</maml:description>
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>SubscriptionId</maml:name>
Expand Down Expand Up @@ -69,11 +69,11 @@
<command:parameterValue required="false" variableLength="false">PSCredential</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>Environment</maml:name>
<maml:name>EnvironmentName</maml:name>
<maml:description>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
</maml:description>
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>SubscriptionId</maml:name>
Expand Down Expand Up @@ -109,11 +109,11 @@
<command:parameterValue required="false" variableLength="false">PSCredential</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>Environment</maml:name>
<maml:name>EnvironmentName</maml:name>
<maml:description>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
</maml:description>
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>SubscriptionId</maml:name>
Expand Down Expand Up @@ -172,13 +172,13 @@
<dev:defaultValue>none</dev:defaultValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
<maml:name>Environment</maml:name>
<maml:name>EnvironmentName</maml:name>
<maml:description>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
</maml:description>
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
<dev:type>
<maml:name>AzureEnvironment</maml:name>
<maml:name>String</maml:name>
<maml:uri />
</dev:type>
<dev:defaultValue>none</dev:defaultValue>
Expand Down
15 changes: 10 additions & 5 deletions ...eManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
<maml:name>Environment</maml:name>
<maml:description>
<maml:para>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.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
<maml:para>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.</maml:para>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
</command:parameter>
Expand All @@ -52,7 +53,8 @@
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
<maml:name>Environment</maml:name>
<maml:description>
<maml:para>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.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
<maml:para>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.</maml:para>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
</command:parameter>
Expand Down Expand Up @@ -90,7 +92,8 @@
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
<maml:name>Environment</maml:name>
<maml:description>
<maml:para>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.</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
<maml:para>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.</maml:para>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
<dev:type>
Expand Down Expand Up @@ -1427,7 +1430,8 @@
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
<maml:name>Environment</maml:name>
<maml:description>
<maml:para>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).</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
<maml:para>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.</maml:para>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
</command:parameter>
Expand Down Expand Up @@ -1458,7 +1462,8 @@
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
<maml:name>Environment</maml:name>
<maml:description>
<maml:para>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).</maml:para>
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
<maml:para>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.</maml:para>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
<dev:type>
Expand Down