update ResponseUtil.ConvertToPSResourceResult() to take a bool parameter to eval if resource name contained wildcard when assessing if pkg version is unlisted

anamnavi · anamnavi · commit 921fa080d670 · 2025-08-20T23:25:44.000-04:00
diff --git a/src/code/ContainerRegistryResponseUtil.cs b/src/code/ContainerRegistryResponseUtil.cs
@@ -28,7 +28,7 @@ public ContainerRegistryResponseUtil(PSRepositoryInfo repository) : base(reposit
 
         #region Overriden Methods
 
-        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)
+        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)
         {
             Hashtable[] responses = responseResults.HashtableResponse;
             foreach (Hashtable response in responses)
diff --git a/src/code/FindHelper.cs b/src/code/FindHelper.cs
@@ -689,6 +689,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
             ErrorRecord errRecord = null;
             List<PSResourceInfo> parentPkgs = new List<PSResourceInfo>();
             string tagsAsString = String.Empty;
+            bool isV2Resource = currentResponseUtil is V2ResponseUtil;
 
             _cmdletPassedIn.WriteDebug("In FindHelper::SearchByNames()");
             foreach (string pkgName in _pkgsLeftToFind.ToArray())
@@ -699,6 +700,12 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
                     {
                         _cmdletPassedIn.WriteDebug("No version specified, package name is '*'");
                         // Example: Find-PSResource -Name "*"
+
+                        // Note: Just for resources from V2 servers, specifically PSGallery, if the resource is unlisted and was requested non-explicitly 
+                        // (i.e requested name has wildcard) the resource should not be returned and ResponseUtil.ConvertToPSResourceResult() call needs to be informed of this.
+                        // In all other cases, return the resource regardless of whether it was requested explicitly or not.
+                        bool isResourceRequestedWithWildcard = isV2Resource;
+
                         FindResults responses = currentServer.FindAll(_prerelease, _type, out errRecord);
                         if (errRecord != null)
                         {
@@ -714,7 +721,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
                             continue;
                         }
 
-                        foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responseResults: responses))
+                        foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responseResults: responses, isResourceRequestedWithWildcard))
                         {
                             if (currentResult.exception != null && !currentResult.exception.Message.Equals(string.Empty))
                             {
@@ -745,6 +752,10 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
                         // Example: Find-PSResource -Name "Az*" -Tag "Storage"
                         _cmdletPassedIn.WriteDebug("No version specified, package name contains a wildcard.");
 
+                        // Note: Just for resources from V2 servers, specifically PSGallery, if the resource is unlisted and was requested non-explicitly 
+                        // (i.e requested name has wildcard) the resource should not be returned and ResponseUtil.ConvertToPSResourceResult() call needs to be informed of this.
+                        // In all other cases, return the resource regardless of whether it was requested explicitly or not.
+                        bool isResourceRequestedWithWildcard = isV2Resource;
                         FindResults responses = null;
                         if (_tag.Length == 0)
                         {
@@ -770,7 +781,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
                             continue;
                         }
 
-                        foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responses))
+                        foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responses, isResourceRequestedWithWildcard))
                         {
                             if (currentResult.exception != null && !currentResult.exception.Message.Equals(string.Empty))
                             {
diff --git a/src/code/LocalResponseUtil.cs b/src/code/LocalResponseUtil.cs
@@ -27,7 +27,7 @@ public LocalResponseUtil(PSRepositoryInfo repository) : base(repository)
         #endregion
 
         #region Overriden Methods
-        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)
+        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)
         {
             foreach (Hashtable response in responseResults.HashtableResponse)
             {
diff --git a/src/code/NuGetServerResponseUtil.cs b/src/code/NuGetServerResponseUtil.cs
@@ -26,7 +26,7 @@ public NuGetServerResponseUtil(PSRepositoryInfo repository) : base(repository)
         #endregion
 
         #region Overriden Methods
-        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)
+        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)
         {
             // in FindHelper:
             // serverApi.FindName() -> return responses, and out errRecord
diff --git a/src/code/ResponseUtil.cs b/src/code/ResponseUtil.cs
@@ -25,7 +25,7 @@ public ResponseUtil(PSRepositoryInfo repository)
 
         #region Methods
 
-        public abstract IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults);
+        public abstract IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false);
 
         #endregion
     
diff --git a/src/code/V2ResponseUtil.cs b/src/code/V2ResponseUtil.cs
@@ -28,7 +28,7 @@ public V2ResponseUtil(PSRepositoryInfo repository) : base(repository)
         #endregion
 
         #region Overriden Methods
-        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)
+        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)
         {
             // in FindHelper:
             // serverApi.FindName() -> return responses, and out errRecord
@@ -58,8 +58,9 @@ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResu
                         yield return new PSResourceResult(returnedObject: null, exception: parseException, isTerminatingError: false);
                     }
 
+                    // For V2 resources, specifically PSGallery, return unlisted version resources only when not requested with wildcard name
                     // Unlisted versions will have a published year as 1900 or earlier.
-                    if (!psGetInfo.PublishedDate.HasValue || psGetInfo.PublishedDate.Value.Year > 1900)
+                    if (!isResourceRequestedWithWildcard || !psGetInfo.PublishedDate.HasValue || psGetInfo.PublishedDate.Value.Year > 1900)
                     {
                         yield return new PSResourceResult(returnedObject: psGetInfo, exception: null, isTerminatingError: false);
                     }
diff --git a/src/code/V3ResponseUtil.cs b/src/code/V3ResponseUtil.cs
@@ -27,7 +27,7 @@ public V3ResponseUtil(PSRepositoryInfo repository) : base(repository)
 
         #region Overriden Methods
 
-        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)
+        public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)
         {
             // in FindHelper:
             // serverApi.FindName() -> return responses, and out errRecord

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public ContainerRegistryResponseUtil(PSRepositoryInfo repository) : base(reposit`
`28`	`28`
`29`	`29`	`#region Overriden Methods`
`30`	`30`
`31`		`- public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)`
	`31`	`+ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)`
`32`	`32`	`{`
`33`	`33`	`Hashtable[] responses = responseResults.HashtableResponse;`
`34`	`34`	`foreach (Hashtable response in responses)`
Original file line number	Diff line number	Diff line change
`@@ -689,6 +689,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R`
`689`	`689`	`ErrorRecord errRecord = null;`
`690`	`690`	`List<PSResourceInfo> parentPkgs = new List<PSResourceInfo>();`
`691`	`691`	`string tagsAsString = String.Empty;`
	`692`	`+ bool isV2Resource = currentResponseUtil is V2ResponseUtil;`
`692`	`693`
`693`	`694`	`_cmdletPassedIn.WriteDebug("In FindHelper::SearchByNames()");`
`694`	`695`	`foreach (string pkgName in _pkgsLeftToFind.ToArray())`
`@@ -699,6 +700,12 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R`
`699`	`700`	`{`
`700`	`701`	`_cmdletPassedIn.WriteDebug("No version specified, package name is '*'");`
`701`	`702`	`// Example: Find-PSResource -Name "*"`
	`703`	`+`
	`704`	`+ // Note: Just for resources from V2 servers, specifically PSGallery, if the resource is unlisted and was requested non-explicitly`
	`705`	`+ // (i.e requested name has wildcard) the resource should not be returned and ResponseUtil.ConvertToPSResourceResult() call needs to be informed of this.`
	`706`	`+ // In all other cases, return the resource regardless of whether it was requested explicitly or not.`
	`707`	`+ bool isResourceRequestedWithWildcard = isV2Resource;`
	`708`	`+`
`702`	`709`	`FindResults responses = currentServer.FindAll(_prerelease, _type, out errRecord);`
`703`	`710`	`if (errRecord != null)`
`704`	`711`	`{`
`@@ -714,7 +721,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R`
`714`	`721`	`continue;`
`715`	`722`	`}`
`716`	`723`
`717`		`- foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responseResults: responses))`
	`724`	`+ foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responseResults: responses, isResourceRequestedWithWildcard))`
`718`	`725`	`{`
`719`	`726`	`if (currentResult.exception != null && !currentResult.exception.Message.Equals(string.Empty))`
`720`	`727`	`{`
`@@ -745,6 +752,10 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R`
`745`	`752`	`// Example: Find-PSResource -Name "Az*" -Tag "Storage"`
`746`	`753`	`_cmdletPassedIn.WriteDebug("No version specified, package name contains a wildcard.");`
`747`	`754`
	`755`	`+ // Note: Just for resources from V2 servers, specifically PSGallery, if the resource is unlisted and was requested non-explicitly`
	`756`	`+ // (i.e requested name has wildcard) the resource should not be returned and ResponseUtil.ConvertToPSResourceResult() call needs to be informed of this.`
	`757`	`+ // In all other cases, return the resource regardless of whether it was requested explicitly or not.`
	`758`	`+ bool isResourceRequestedWithWildcard = isV2Resource;`
`748`	`759`	`FindResults responses = null;`
`749`	`760`	`if (_tag.Length == 0)`
`750`	`761`	`{`
`@@ -770,7 +781,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R`
`770`	`781`	`continue;`
`771`	`782`	`}`
`772`	`783`
`773`		`- foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responses))`
	`784`	`+ foreach (PSResourceResult currentResult in currentResponseUtil.ConvertToPSResourceResult(responses, isResourceRequestedWithWildcard))`
`774`	`785`	`{`
`775`	`786`	`if (currentResult.exception != null && !currentResult.exception.Message.Equals(string.Empty))`
`776`	`787`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public LocalResponseUtil(PSRepositoryInfo repository) : base(repository)`
`27`	`27`	`#endregion`
`28`	`28`
`29`	`29`	`#region Overriden Methods`
`30`		`- public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)`
	`30`	`+ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)`
`31`	`31`	`{`
`32`	`32`	`foreach (Hashtable response in responseResults.HashtableResponse)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public NuGetServerResponseUtil(PSRepositoryInfo repository) : base(repository)`
`26`	`26`	`#endregion`
`27`	`27`
`28`	`28`	`#region Overriden Methods`
`29`		`- public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)`
	`29`	`+ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)`
`30`	`30`	`{`
`31`	`31`	`// in FindHelper:`
`32`	`32`	`// serverApi.FindName() -> return responses, and out errRecord`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public V2ResponseUtil(PSRepositoryInfo repository) : base(repository)`
`28`	`28`	`#endregion`
`29`	`29`
`30`	`30`	`#region Overriden Methods`
`31`		`- public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)`
	`31`	`+ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)`
`32`	`32`	`{`
`33`	`33`	`// in FindHelper:`
`34`	`34`	`// serverApi.FindName() -> return responses, and out errRecord`
`@@ -58,8 +58,9 @@ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResu`
`58`	`58`	`yield return new PSResourceResult(returnedObject: null, exception: parseException, isTerminatingError: false);`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ // For V2 resources, specifically PSGallery, return unlisted version resources only when not requested with wildcard name`
`61`	`62`	`// Unlisted versions will have a published year as 1900 or earlier.`
`62`		`- if (!psGetInfo.PublishedDate.HasValue \|\| psGetInfo.PublishedDate.Value.Year > 1900)`
	`63`	`+ if (!isResourceRequestedWithWildcard \|\| !psGetInfo.PublishedDate.HasValue \|\| psGetInfo.PublishedDate.Value.Year > 1900)`
`63`	`64`	`{`
`64`	`65`	`yield return new PSResourceResult(returnedObject: psGetInfo, exception: null, isTerminatingError: false);`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public V3ResponseUtil(PSRepositoryInfo repository) : base(repository)`
`27`	`27`
`28`	`28`	`#region Overriden Methods`
`29`	`29`
`30`		`- public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)`
	`30`	`+ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults, bool isResourceRequestedWithWildcard = false)`
`31`	`31`	`{`
`32`	`32`	`// in FindHelper:`
`33`	`33`	`// serverApi.FindName() -> return responses, and out errRecord`