Skip to content

Commit bcb3460

Browse files
alericksonalerickson
committed
code and test clean ups
1 parent 416b947 commit bcb3460

7 files changed

Lines changed: 1285 additions & 1343 deletions

‎src/code/ContainerRegistryServerAPICalls.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ public ContainerRegistryServerAPICalls(PSRepositoryInfo repository, PSCmdlet cmd
8383

8484
public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type)
8585
{
86-
return null;
86+
throw new NotImplementedException("FindVersionAsync is not implemented for ContainerRegistryServerAPICalls.");
8787
}
8888

8989
public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest)
9090
{
91-
return null;
91+
throw new NotImplementedException("FindVersionGlobbingAsync is not implemented for ContainerRegistryServerAPICalls.");
9292
}
9393

9494
/// <summary>
@@ -159,7 +159,7 @@ public override FindResults FindName(string packageName, bool includePrerelease,
159159

160160
public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type)
161161
{
162-
return null;
162+
throw new NotImplementedException("FindNameAsync is not implemented for ContainerRegistryServerAPICalls.");
163163
}
164164

165165
/// <summary>

‎src/code/V3ServerAPICalls.cs‎

Lines changed: 7 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,7 @@ public override FindResults FindCommandOrDscResource(string[] tags, bool include
162162
public override FindResults FindName(string packageName, bool includePrerelease, ResourceType type, out ErrorRecord errRecord)
163163
{
164164
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindName()");
165-
var res = FindNameHelper(packageName, tags: Utils.EmptyStrArray, includePrerelease, type, out errRecord);
166-
_cmdletPassedIn.WriteDebug($"returned back to FindName()");
167-
168-
return res;
169-
165+
return FindNameHelper(packageName, tags: Utils.EmptyStrArray, includePrerelease, type, out errRecord);
170166
}
171167

172168
public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type)
@@ -183,11 +179,7 @@ public override Task<FindResults> FindNameAsync(string packageName, bool include
183179
public override FindResults FindNameWithTag(string packageName, string[] tags, bool includePrerelease, ResourceType type, out ErrorRecord errRecord)
184180
{
185181
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindNameWithTag()");
186-
var res = FindNameHelper(packageName, tags, includePrerelease, type, out errRecord);
187-
188-
_cmdletPassedIn.WriteDebug($"returned back to FIndNamewithtag");
189-
190-
return res;
182+
return FindNameHelper(packageName, tags, includePrerelease, type, out errRecord);
191183
}
192184

193185
/// <summary>
@@ -335,7 +327,6 @@ public override FindResults FindVersionWithTag(string packageName, string versio
335327
/// </summary>
336328
public override Stream InstallPackage(string packageName, string packageVersion, bool includePrerelease, out ErrorRecord errRecord)
337329
{
338-
// this can be called from inside concurrency
339330
//_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::InstallPackage()");
340331
Stream results = new MemoryStream();
341332
if (string.IsNullOrEmpty(packageVersion))
@@ -349,11 +340,7 @@ public override Stream InstallPackage(string packageName, string packageVersion,
349340
return results;
350341
}
351342

352-
results = InstallVersion(packageName, packageVersion, out errRecord);
353-
354-
//_cmdletPassedIn.WriteDebug("Returning from V3ServerAPICalls::InstallPackage()");
355-
356-
return results;
343+
return InstallVersion(packageName, packageVersion, out errRecord);
357344
}
358345

359346
#endregion
@@ -523,21 +510,10 @@ private FindResults FindNameHelper(string packageName, string[] tags, bool inclu
523510
bool isTagMatch = true;
524511
foreach (string response in versionedResponses)
525512
{
526-
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindNameHelper():: response");
527-
if (response == null)
528-
{
529-
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindNameHelper():: response is NULL");
530-
}
531-
else
532-
{
533-
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindNameHelper():: response is NOT null");
534-
}
535-
536513
try
537514
{
538515
using (JsonDocument pkgVersionEntry = JsonDocument.Parse(response))
539516
{
540-
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindNameHelper():: using 1");
541517
JsonElement rootDom = pkgVersionEntry.RootElement;
542518
if (!rootDom.TryGetProperty(versionName, out JsonElement pkgVersionElement))
543519
{
@@ -560,18 +536,14 @@ private FindResults FindNameHelper(string packageName, string[] tags, bool inclu
560536
return new FindResults(stringResponse: Utils.EmptyStrArray, hashtableResponse: emptyHashResponses, responseType: v3FindResponseType);
561537
}
562538

563-
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::FindNameHelper():: nuget parse version");
564-
565539
if (NuGetVersion.TryParse(pkgVersionElement.ToString(), out NuGetVersion pkgVersion))
566540
{
567541
_cmdletPassedIn.WriteDebug($"'{packageName}' version parsed as '{pkgVersion}'");
568542
if (!pkgVersion.IsPrerelease || includePrerelease)
569543
{
570-
_cmdletPassedIn.WriteDebug($"entered if statement");
571544
// Versions are always in descending order i.e 5.0.0, 3.0.0, 1.0.0 so grabbing the first match suffices
572545
latestVersionResponse = response;
573546
isTagMatch = IsRequiredTagSatisfied(tagsItem, tags, out errRecord);
574-
_cmdletPassedIn.WriteDebug($"right before break");
575547

576548
break;
577549
}
@@ -590,8 +562,6 @@ private FindResults FindNameHelper(string packageName, string[] tags, bool inclu
590562
}
591563
}
592564

593-
_cmdletPassedIn.WriteDebug($"FindNameHelper line 581");
594-
595565
if (String.IsNullOrEmpty(latestVersionResponse))
596566
{
597567
errRecord = new ErrorRecord(
@@ -603,8 +573,6 @@ private FindResults FindNameHelper(string packageName, string[] tags, bool inclu
603573
return new FindResults(stringResponse: Utils.EmptyStrArray, hashtableResponse: emptyHashResponses, responseType: v3FindResponseType);
604574
}
605575

606-
_cmdletPassedIn.WriteDebug($"Right before tag match");
607-
608576
// Check and write error for tags matching requirement. If no tags were required the isTagMatch variable will be true.
609577
if (!isTagMatch)
610578
{
@@ -620,8 +588,6 @@ private FindResults FindNameHelper(string packageName, string[] tags, bool inclu
620588
return new FindResults(stringResponse: Utils.EmptyStrArray, hashtableResponse: emptyHashResponses, responseType: v3FindResponseType);
621589
}
622590

623-
_cmdletPassedIn.WriteDebug($"return results");
624-
625591
return new FindResults(stringResponse: new string[] { latestVersionResponse }, hashtableResponse: emptyHashResponses, responseType: v3FindResponseType);
626592
}
627593

@@ -739,11 +705,7 @@ private FindResults FindVersionHelper(string packageName, string version, string
739705
private Stream InstallName(string packageName, out ErrorRecord errRecord)
740706
{
741707
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::InstallName()");
742-
var inst = InstallHelper(packageName, version: null, out errRecord);
743-
744-
_cmdletPassedIn.WriteDebug("Returning from V3ServerAPICalls::InstallName()");
745-
746-
return inst;
708+
return InstallHelper(packageName, version: null, out errRecord);
747709
}
748710

749711
/// <summary>
@@ -760,10 +722,6 @@ private Stream InstallVersion(string packageName, string version, out ErrorRecor
760722
if (!NuGetVersion.TryParse(version, out NuGetVersion requiredVersion))
761723
{
762724
//_cmdletPassedIn.WriteDebug("InstallVersion - could not parse version");
763-
if (string.IsNullOrEmpty(version))
764-
{
765-
//_cmdletPassedIn.WriteDebug("version is null or empty");
766-
}
767725
errRecord = new ErrorRecord(
768726
new ArgumentException($"Version {version} to be installed is not a valid NuGet version."),
769727
"InstallVersionFailure",
@@ -772,12 +730,8 @@ private Stream InstallVersion(string packageName, string version, out ErrorRecor
772730

773731
return null;
774732
}
775-
//_cmdletPassedIn.WriteDebug("InstallVersion 765");
776733

777-
var inst = InstallHelper(packageName, requiredVersion, out errRecord);
778-
//_cmdletPassedIn.WriteDebug("Returning from V3ServerAPICalls::InstallVersion()");
779-
780-
return inst;
734+
return InstallHelper(packageName, requiredVersion, out errRecord);
781735
}
782736

783737
/// <summary>
@@ -849,8 +803,6 @@ private Stream InstallHelper(string packageName, NuGetVersion version, out Error
849803
return null;
850804
}
851805

852-
//_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::InstallHelper() before checking if content is null");
853-
854806
if (content is null)
855807
{
856808
errRecord = new ErrorRecord(
@@ -860,8 +812,7 @@ private Stream InstallHelper(string packageName, NuGetVersion version, out Error
860812
this);
861813

862814
return null;
863-
}
864-
//_cmdletPassedIn.WriteDebug("Exiting method V3ServerAPICalls::InstallHelper()");
815+
}s
865816

866817
return content.ReadAsStreamAsync().GetAwaiter().GetResult();
867818
}
@@ -893,16 +844,7 @@ private string[] GetVersionedPackageEntriesFromRegistrationsResource(string pack
893844
{
894845
return Utils.EmptyStrArray;
895846
}
896-
897-
// if (responses == null)
898-
// {
899-
// _cmdletPassedIn.WriteDebug("In V3ServerAPICalls::GetVersionedPackageEntriesFromRegistrationsResource() - responses null");
900-
// }
901-
// else
902-
// {
903-
// _cmdletPassedIn.WriteDebug("In V3ServerAPICalls::GetVersionedPackageEntriesFromRegistrationsResource() - responses NOT null");
904-
// }
905-
847+
906848
return responses;
907849
}
908850

0 commit comments

Comments
 (0)