[Resources] Added ExpandProperties functionality to GetAzureResourceGroup

src/Resources/ResourceManager/Implementation/Resource/GetAzureResourceCmdlet.cs

@@ -171,7 +171,8 @@ private void RunSimpleCmdlet()
                 tagValue: null,
                 filter: this.ODataQuery);
 
-            var odataQuery = new Rest.Azure.OData.ODataQuery<GenericResourceFilter>(expression);
+            var odataQuery = new Rest.Azure.OData.ODataQuery<Azure.Management.Resources.Models.GenericResourceFilterWithExpand>(expression);
+            odataQuery.Expand = "createdTime,changedTime";
             var result = Enumerable.Empty<PSResource>();
             if (!ShouldListBySubscription(ResourceGroupName, Name))
             {

src/Resources/ResourceManager/SdkClient/NewResourceManagerSdkClient.cs

@@ -879,8 +879,7 @@ public virtual PSResourceGroup UpdatePSResourceGroup(PSUpdateResourceGroupParame
         public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable tag, bool detailed, string location = null)
         {
             List<PSResourceGroup> result = new List<PSResourceGroup>();
-
-            ODataQuery<ResourceGroupFilter> resourceGroupFilter = null;
+            ODataQuery<ResourceGroupFilterWithExpand> resourceGroupFilter = null;
 
             if (tag != null && tag.Count >= 1)
             {
@@ -891,9 +890,15 @@ public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable
                 }
 
                 resourceGroupFilter = string.IsNullOrEmpty(tagValuePair.Value)
-                    ? new ODataQuery<ResourceGroupFilter>(rgFilter => rgFilter.TagName == tagValuePair.Name)
-                    : new ODataQuery<ResourceGroupFilter>(rgFilter => rgFilter.TagName == tagValuePair.Name && rgFilter.TagValue == tagValuePair.Value);
+                    ? new ODataQuery<ResourceGroupFilterWithExpand>(rgFilter => rgFilter.TagName == tagValuePair.Name)
+                    : new ODataQuery<ResourceGroupFilterWithExpand>(rgFilter => rgFilter.TagName == tagValuePair.Name && rgFilter.TagValue == tagValuePair.Value);
             }
+            else
+            {
+                resourceGroupFilter = new ODataQuery<ResourceGroupFilterWithExpand>();
+            }
+
+            resourceGroupFilter.Expand = "createdTime,changedTime";
 
             if (string.IsNullOrEmpty(name) || WildcardPattern.ContainsWildcardCharacters(name))
             {
@@ -924,7 +929,7 @@ public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable
             {
                 try
                 {
-                    PSResourceGroup resourceGroup = ResourceManagementClient.ResourceGroups.Get(name).ToPSResourceGroup();
+                    PSResourceGroup resourceGroup = ResourceManagementClient.ResourceGroups.Get(name, expand: "createdTime,changedTime").ToPSResourceGroup();
                     if (string.IsNullOrEmpty(location) || resourceGroup.Location.EqualsAsLocation(location))
                     {
                         result.Add(resourceGroup);

src/Resources/ResourceManager/SdkClient/ResourceManagerSdkClient.cs

@@ -1155,25 +1155,25 @@ private void CancelDeploymentAtResourceGroup(List<PSDeployment> deployments, str
             }
         }
 
-        public virtual IEnumerable<PSResource> ListResources(Rest.Azure.OData.ODataQuery<GenericResourceFilter> filter = null, ulong first = ulong.MaxValue, ulong skip = ulong.MinValue)
+        public virtual IEnumerable<PSResource> ListResources(Rest.Azure.OData.ODataQuery<Azure.Management.Resources.Models.GenericResourceFilterWithExpand> filter = null, ulong first = ulong.MaxValue, ulong skip = ulong.MinValue)
         {
             return new GenericPageEnumerable<GenericResourceExpanded>(
                 delegate ()
                 {
-                    return ResourceManagementClient.Resources.List(filter);
+                    return ResourceManagementClient.Resources.List(filter?.Filter);
                 }, ResourceManagementClient.Resources.ListNext, first, skip).Select(r => new PSResource(r));
         }
 
         public virtual IEnumerable<PSResource> ListByResourceGroup(
             string resourceGroupName,
-            Rest.Azure.OData.ODataQuery<GenericResourceFilter> filter,
+            Rest.Azure.OData.ODataQuery<Azure.Management.Resources.Models.GenericResourceFilterWithExpand> filter,
             ulong first = ulong.MaxValue,
             ulong skip = ulong.MinValue)
         {
             return new GenericPageEnumerable<GenericResourceExpanded>(
                 delegate ()
                 {
-                    return ResourceManagementClient.Resources.ListByResourceGroup(resourceGroupName, filter);
+                    return ResourceManagementClient.Resources.ListByResourceGroup(resourceGroupName, filter?.Filter);
                 }, ResourceManagementClient.Resources.ListByResourceGroupNext, first, skip).Select(r => new PSResource(r));
         }
 

src/Resources/ResourceManager/SdkExtensions/NewResourcesExtensions.cs

@@ -44,7 +44,9 @@ public static PSResourceGroup ToPSResourceGroup(this ResourceGroup resourceGroup
                 ProvisioningState = resourceGroup.Properties == null ? null : resourceGroup.Properties.ProvisioningState,
                 Tags = TagsConversionHelper.CreateTagHashtable(resourceGroup.Tags),
                 ResourceId = resourceGroup.Id,
-                ManagedBy = resourceGroup.ManagedBy
+                ManagedBy = resourceGroup.ManagedBy,
+                CreatedTime = resourceGroup.CreatedTime,
+                ChangedTime = resourceGroup.ChangedTime
             };
 
             return result;

src/Resources/ResourceManager/SdkModels/ResourceGroups/PSResourceGroup.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -36,5 +37,9 @@ public string TagsTable
         public string ResourceId { get; set; }
 
         public string ManagedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public DateTime? ChangedTime { get; set; }
     }
 }

src/Resources/Resources.Management.Sdk/Generated/IResourceGroupsOperations.cs

@@ -99,6 +99,10 @@ public partial interface IResourceGroupsOperations
         /// <param name='resourceGroupName'>
         /// The name of the resource group to get. The name is case insensitive.
         /// </param>
+        /// <param name='expand'>
+        /// Comma-separated list of additional properties to be included in the
+        /// response. Valid values include createdTime, changedTime.
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -111,7 +115,7 @@ public partial interface IResourceGroupsOperations
         /// <exception cref="Microsoft.Rest.SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
-        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<ResourceGroup>> GetWithHttpMessagesAsync(string resourceGroupName, System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<ResourceGroup>> GetWithHttpMessagesAsync(string resourceGroupName, string expand = default(string), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Resource groups can be updated through a simple PATCH operation to a group
@@ -190,7 +194,7 @@ public partial interface IResourceGroupsOperations
         /// <exception cref="Microsoft.Rest.SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
-        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<Microsoft.Rest.Azure.IPage<ResourceGroup>>> ListWithHttpMessagesAsync(Microsoft.Rest.Azure.OData.ODataQuery<ResourceGroupFilter> odataQuery = default(Microsoft.Rest.Azure.OData.ODataQuery<ResourceGroupFilter>), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<Microsoft.Rest.Azure.IPage<ResourceGroup>>> ListWithHttpMessagesAsync(Microsoft.Rest.Azure.OData.ODataQuery<ResourceGroupFilterWithExpand> odataQuery = default(Microsoft.Rest.Azure.OData.ODataQuery<ResourceGroupFilterWithExpand>), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// When you delete a resource group, all of its resources are also deleted.

src/Resources/Resources.Management.Sdk/Generated/IResourcesOperations.cs

@@ -37,7 +37,7 @@ public partial interface IResourcesOperations
         /// <exception cref="Microsoft.Rest.SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
-        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<Microsoft.Rest.Azure.IPage<GenericResourceExpanded>>> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilter> odataQuery = default(Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilter>), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<Microsoft.Rest.Azure.IPage<GenericResourceExpanded>>> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilterWithExpand> odataQuery = default(Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilterWithExpand>), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// The resources to be moved must be in the same source resource group in the
@@ -128,7 +128,7 @@ public partial interface IResourcesOperations
         /// <exception cref="Microsoft.Rest.SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
-        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<Microsoft.Rest.Azure.IPage<GenericResourceExpanded>>> ListWithHttpMessagesAsync(Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilter> odataQuery = default(Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilter>), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<Microsoft.Rest.Azure.IPage<GenericResourceExpanded>>> ListWithHttpMessagesAsync(Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilterWithExpand> odataQuery = default(Microsoft.Rest.Azure.OData.ODataQuery<GenericResourceFilterWithExpand>), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Checks whether a resource exists.

src/Resources/Resources.Management.Sdk/Generated/Models/GenericResource.cs

@@ -59,7 +59,15 @@ public GenericResource()
 
         /// <param name="identity">The identity of the resource.
         /// </param>
-        public GenericResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), ExtendedLocation extendedLocation = default(ExtendedLocation), System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), Plan plan = default(Plan), object properties = default(object), string kind = default(string), string managedBy = default(string), Sku sku = default(Sku), Identity identity = default(Identity))
+
+        /// <param name="createdTime">The created time of the resource. This is only present if requested via the
+        /// $expand query parameter.
+        /// </param>
+
+        /// <param name="changedTime">The changed time of the resource. This is only present if requested via the
+        /// $expand query parameter.
+        /// </param>
+        public GenericResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), ExtendedLocation extendedLocation = default(ExtendedLocation), System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), Plan plan = default(Plan), object properties = default(object), string kind = default(string), string managedBy = default(string), Sku sku = default(Sku), Identity identity = default(Identity), System.DateTime? createdTime = default(System.DateTime?), System.DateTime? changedTime = default(System.DateTime?))
 
         : base(id, name, type, location, extendedLocation, tags)
         {
@@ -69,6 +77,8 @@ public GenericResource()
             this.ManagedBy = managedBy;
             this.Sku = sku;
             this.Identity = identity;
+            this.CreatedTime = createdTime;
+            this.ChangedTime = changedTime;
             CustomInit();
         }
 
@@ -113,6 +123,20 @@ public GenericResource()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "identity")]
         public Identity Identity {get; set; }
+
+        /// <summary>
+        /// Gets the created time of the resource. This is only present if requested
+        /// via the $expand query parameter.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "createdTime")]
+        public System.DateTime? CreatedTime {get; private set; }
+
+        /// <summary>
+        /// Gets the changed time of the resource. This is only present if requested
+        /// via the $expand query parameter.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "changedTime")]
+        public System.DateTime? ChangedTime {get; private set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Resources/Resources.Management.Sdk/Generated/Models/GenericResourceExpanded.cs

@@ -73,10 +73,8 @@ public GenericResourceExpanded()
         /// </param>
         public GenericResourceExpanded(string id = default(string), string name = default(string), string type = default(string), string location = default(string), ExtendedLocation extendedLocation = default(ExtendedLocation), System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), Plan plan = default(Plan), object properties = default(object), string kind = default(string), string managedBy = default(string), Sku sku = default(Sku), Identity identity = default(Identity), System.DateTime? createdTime = default(System.DateTime?), System.DateTime? changedTime = default(System.DateTime?), string provisioningState = default(string))
 
-        : base(id, name, type, location, extendedLocation, tags, plan, properties, kind, managedBy, sku, identity)
+        : base(id, name, type, location, extendedLocation, tags, plan, properties, kind, managedBy, sku, identity, createdTime, changedTime)
         {
-            this.CreatedTime = createdTime;
-            this.ChangedTime = changedTime;
             this.ProvisioningState = provisioningState;
             CustomInit();
         }
@@ -87,20 +85,6 @@ public GenericResourceExpanded()
         partial void CustomInit();
 
 
-        /// <summary>
-        /// Gets the created time of the resource. This is only present if requested
-        /// via the $expand query parameter.
-        /// </summary>
-        [Newtonsoft.Json.JsonProperty(PropertyName = "createdTime")]
-        public System.DateTime? CreatedTime {get; private set; }
-
-        /// <summary>
-        /// Gets the changed time of the resource. This is only present if requested
-        /// via the $expand query parameter.
-        /// </summary>
-        [Newtonsoft.Json.JsonProperty(PropertyName = "changedTime")]
-        public System.DateTime? ChangedTime {get; private set; }
-
         /// <summary>
         /// Gets the provisioning state of the resource. This is only present if
         /// requested via the $expand query parameter.

src/Resources/Resources.Management.Sdk/Generated/Models/GenericResourceFilterWithExpand.cs

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Resources.Models
+{
+    using System.Linq;
+
+    public partial class GenericResourceFilterWithExpand : GenericResourceFilter
+    {
+        /// <summary>
+        /// Initializes a new instance of the GenericResourceFilterWithExpand class.
+        /// </summary>
+        public GenericResourceFilterWithExpand()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the GenericResourceFilterWithExpand class.
+        /// </summary>
+
+        /// <param name="resourceType">The resource type.
+        /// </param>
+
+        /// <param name="tagname">The tag name.
+        /// </param>
+
+        /// <param name="tagvalue">The tag value.
+        /// </param>
+
+        /// <param name="expand">Comma-separated list of additional properties to be included in the
+        /// response. Valid values include createdTime, changedTime.
+        /// </param>
+        public GenericResourceFilterWithExpand(string resourceType = default(string), string tagname = default(string), string tagvalue = default(string), string expand = default(string))
+
+        : base(resourceType, tagname, tagvalue)
+        {
+            this.Expand = expand;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+
+        /// <summary>
+        /// Gets or sets comma-separated list of additional properties to be included
+        /// in the response. Valid values include createdTime, changedTime.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "$expand")]
+        public string Expand {get; set; }
+    }
+}