Skip to content

[Az.Ssh] Bug Fix #21082

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 2 commits into from
Mar 1, 2023
Merged

[Az.Ssh] Bug Fix #21082

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61b1401
Fix broken parameter sets
vthiebaut10 Mar 1, 2023
8b04736
Merge branch 'release-2023-03-07' into ssh-bug-fix-2023-03-07
BethanyZhou Mar 1, 2023
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
15 changes: 14 additions & 1 deletion src/Ssh/Ssh/Common/SshBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,19 @@ protected internal void ValidateParameters()

protected internal void SetResourceType()
{
if (ParameterSetName.Equals(IpAddressParameterSet))
{
ResourceType = "Microsoft.Compute/virtualMachines";
return;
}
if (ParameterSetName.Equals(ResourceIdParameterSet))
{
ResourceIdentifier idParser = new ResourceIdentifier(ResourceId);
ResourceGroupName = idParser.ResourceGroupName;
Name = idParser.ResourceName;
ResourceType = idParser.ResourceType;
}

var resourcetypefilter = supportedResourceTypes.Select(type => $"resourceType eq '{type}'").ToArray();
String filter = $"$filter=name eq '{Name}' and ({String.Join(" or ", resourcetypefilter)})";
ODataQuery<GenericResourceFilter> query = new ODataQuery<GenericResourceFilter>(filter);
Expand All @@ -390,7 +403,7 @@ protected internal void SetResourceType()

if (ResourceType != null)
{
if (!types.Contains(ResourceType))
if (!types.Contains(ResourceType, StringComparer.CurrentCultureIgnoreCase))
{
throw new AzPSResourceNotFoundCloudException(String.Format(Resources.ResourceNotFoundTypeProvided,Name, ResourceType, ResourceGroupName));
}
Expand Down