[Resources] Added ExpandProperties functionality to GetAzureResourceGroup

src/Resources/ResourceManager/Implementation/ResourceGroups/GetAzureResourceGroupCmdlet.cs

@@ -63,15 +63,19 @@ public class GetAzureResourceGroupCmdlet : ResourceManagerCmdletBaseWithApiVersi
         [ValidateNotNullOrEmpty]
         public Hashtable Tag { get; set; }
 
+        /// <summary>
+        /// Gets or sets the expand properties parameter.
+        /// </summary>
+        [Parameter(Mandatory = false, HelpMessage = "When specified, output includes CreatedTime and ChangedTime of a resource.")]
+        public SwitchParameter ExpandProperties { get; set; }
+
         protected override void OnProcessRecord()
         {
-            String subscriptionId = null;
             if (ResourceGroupIdParameterSet.Equals(ParameterSetName)){
                 ResourceIdentifier resourceIdentifier = ResourceIdentifier.FromResourceGroupIdentifier(this.Id);
                 Name = resourceIdentifier.ResourceGroupName;
-                subscriptionId = resourceIdentifier.Subscription;
             }
-            this.WriteObject(ResourceManagerSdkClient.FilterResourceGroups(name: this.Name, tag: this.Tag, detailed: false, location: this.Location, subscriptionId), true);
+            this.WriteObject(this.NewResourceManagerSdkClient.FilterResourceGroups(this.Name, this.Tag, false, this.Location, this.ExpandProperties), true);
         }
 
     }

src/Resources/ResourceManager/SdkClient/NewResourceManagerSdkClient.cs

@@ -875,14 +875,14 @@ public virtual PSResourceGroup UpdatePSResourceGroup(PSUpdateResourceGroupParame
         /// <param name="tag">The resource group tag.</param>
         /// <param name="detailed">Whether the  return is detailed or not.</param>
         /// <param name="location">The resource group location.</param>
+        /// <param name="expand">The expand parameter for optional response properties.</param>
         /// <returns>The filtered resource groups</returns>
-        public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable tag, bool detailed, string location = null)
+        public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable tag, bool detailed, string location = null, bool expand = false)
         {
             List<PSResourceGroup> result = new List<PSResourceGroup>();
+            var resourceGroupFilter = new ODataQuery<ResourceGroupFilterWithExpand>();
 
-            ODataQuery<ResourceGroupFilter> resourceGroupFilter = null;
-
-            if (tag != null && tag.Count >= 1)
+            if (tag?.Count >= 1)
             {
                 PSTagValuePair tagValuePair = TagsConversionHelper.Create(tag);
                 if (tagValuePair == null || tag.Count > 1)
@@ -891,8 +891,12 @@ 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);
+            }
+
+            if (expand) {
+                resourceGroupFilter.Expand = "createdTime,changedTime";
             }
 
             if (string.IsNullOrEmpty(name) || WildcardPattern.ContainsWildcardCharacters(name))
@@ -924,7 +928,10 @@ public virtual List<PSResourceGroup> FilterResourceGroups(string name, Hashtable
             {
                 try
                 {
-                    PSResourceGroup resourceGroup = ResourceManagementClient.ResourceGroups.Get(name).ToPSResourceGroup();
+                    PSResourceGroup resourceGroup = expand 
+                        ? ResourceManagementClient.ResourceGroups.Get(name, expand: "createdTime,changedTime").ToPSResourceGroup()
+                        : ResourceManagementClient.ResourceGroups.Get(name).ToPSResourceGroup();
+
                     if (string.IsNullOrEmpty(location) || resourceGroup.Location.EqualsAsLocation(location))
                     {
                         result.Add(resourceGroup);

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/Models/ResourceGroup.cs

@@ -45,7 +45,15 @@ public ResourceGroup()
 
         /// <param name="tags">The tags attached to the resource group.
         /// </param>
-        public ResourceGroup(string location, string id = default(string), string name = default(string), string type = default(string), ResourceGroupProperties properties = default(ResourceGroupProperties), string managedBy = default(string), System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>))
+
+        /// <param name="createdTime">The created time of the resource group. This is only present if requested
+        /// via the $expand query parameter.
+        /// </param>
+
+        /// <param name="changedTime">The changed time of the resource group. This is only present if requested
+        /// via the $expand query parameter.
+        /// </param>
+        public ResourceGroup(string location, string id = default(string), string name = default(string), string type = default(string), ResourceGroupProperties properties = default(ResourceGroupProperties), string managedBy = default(string), System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), System.DateTime? createdTime = default(System.DateTime?), System.DateTime? changedTime = default(System.DateTime?))
 
         {
             this.Id = id;
@@ -55,6 +63,8 @@ public ResourceGroup()
             this.Location = location;
             this.ManagedBy = managedBy;
             this.Tags = tags;
+            this.CreatedTime = createdTime;
+            this.ChangedTime = changedTime;
             CustomInit();
         }
 
@@ -107,6 +117,20 @@ public ResourceGroup()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "tags")]
         public System.Collections.Generic.IDictionary<string, string> Tags {get; set; }
+
+        /// <summary>
+        /// Gets the created time of the resource group. 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 group. 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/ResourceGroupFilterWithExpand.cs

@@ -0,0 +1,54 @@
+// 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 ResourceGroupFilterWithExpand : ResourceGroupFilter
+    {
+        /// <summary>
+        /// Initializes a new instance of the ResourceGroupFilterWithExpand class.
+        /// </summary>
+        public ResourceGroupFilterWithExpand()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ResourceGroupFilterWithExpand class.
+        /// </summary>
+
+        /// <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 ResourceGroupFilterWithExpand(string tagName = default(string), string tagValue = default(string), string expand = default(string))
+
+        : base(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; }
+    }
+}

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

@@ -521,6 +521,10 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
         /// <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'>
         /// Headers that will be added to request.
         /// </param>
@@ -542,7 +546,7 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async 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))
+        public async 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))
         {
 
 
@@ -577,6 +581,7 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
                 throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
 
+
             // Tracing
             bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -585,6 +590,7 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
                 _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
                 System.Collections.Generic.Dictionary<string, object> tracingParameters = new System.Collections.Generic.Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("expand", expand);
 
 
                 tracingParameters.Add("cancellationToken", cancellationToken);
@@ -602,6 +608,10 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(this.Client.ApiVersion)));
             }
+            if (expand != null)
+            {
+                _queryParameters.Add(string.Format("$expand={0}", System.Uri.EscapeDataString(expand)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -1014,7 +1024,7 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async 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))
+        public async 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))
         {
 
 
@@ -1053,10 +1063,10 @@ internal ResourceGroupsOperations (ResourceManagementClient client)
             System.Collections.Generic.List<string> _queryParameters = new System.Collections.Generic.List<string>();
             if (odataQuery != null)
             {
-                var _resourceGroupFilter = odataQuery.ToString();
-                if (!string.IsNullOrEmpty(_resourceGroupFilter))
+                var _resourceGroupFilterWithExpand = odataQuery.ToString();
+                if (!string.IsNullOrEmpty(_resourceGroupFilterWithExpand))
                 {
-                    _queryParameters.Add(_resourceGroupFilter);
+                    _queryParameters.Add(_resourceGroupFilterWithExpand);
                 }
             }
             if (this.Client.ApiVersion != null)