Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ public sealed class FindAzureResourceCmdlet : ResourceManagerCmdletBase
[ValidateNotNullOrEmpty]
public string ODataQuery { get; set; }

/// <summary>
/// Gets or sets the tag name.
/// </summary>
[Parameter(ParameterSetName = FindAzureResourceCmdlet.ListResourcesParameterSet, Mandatory = false, HelpMessage = "The name of the tag to query by.")]
[Parameter(ParameterSetName = FindAzureResourceCmdlet.MultiSubscriptionListResourcesParameterSet, Mandatory = false, HelpMessage = "The name of the tag to query by.")]
[ValidateNotNullOrEmpty]
public string TagName { get; set; }

/// <summary>
/// Gets or sets the tag value.
/// </summary>
[Parameter(ParameterSetName = FindAzureResourceCmdlet.ListResourcesParameterSet, Mandatory = false, HelpMessage = "The value of the tag to query by.")]
[Parameter(ParameterSetName = FindAzureResourceCmdlet.MultiSubscriptionListResourcesParameterSet, Mandatory = false, HelpMessage = "The value of the tag to query by.")]
[ValidateNotNullOrEmpty]
public string TagValue { get; set; }

/// <summary>
/// Gets or sets the resource group name.
/// </summary>
Expand Down Expand Up @@ -237,8 +253,8 @@ private async Task<ResponseWithContinuation<JObject[]>> ListResourcesTypeCollect
var odataQuery = QueryFilterBuilder.CreateFilter(
resourceType: null,
resourceName: null,
tagName: null,
tagValue: null,
tagName: this.TagName,
tagValue: this.TagValue,
filter: this.ODataQuery,
resourceGroupNameContains: this.ResourceGroupNameContains,
nameContains: this.ResourceGroupNameContains);
Expand All @@ -264,8 +280,8 @@ private async Task<ResponseWithContinuation<JObject[]>> ListResourcesInTenant()
resourceGroup: null,
resourceType: this.ResourceType,
resourceName: null,
tagName: null,
tagValue: null,
tagName: this.TagName,
tagValue: this.TagValue,
filter: this.ODataQuery,
resourceGroupNameContains: this.ResourceGroupNameContains,
nameContains: this.ResourceNameContains);
Expand Down Expand Up @@ -293,8 +309,8 @@ private async Task<ResponseWithContinuation<JObject[]>> ListResourcesInResourceG
.CreateFilter(
resourceType: this.ResourceType,
resourceName: null,
tagName: null,
tagValue: null,
tagName: this.TagName,
tagValue: this.TagValue,
filter: this.ODataQuery,
resourceGroupNameContains: this.ResourceGroupNameContains,
nameContains: this.ResourceNameContains);
Expand Down Expand Up @@ -324,8 +340,8 @@ private async Task<ResponseWithContinuation<JObject[]>> ListResourcesInSubscript
.CreateFilter(
resourceType: this.ResourceType,
resourceName: null,
tagName: null,
tagValue: null,
tagName: this.TagName,
tagValue: this.TagValue,
filter: this.ODataQuery,
nameContains: this.ResourceNameContains);

Expand Down Expand Up @@ -466,7 +482,9 @@ private bool IsResourceGroupLevelQuery()
{
return this.SubscriptionId.HasValue &&
this.ResourceGroupNameContains != null &&
(this.ResourceType != null ||
(this.TagName != null ||
this.TagValue != null ||
this.ResourceType != null ||
this.ExtensionResourceType != null);
}
}
Expand Down