Skip to content

Find Tags, find CommandName and find DSCResourceName impl #858

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 3 commits into from
Nov 11, 2022
Merged

Find Tags, find CommandName and find DSCResourceName impl #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
217174d
Add implementation for find command and find dscresource
alerickson Nov 11, 2022
e9bbea7
Update FIndPSResource to include new parameter set
alerickson Nov 11, 2022
a024623
Add some bug fixes and clean up a bit
alerickson Nov 11, 2022
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
22 changes: 22 additions & 0 deletions src/PSGet.Format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,28 @@
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>PSCommandResourceInfo</Name>
<ViewSelectedBy>
<TypeName>Microsoft.PowerShell.PowerShellGet.UtilClasses.PSCommandResourceInfo</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader><Label>Name</Label></TableColumnHeader>
<TableColumnHeader><Label>Package Name</Label></TableColumnHeader>
<TableColumnHeader><Label>Version</Label></TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem><PropertyName>Names</PropertyName></TableColumnItem>
<TableColumnItem><ScriptBlock>$_.ParentResource.Name</ScriptBlock></TableColumnItem>
<TableColumnItem><ScriptBlock>$_.ParentResource.Version</ScriptBlock></TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>PSIncludedResourceInfoTable</Name>
<ViewSelectedBy>
Expand Down
165 changes: 163 additions & 2 deletions src/code/FindHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ public List<PSResourceInfo> FindByResourceName(
return foundPackages;
}

_pkgsLeftToFind = name.ToList();
_pkgsLeftToFind = new List<string>(name);

// Error out if repository array of names to be searched contains wildcards.
if (repository != null)
{
repository = Utils.ProcessNameWildcards(repository, out string[] errorMsgs, out _repositoryNameContainsWildcard);
repository = Utils.ProcessNameWildcards(repository, removeWildcardEntries:false, out string[] errorMsgs, out _repositoryNameContainsWildcard);
foreach (string error in errorMsgs)
{
_cmdletPassedIn.WriteError(new ErrorRecord(
Expand Down Expand Up @@ -154,6 +154,161 @@ public List<PSResourceInfo> FindByResourceName(
return foundPackages;
}

public List<PSCommandResourceInfo> FindCommandOrDscResource(
ResourceType type,
SwitchParameter prerelease,
string[] tag,
string[] repository,
PSCredential credential)
{
_type = type;
_prerelease = prerelease;
_tag = tag;
_credential = credential;

List<PSCommandResourceInfo> foundPackages = new List<PSCommandResourceInfo>();
List<string> cmdsLeftToFind = new List<string>(tag);

if (tag.Length == 0)
{
return foundPackages;
}

// Error out if repository array of names to be searched contains wildcards.
if (repository != null)
{
repository = Utils.ProcessNameWildcards(repository, removeWildcardEntries:false, out string[] errorMsgs, out _repositoryNameContainsWildcard);
foreach (string error in errorMsgs)
{
_cmdletPassedIn.WriteError(new ErrorRecord(
new PSInvalidOperationException(error),
"ErrorFilteringNamesForUnsupportedWildcards",
ErrorCategory.InvalidArgument,
this));
}
}

// Get repositories to search.
List<PSRepositoryInfo> repositoriesToSearch;
try
{
repositoriesToSearch = RepositorySettings.Read(repository, out string[] errorList);
foreach (string error in errorList)
{
_cmdletPassedIn.WriteError(new ErrorRecord(
new PSInvalidOperationException(error),
"ErrorGettingSpecifiedRepo",
ErrorCategory.InvalidOperation,
this));
}
}
catch (Exception e)
{
_cmdletPassedIn.ThrowTerminatingError(new ErrorRecord(
new PSInvalidOperationException(e.Message),
"ErrorLoadingRepositoryStoreFile",
ErrorCategory.InvalidArgument,
this));

return foundPackages;
}

for (int i = 0; i < repositoriesToSearch.Count && cmdsLeftToFind.Any(); i++)
{
_cmdletPassedIn.WriteVerbose(string.Format("Searching in repository {0}", repositoriesToSearch[i].Name));
if (repositoriesToSearch[i].ApiVersion == PSRepositoryInfo.APIVersion.v2)
{
foreach (PSCommandResourceInfo cmdInfo in HttpFindCmdOrDsc(repositoriesToSearch[i], _type))
{
foundPackages.Add(cmdInfo);

foreach (string cmd in cmdInfo.Names)
{
cmdsLeftToFind.Remove(cmd);
}
}
}
}

return foundPackages;
}

public List<PSResourceInfo> FindTag(
ResourceType type,
SwitchParameter prerelease,
string[] tag,
string[] repository,
PSCredential credential)
{
_type = type;
_prerelease = prerelease;
_tag = tag;
_credential = credential;

List<PSResourceInfo> foundPackages = new List<PSResourceInfo>();
List<string> tagsLeftToFind = new List<string>(tag);

if (tag.Length == 0)
{
return foundPackages;
}

// Error out if repository array of names to be searched contains wildcards.
if (repository != null)
{
repository = Utils.ProcessNameWildcards(repository, removeWildcardEntries:false, out string[] errorMsgs, out _repositoryNameContainsWildcard);
foreach (string error in errorMsgs)
{
_cmdletPassedIn.WriteError(new ErrorRecord(
new PSInvalidOperationException(error),
"ErrorFilteringNamesForUnsupportedWildcards",
ErrorCategory.InvalidArgument,
this));
}
}

// Get repositories to search.
List<PSRepositoryInfo> repositoriesToSearch;
try
{
repositoriesToSearch = RepositorySettings.Read(repository, out string[] errorList);
foreach (string error in errorList)
{
_cmdletPassedIn.WriteError(new ErrorRecord(
new PSInvalidOperationException(error),
"ErrorGettingSpecifiedRepo",
ErrorCategory.InvalidOperation,
this));
}
}
catch (Exception e)
{
_cmdletPassedIn.ThrowTerminatingError(new ErrorRecord(
new PSInvalidOperationException(e.Message),
"ErrorLoadingRepositoryStoreFile",
ErrorCategory.InvalidArgument,
this));

return foundPackages;
}

for (int i = 0; i < repositoriesToSearch.Count && tagsLeftToFind.Any(); i++)
{
_cmdletPassedIn.WriteVerbose(string.Format("Searching in repository {0}", repositoriesToSearch[i].Name));
if (repositoriesToSearch[i].ApiVersion == PSRepositoryInfo.APIVersion.v2)
{
// tag1, tag2, tag3

// TODO: didn't really finsh come back here
foreach (PSResourceInfo cmdInfo in HttpSearchFromRepository(repositoriesToSearch[i]))
{
foundPackages.Add(cmdInfo);
}
}
}

return foundPackages;
}
#endregion

#region Private methods
Expand Down Expand Up @@ -701,6 +856,12 @@ private PSResourceInfo[] HttpFindTags(PSRepositoryInfo repository, ResourceType
// TODO: write out error
}

private PSCommandResourceInfo[] HttpFindCmdOrDsc(PSRepositoryInfo repository, ResourceType type)
{
return _httpFindPSResource.FindCommandOrDscResource(_tag, repository, _prerelease, type, out string errRecord);
// TODO: write out error
}

private List<PSResourceInfo> FindDependencyPackages(
PSResourceInfo currentPkg,
PackageMetadataResource packageMetadataResource,
Expand Down
Loading