Skip to content

Commit c3de34e

Browse files
author
Hovsep
committed
Merge pull request Azure#2072 from zakramer/AzureGovSTSUpdate
[Release.1.3.2] Azure gov sts update
2 parents 527f062 + aa0e96b commit c3de34e

File tree

3 files changed

+28
-21
lines changed

3 files changed

+28
-21
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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
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>
29-
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
29+
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
3030
</command:parameter>
3131
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
3232
<maml:name>SubscriptionId</maml:name>
@@ -69,11 +69,11 @@
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>
76-
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
76+
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
7777
</command:parameter>
7878
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
7979
<maml:name>SubscriptionId</maml:name>
@@ -109,11 +109,11 @@
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>
116-
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
116+
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
117117
</command:parameter>
118118
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
119119
<maml:name>SubscriptionId</maml:name>
@@ -172,13 +172,13 @@
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>
179-
<command:parameterValue required="false" variableLength="false">AzureEnvironment</command:parameterValue>
179+
<command:parameterValue required="false" variableLength="false">String</command:parameterValue>
180180
<dev:type>
181-
<maml:name>AzureEnvironment</maml:name>
181+
<maml:name>String</maml:name>
182182
<maml:uri />
183183
</dev:type>
184184
<dev:defaultValue>none</dev:defaultValue>

‎src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
2929
<maml:name>Environment</maml:name>
3030
<maml:description>
31-
<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>
31+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
32+
<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>
3233
</maml:description>
3334
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
3435
</command:parameter>
@@ -52,7 +53,8 @@
5253
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
5354
<maml:name>Environment</maml:name>
5455
<maml:description>
55-
<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>
56+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
57+
<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>
5658
</maml:description>
5759
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
5860
</command:parameter>
@@ -90,7 +92,8 @@
9092
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
9193
<maml:name>Environment</maml:name>
9294
<maml:description>
93-
<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>
95+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
96+
<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>
9497
</maml:description>
9598
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
9699
<dev:type>
@@ -1427,7 +1430,8 @@
14271430
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
14281431
<maml:name>Environment</maml:name>
14291432
<maml:description>
1430-
<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>
1433+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
1434+
<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>
14311435
</maml:description>
14321436
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
14331437
</command:parameter>
@@ -1458,7 +1462,8 @@
14581462
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
14591463
<maml:name>Environment</maml:name>
14601464
<maml:description>
1461-
<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>
1465+
<maml:para>Specifies the Azure environment. Valid values are: AzureCloud, AzureChinaCloud, AzureUSGovernment. The default is AzureCloud. This parameter is optional.</maml:para>
1466+
<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>
14621467
</maml:description>
14631468
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
14641469
<dev:type>

0 commit comments

Comments
 (0)