Merge pull request #1047 from vivsriaus/FindResource

Add Find-Resource cmdlet and test/help file

Author: amarzavery

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj

@@ -138,10 +138,11 @@
     <Compile Include="Handlers\TracingHandler.cs" />
     <Compile Include="Handlers\UserAgentHandler.cs" />
     <Compile Include="Implementation\GetAzureResourceGroupDeploymentOperationCmdlet.cs" />
-    <Compile Include="Implementation\GetAzureResourceLockCmdlet.cs" />
+    <Compile Include="Implementation\Lock\GetAzureResourceLockCmdlet.cs" />
     <Compile Include="Implementation\InvokeAzureResourceActionCmdlet.cs" />
-    <Compile Include="Implementation\MoveAzureResourceCmdlet.cs" />
-    <Compile Include="Implementation\NewAzureResourceLockCmdlet.cs" />
+    <Compile Include="Implementation\Resource\FindAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Resource\MoveAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Lock\NewAzureResourceLockCmdlet.cs" />
     <Compile Include="Implementation\Policy\GetAzurePolicyAssignment.cs" />
     <Compile Include="Implementation\Policy\GetAzurePolicyDefinition.cs" />
     <Compile Include="Implementation\Policy\NewAzurePolicyAssignment.cs" />
@@ -152,26 +153,26 @@
     <Compile Include="Implementation\Policy\RemoveAzurePolicyDefinition.cs" />
     <Compile Include="Implementation\Policy\SetAzurePolicyAssignment.cs" />
     <Compile Include="Implementation\Policy\SetAzurePolicyDefinition.cs" />
-    <Compile Include="Implementation\RemoveAzureResourceCmdlet.cs" />
-    <Compile Include="Implementation\RemoveAzureResourceLockCmdlet.cs" />
-    <Compile Include="Implementation\ResourceLockManagementCmdletBase.cs" />
-    <Compile Include="Implementation\SetAzureResourceCmdlet.cs" />
-    <Compile Include="Implementation\NewAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Resource\RemoveAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Lock\RemoveAzureResourceLockCmdlet.cs" />
+    <Compile Include="Implementation\Lock\ResourceLockManagementCmdletBase.cs" />
+    <Compile Include="Implementation\Resource\SetAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Resource\NewAzureResourceCmdlet.cs" />
     <Compile Include="Implementation\ResourceManipulationCmdletBase.cs" />
     <Compile Include="Components\ApiVersionHelper.cs" />
     <Compile Include="Extensions\ErrorResponseMessageExceptionExtensions.cs" />
     <Compile Include="Components\LongRunningOperationHelper.cs" />
     <Compile Include="Extensions\ResourceExtensions.cs" />
     <Compile Include="Extensions\JTokenExtensions.cs" />
     <Compile Include="Implementation\ResourceManagerCmdletBase.cs" />
-    <Compile Include="Implementation\SetAzureResourceLockCmdlet.cs" />
-    <Compile Include="Implementation\TestAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Lock\SetAzureResourceLockCmdlet.cs" />
+    <Compile Include="Implementation\Resource\TestAzureResourceCmdlet.cs" />
     <Compile Include="Implementation\TestAzureResourceGroupCmdlet.cs" />
     <Compile Include="Json\CamelCasePropertyNamesWithOverridesContractResolver.cs" />
     <Compile Include="Json\JsonPreserveCaseDictionaryAttribute.cs" />
     <Compile Include="Json\TimeSpanConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Implementation\GetAzureResourceCmdlet.cs" />
+    <Compile Include="Implementation\Resource\GetAzureResourceCmdlet.cs" />
     <Compile Include="RestClients\ResourceManagerRestClientBase.cs" />
     <Compile Include="RestClients\ResourceManagerRestRestClient.cs" />
     <Compile Include="Utilities\HttpUtility.cs" />

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/QueryFilterBuilder.cs

@@ -41,7 +41,9 @@ public static string CreateFilter(
             string resourceName,
             string tagName,
             string tagValue,
-            string filter)
+            string filter,
+            string nameContains = null,
+            string resourceGroupNameContains = null)
         {
             var filterStringBuilder = new StringBuilder();
 
@@ -72,7 +74,7 @@ public static string CreateFilter(
                 filterStringBuilder.AppendFormat("resourceGroup EQ '{0}'", resourceGroup);
             }
 
-            var remainderFilter = QueryFilterBuilder.CreateFilter(resourceType, resourceName, tagName, tagValue, filter);
+            var remainderFilter = QueryFilterBuilder.CreateFilter(resourceType, resourceName, tagName, tagValue, filter, nameContains, resourceGroupNameContains);
 
             if (filterStringBuilder.Length > 0 && !string.IsNullOrWhiteSpace(remainderFilter))
             {
@@ -92,9 +94,10 @@ public static string CreateFilter(
         /// <param name="tagName">The tag name.</param>
         /// <param name="tagValue">The tag value.</param>
         /// <param name="filter">The filter.</param>
-        public static string CreateFilter(string resourceType, string resourceName, string tagName, string tagValue, string filter)
+        public static string CreateFilter(string resourceType, string resourceName, string tagName, string tagValue, string filter, string nameContains=null, string resourceGroupNameContains=null)
         {
             var filterStringBuilder = new StringBuilder();
+            var substringStringBuilder = new StringBuilder();
 
             if (!string.IsNullOrWhiteSpace(resourceType))
             {
@@ -131,6 +134,26 @@ public static string CreateFilter(string resourceType, string resourceName, stri
                 filterStringBuilder.AppendFormat("tagValue EQ '{0}'", tagValue);
             }
 
+            if (!string.IsNullOrWhiteSpace(nameContains))
+            {
+                if (filterStringBuilder.Length > 0)
+                {
+                    filterStringBuilder.Append(" AND ");
+                }
+
+                filterStringBuilder.AppendFormat("substringof('{0}', name)", nameContains);
+            }
+
+            if (!string.IsNullOrWhiteSpace(resourceGroupNameContains))
+            {
+                if (filterStringBuilder.Length > 0)
+                {
+                    filterStringBuilder.Append(" AND ");
+                }
+
+                filterStringBuilder.AppendFormat("substringof('{0}', resourceGroup)", resourceGroupNameContains);
+            }
+
             if (!string.IsNullOrWhiteSpace(filter))
             {
                 filter = filter.Trim().TrimStart('?').TrimStart('&');