Skip to content

Add Find-Resource cmdlet and test/help file #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 2, 2015
Merged

Add Find-Resource cmdlet and test/help file #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3abfda8
Add Find-Resource cmdlet and test/help file
vivsriaus Oct 2, 2015
05c6a21
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Oct 2, 2015
6992987
Capture new test record
vivsriaus Oct 2, 2015
23f693d
Edit help for extension resource type
vivsriaus Oct 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions ...ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
29 changes: 26 additions & 3 deletions ...sourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/QueryFilterBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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))
{
Expand All @@ -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))
{
Expand Down Expand Up @@ -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('&');
Expand Down
0 ...lementation/GetAzureResourceLockCmdlet.cs → ...tation/Lock/GetAzureResourceLockCmdlet.cs
View file
Open in desktop
File renamed without changes.
0 ...lementation/NewAzureResourceLockCmdlet.cs → ...tation/Lock/NewAzureResourceLockCmdlet.cs
View file
Open in desktop
File renamed without changes.
0 ...entation/RemoveAzureResourceLockCmdlet.cs → ...ion/Lock/RemoveAzureResourceLockCmdlet.cs
View file
Open in desktop
File renamed without changes.
0 ...ation/ResourceLockManagementCmdletBase.cs → .../Lock/ResourceLockManagementCmdletBase.cs
View file
Open in desktop
File renamed without changes.
0 ...lementation/SetAzureResourceLockCmdlet.cs → ...tation/Lock/SetAzureResourceLockCmdlet.cs
View file
Open in desktop
File renamed without changes.
Loading