pulled upstream changes

Author: KirkMunro

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

@@ -53,6 +53,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeStoreFileSystemEndpointSuffix = AzureEnvironmentConstants.AzureDataLakeStoreFileSystemEndpointSuffix,
                     GraphEndpointResourceId = AzureEnvironmentConstants.AzureGraphEndpoint,
                     DataLakeEndpointResourceId = AzureEnvironmentConstants.AzureDataLakeServiceEndpointResourceId,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.BatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             },
@@ -77,6 +78,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.ChinaGraphEndpoint,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             },
@@ -101,6 +103,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.USGovernmentGraphEndpoint,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             },
@@ -125,6 +128,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
+                    BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
                     AdTenant = "Common"
                 }
             }
@@ -228,6 +232,11 @@ public AzureEnvironment(IAzureEnvironment other)
         /// </summary>
         public string DataLakeEndpointResourceId { get; set; }
 
+        /// <summary>
+        /// The token audience required for communicating with the Batch service in this enviornment
+        /// </summary>
+        public string BatchEndpointResourceId { get; set; }
+
         /// <summary>
         /// The domain name suffix for Azure DataLake Catalog and Job services created in this environment
         /// </summary>
@@ -275,7 +284,8 @@ public static class Endpoint
                 ManagementPortalUrl = "ManagementPortalUrl",
                 AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix",
                 AzureDataLakeStoreFileSystemEndpointSuffix = "AzureDataLakeStoreFileSystemEndpointSuffix",
-                DataLakeEndpointResourceId = "DataLakeEndpointResourceId";
+                DataLakeEndpointResourceId = "DataLakeEndpointResourceId",
+                BatchEndpointResourceId = "BatchEndpointResourceId";
 
         }
     }

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs

@@ -125,5 +125,10 @@ public static class AzureEnvironmentConstants
         /// The token audience for authorizing DataLake requests
         /// </summary>
         public const string AzureDataLakeServiceEndpointResourceId = "https://datalake.azure.net";
+
+        public const string BatchEndpointResourceId = "https://batch.core.windows.net/";
+        public const string ChinaBatchEndpointResourceId = "https://batch.chinacloudapi.cn/";
+        public const string USGovernmentBatchEndpointResourceId = "https://batch.core.usgovcloudapi.net/";
+        public const string GermanBatchEndpointResourceId = "https://batch.cloudapi.de/";
     }
 }

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -65,6 +65,9 @@ public static bool TryGetEndpointUrl(this IAzureEnvironment environment, string
                 case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
                     endpoint = new Uri(environment.DataLakeEndpointResourceId);
                     break;
+                case AzureEnvironment.Endpoint.BatchEndpointResourceId:
+                    endpoint = new Uri(environment.BatchEndpointResourceId);
+                    break;
                 default:
                     result = false;
                     break;
@@ -138,6 +141,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
                     case AzureEnvironment.Endpoint.ServiceManagement:
                         propertyValue = environment.ServiceManagementUrl;
                         break;
+                    case AzureEnvironment.Endpoint.BatchEndpointResourceId:
+                        propertyValue = environment.BatchEndpointResourceId;
+                        break;
                     default:
                         break;
                 }
@@ -226,6 +232,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                     case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
                         environment.DataLakeEndpointResourceId = propertyValue;
                         break;
+                    case AzureEnvironment.Endpoint.BatchEndpointResourceId:
+                        environment.BatchEndpointResourceId = propertyValue;
+                        break;
                     case AzureEnvironment.Endpoint.ActiveDirectory:
                         environment.ActiveDirectoryAuthority = propertyValue;
                         break;
@@ -440,6 +449,10 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
                     environment.AzureKeyVaultServiceEndpointResourceId =
                          other.AzureKeyVaultServiceEndpointResourceId;
                 }
+                if (other.IsEndpointSet(AzureEnvironment.Endpoint.BatchEndpointResourceId))
+                {
+                    environment.BatchEndpointResourceId = other.BatchEndpointResourceId;
+                }
 
                 environment.VersionProfiles.Clear();
                 foreach (var profile in other.VersionProfiles)

src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IAzureEnvironment.cs

@@ -107,6 +107,11 @@ public interface IAzureEnvironment : IExtensibleModel
         /// </summary>
         string DataLakeEndpointResourceId { get; set; }
 
+        /// <summary>
+        /// The token audience required to authenticate with the Azure Batch service
+        /// </summary>
+        string BatchEndpointResourceId { get; set; }
+
         /// <summary>
         ///  The domain name suffix for Azure DataLake Catalog and Job services
         /// </summary>

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/Models/PSAzureEnvironment.cs

@@ -95,6 +95,7 @@ public PSAzureEnvironment(PSObject other)
             AzureDataLakeStoreFileSystemEndpointSuffix = other.GetProperty<string>(nameof(AzureDataLakeStoreFileSystemEndpointSuffix));
             AzureKeyVaultDnsSuffix = other.GetProperty<string>(nameof(AzureKeyVaultDnsSuffix));
             AzureKeyVaultServiceEndpointResourceId = other.GetProperty<string>(nameof(AzureKeyVaultServiceEndpointResourceId));
+            BatchEndpointResourceId = other.GetProperty<string>(nameof(BatchEndpointResourceId));
             DataLakeEndpointResourceId = other.GetProperty<string>(nameof(DataLakeEndpointResourceId));
             GalleryUrl = other.GetProperty<string>(nameof(GalleryUrl));
             GraphEndpointResourceId = other.GetProperty<string>(nameof(GraphEndpointResourceId));
@@ -227,6 +228,11 @@ public bool OnPremise
 
         public IDictionary<string, string> ExtendedProperties { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
+        /// <summary>
+        /// Gets or sets the Azure Batch AD resource ID.
+        /// </summary>
+        public string BatchEndpointResourceId { get; set; }
+
         /// <summary>
         /// Determine equality of two PSAzureEnvironment instances.
         /// </summary>
@@ -253,7 +259,8 @@ public override bool Equals(object obj)
                        && SqlDatabaseDnsSuffix == other.SqlDatabaseDnsSuffix
                        && AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix == other.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix
                        && AzureDataLakeStoreFileSystemEndpointSuffix == other.AzureDataLakeStoreFileSystemEndpointSuffix
-                       && TrafficManagerDnsSuffix == other.TrafficManagerDnsSuffix;
+                       && TrafficManagerDnsSuffix == other.TrafficManagerDnsSuffix
+                       && BatchEndpointResourceId == other.BatchEndpointResourceId;
             }
 
             return false;

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/help/Get-AzureRmDataLakeAnalyticsAccount.md

@@ -111,7 +111,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ### PSDataLakeAnalyticsAccount
 The specified account details.
 
-### List<PSDataLakeAnalyticsAccount>
+### List<PSDataLakeAnalyticsAccountBasic>
 The list of accounts in the specified resource group or subscription.
 
 ## NOTES

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/help/Get-AzureRmDataLakeAnalyticsJob.md

@@ -292,7 +292,7 @@ Parameter 'JobId' accepts value of type 'Guid' from the pipeline
 ### JobInformation
 The specified job information details
 
-### List<JobInformation>
+### List<PSJobInformationBasic>
 The list of jobs in the specified Data Lake Analytics account.
 
 ## NOTES

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/help/Get-AzureRmDataLakeStoreAccount.md

@@ -111,7 +111,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ### PSDataLakeStoreAccount
 The specific Data Lake Store account asked for.
 
-### List<PSDataLakeStoreAccount>
+### List<PSDataLakeStoreAccountBasic>
 A list of Data Lake Store accounts in the resource group or subscription specified.
 
 ## NOTES

src/ResourceManager/EventGrid/Commands.EventGrid/help/Get-AzureRmEventGridSubscription.md

@@ -15,24 +15,27 @@ Gets the details of an event subscription, or gets a list of all event subscript
 ### EventSubscriptionTopicNameParameterSet (Default)
 ```
 Get-AzureRmEventGridSubscription [[-EventSubscriptionName] <String>] [[-ResourceGroupName] <String>]
- [[-TopicName] <String>] [-IncludeFullEndpointUrl] [<CommonParameters>]
+ [[-TopicName] <String>] [-IncludeFullEndpointUrl] [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ### ResourceIdEventSubscriptionParameterSet
 ```
 Get-AzureRmEventGridSubscription [[-EventSubscriptionName] <String>] [-ResourceId] <String>
- [-IncludeFullEndpointUrl] [<CommonParameters>]
+ [-IncludeFullEndpointUrl] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### EventSubscriptionTopicTypeNameParameterSet
 ```
 Get-AzureRmEventGridSubscription [[-ResourceGroupName] <String>] [[-TopicTypeName] <String>]
- [[-Location] <String>] [-IncludeFullEndpointUrl] [<CommonParameters>]
+ [[-Location] <String>] [-IncludeFullEndpointUrl] [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ### EventSubscriptionInputObjectSet
 ```
-Get-AzureRmEventGridSubscription [-InputObject] <PSTopic> [<CommonParameters>]
+Get-AzureRmEventGridSubscription [-InputObject] <PSTopic> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -121,6 +124,21 @@ Gets the list of all event subscriptions created for the specific resource group
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with azure
+
+```yaml
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -EventSubscriptionName
 The name of the event subscription
 

src/ResourceManager/EventGrid/Commands.EventGrid/help/Get-AzureRmEventGridTopic.md

@@ -12,19 +12,22 @@ Gets the details of an Event Grid topic, or gets a list of all Event Grid topics
 
 ## SYNTAX
 
-### TopicNameParameterSet (Default)
+### ResourceGroupNameParameterSet (Default)
 ```
-Get-AzureRmEventGridTopic [-ResourceGroupName] <String> [-Name] <String> [<CommonParameters>]
+Get-AzureRmEventGridTopic [[-ResourceGroupName] <String>] [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
-### ResourceGroupNameParameterSet
+### TopicNameParameterSet
 ```
-Get-AzureRmEventGridTopic [[-ResourceGroupName] <String>] [<CommonParameters>]
+Get-AzureRmEventGridTopic [-ResourceGroupName] <String> [-Name] <String>
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### ResourceIdEventSubscriptionParameterSet
 ```
-Get-AzureRmEventGridTopic [-ResourceId] <String> [<CommonParameters>]
+Get-AzureRmEventGridTopic [-ResourceId] <String> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -64,6 +67,21 @@ List all the Event Grid topics in the subscription.
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with azure
+
+```yaml
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 EventGrid Topic Name.
 
@@ -84,10 +102,10 @@ Resource Group Name.
 
 ```yaml
 Type: String
-Parameter Sets: TopicNameParameterSet
+Parameter Sets: ResourceGroupNameParameterSet
 Aliases: ResourceGroup
 
-Required: True
+Required: False
 Position: 0
 Default value: None
 Accept pipeline input: True (ByPropertyName)
@@ -96,10 +114,10 @@ Accept wildcard characters: False
 
 ```yaml
 Type: String
-Parameter Sets: ResourceGroupNameParameterSet
+Parameter Sets: TopicNameParameterSet
 Aliases: ResourceGroup
 
-Required: False
+Required: True
 Position: 0
 Default value: None
 Accept pipeline input: True (ByPropertyName)

src/ResourceManager/EventGrid/Commands.EventGrid/help/Get-AzureRmEventGridTopicKey.md

@@ -14,17 +14,20 @@ Gets the shared access keys used to publish events to an Event Grid topic.
 
 ### TopicNameParameterSet (Default)
 ```
-Get-AzureRmEventGridTopicKey [-ResourceGroupName] <String> [-Name] <String> [<CommonParameters>]
+Get-AzureRmEventGridTopicKey [-ResourceGroupName] <String> [-Name] <String>
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### TopicInputObjectParameterSet
 ```
-Get-AzureRmEventGridTopicKey [-InputObject] <PSTopic> [<CommonParameters>]
+Get-AzureRmEventGridTopicKey [-InputObject] <PSTopic> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ### ResourceIdEventSubscriptionParameterSet
 ```
-Get-AzureRmEventGridTopicKey [-ResourceId] <String> [<CommonParameters>]
+Get-AzureRmEventGridTopicKey [-ResourceId] <String> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -48,6 +51,21 @@ Gets the shared access keys of Event Grid topic \`Topic1\` in resource group \`M
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with azure
+
+```yaml
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -InputObject
 EventGrid Topic object.
 

src/ResourceManager/EventGrid/Commands.EventGrid/help/Get-AzureRmEventGridTopicType.md

@@ -13,7 +13,8 @@ Gets the details about the topic types supported by Azure Event Grid.
 ## SYNTAX
 
 ```
-Get-AzureRmEventGridTopicType [[-Name] <String>] [-IncludeEventTypeData] [<CommonParameters>]
+Get-AzureRmEventGridTopicType [[-Name] <String>] [-IncludeEventTypeData]
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -47,6 +48,21 @@ Gets information about the StorageAccounts topic type, including the event types
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with azure
+
+```yaml
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -IncludeEventTypeData
 If specified, the response will include the event types supported by a topic type.