Skip to content

Commit 6ced3e4

Browse files
committed
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.
1 parent 8bcf538 commit 6ced3e4

File tree

3 files changed

+31
-26
lines changed

3 files changed

+31
-26
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ private string StorageFileEndpointFormat()
146146
{ AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.USGovernmentGalleryEndpoint },
147147
{ AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.USGovernmentSqlDatabaseDnsSuffix },
148148
{ AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.USGovernmentGraphEndpoint },
149-
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, null },
149+
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.USGovernmentTrafficManagerDnsSuffix },
150150
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.USGovernmentKeyVaultDnsSuffix},
151151
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId},
152152
{ AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, null},
153153
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null},
154-
{AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint}
154+
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint }
155155
}
156156
}
157157
}
@@ -391,7 +391,7 @@ public static class AzureEnvironmentConstants
391391

392392
public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
393393

394-
public const string USGovernmentActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
394+
public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/";
395395

396396
public const string AzureGraphEndpoint = "https://graph.windows.net/";
397397

@@ -403,6 +403,8 @@ public static class AzureEnvironmentConstants
403403

404404
public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
405405

406+
public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
407+
406408
public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
407409

408410
public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";

src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<helpItems xmlns="http://msh" schema="maml">
33
<!-- Updatable Help Version 2.0.1.0 -->
44
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
@@ -22,9 +22,9 @@
2222
<command:syntaxItem>
2323
<maml:name>Add-AzureRmAccount</maml:name>
2424
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
25-
<maml:name>Environment</maml:name>
25+
<maml:name>EnvironmentName</maml:name>
2626
<maml:description>
27-
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
27+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
2828
</maml:description>
2929
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
3030
</command:parameter>
@@ -69,9 +69,9 @@
6969
<command:parameterValue required="false" variableLength="false">PSCredential</command:parameterValue>
7070
</command:parameter>
7171
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
72-
<maml:name>Environment</maml:name>
72+
<maml:name>EnvironmentName</maml:name>
7373
<maml:description>
74-
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
74+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
7575
</maml:description>
7676
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
7777
</command:parameter>
@@ -109,9 +109,9 @@
109109
<command:parameterValue required="false" variableLength="false">PSCredential</command:parameterValue>
110110
</command:parameter>
111111
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
112-
<maml:name>Environment</maml:name>
112+
<maml:name>EnvironmentName</maml:name>
113113
<maml:description>
114-
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
114+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
115115
</maml:description>
116116
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
117117
</command:parameter>
@@ -172,9 +172,9 @@
172172
<dev:defaultValue>none</dev:defaultValue>
173173
</command:parameter>
174174
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
175-
<maml:name>Environment</maml:name>
175+
<maml:name>EnvironmentName</maml:name>
176176
<maml:description>
177-
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud. The default is AzureCloud.</maml:para>
177+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud.</maml:para>
178178
</maml:description>
179179
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
180180
<dev:type>

0 commit comments

Comments
 (0)