Skip to content

Commit b4aba68

Browse files
adityapatwardhanadityapatwardhan
committed
Remove extra debug statements
1 parent 82383ca commit b4aba68

File tree

6 files changed

+73
-135
lines changed

6 files changed

+73
-135
lines changed

‎src/code/ContainerRegistryServerAPICalls.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,6 @@ internal string GetContainerRegistryAccessToken(out ErrorRecord errRecord)
395395
{
396396
bool isRepositoryUnauthenticated = IsContainerRegistryUnauthenticated(Repository.Uri.ToString(), out errRecord, out accessToken);
397397
_cmdletPassedIn.WriteDebug($"Is repository unauthenticated: {isRepositoryUnauthenticated}");
398-
_cmdletPassedIn.WriteDebug($"Access token: {accessToken}");
399-
_cmdletPassedIn.WriteDebug($"Error Record: {errRecord}");
400398

401399
if (errRecord != null)
402400
{

‎src/code/FindPSResource.cs‎

Lines changed: 72 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,15 @@ public sealed class FindPSResource : PSCmdlet
115115

116116
protected override void BeginProcessing()
117117
{
118-
WriteVerbose("Beginning Find-PSResource processing");
119118
_cancellationTokenSource = new CancellationTokenSource();
120119

121120
var networkCred = Credential != null ? new NetworkCredential(Credential.UserName, Credential.Password) : null;
122121

123-
WriteVerbose("Creating FindHelper instance");
124-
125122
_findHelper = new FindHelper(
126123
cancellationToken: _cancellationTokenSource.Token,
127124
cmdletPassedIn: this,
128125
networkCredential: networkCred);
129126

130-
WriteVerbose("FindHelper instance created successfully");
131-
132127
// Create a repository story (the PSResourceRepository.xml file) if it does not already exist
133128
// This is to create a better experience for those who have just installed v3 and want to get up and running quickly
134129
RepositorySettings.CheckRepositoryStore();
@@ -172,120 +167,98 @@ protected override void ProcessRecord()
172167

173168
private void ProcessResourceNameParameterSet()
174169
{
175-
try
170+
// only cases where Name is allowed to not be specified is if Type or Tag parameters are
171+
if (!MyInvocation.BoundParameters.ContainsKey(nameof(Name)))
176172
{
177-
WriteDebug("Testing");
178-
WriteDebug("In FindPSResource::ProcessResourceNameParameterSet() XXXXXXXXXXX");
179-
WriteVerbose("checking if Name parameter is specified");
180-
181-
var check = MyInvocation?.BoundParameters?.ContainsKey(nameof(Name));
182-
183-
WriteVerbose("Value of check for Name parameter: " + check);
184-
185-
// only cases where Name is allowed to not be specified is if Type or Tag parameters are
186-
if (!MyInvocation.BoundParameters.ContainsKey(nameof(Name)))
173+
if (MyInvocation.BoundParameters.ContainsKey(nameof(Tag)))
187174
{
188-
WriteDebug("Name parameter not provided, checking for Type or Tag parameters");
189-
if (MyInvocation.BoundParameters.ContainsKey(nameof(Tag)))
190-
{
191-
ProcessTags();
192-
return;
193-
}
194-
else if (MyInvocation.BoundParameters.ContainsKey(nameof(Type)))
195-
{
196-
Name = new string[] { "*" };
197-
}
198-
else
199-
{
200-
ThrowTerminatingError(new ErrorRecord(
201-
new PSInvalidOperationException("Name parameter must be provided, unless Tag or Type parameters are used."),
202-
"NameParameterNotProvided",
203-
ErrorCategory.InvalidOperation,
204-
this));
205-
}
175+
ProcessTags();
176+
return;
206177
}
207-
208-
WriteVerbose("Processing Name parameter for Find-PSResource cmdlet");
209-
WriteDebug("Filtering package name(s) on wildcards");
210-
Name = Utils.ProcessNameWildcards(Name, removeWildcardEntries: false, out string[] errorMsgs, out bool nameContainsWildcard);
211-
WriteVerbose($"Name parameter processed, contains {Name.Length} entries");
212-
213-
foreach (string error in errorMsgs)
178+
else if (MyInvocation.BoundParameters.ContainsKey(nameof(Type)))
214179
{
215-
WriteError(new ErrorRecord(
216-
new PSInvalidOperationException(error),
217-
"ErrorFilteringNamesForUnsupportedWildcards",
218-
ErrorCategory.InvalidArgument,
219-
this));
180+
Name = new string[] { "*" };
220181
}
221-
222-
// this catches the case where Name wasn't passed in as null or empty,
223-
// but after filtering out unsupported wildcard names there are no elements left in namesToSearch
224-
if (Name.Length == 0)
182+
else
225183
{
226-
WriteDebug("Package name(s) could not be resolved");
227-
return;
184+
ThrowTerminatingError(new ErrorRecord(
185+
new PSInvalidOperationException("Name parameter must be provided, unless Tag or Type parameters are used."),
186+
"NameParameterNotProvided",
187+
ErrorCategory.InvalidOperation,
188+
this));
228189
}
190+
}
229191

230-
// determine/parse out Version param
231-
VersionType versionType = VersionType.VersionRange;
232-
NuGetVersion nugetVersion = null;
233-
VersionRange versionRange = null;
192+
WriteDebug("Filtering package name(s) on wildcards");
193+
Name = Utils.ProcessNameWildcards(Name, removeWildcardEntries: false, out string[] errorMsgs, out bool nameContainsWildcard);
234194

235-
if (Version != null)
195+
foreach (string error in errorMsgs)
196+
{
197+
WriteError(new ErrorRecord(
198+
new PSInvalidOperationException(error),
199+
"ErrorFilteringNamesForUnsupportedWildcards",
200+
ErrorCategory.InvalidArgument,
201+
this));
202+
}
203+
204+
// this catches the case where Name wasn't passed in as null or empty,
205+
// but after filtering out unsupported wildcard names there are no elements left in namesToSearch
206+
if (Name.Length == 0)
207+
{
208+
WriteDebug("Package name(s) could not be resolved");
209+
return;
210+
}
211+
212+
// determine/parse out Version param
213+
VersionType versionType = VersionType.VersionRange;
214+
NuGetVersion nugetVersion = null;
215+
VersionRange versionRange = null;
216+
217+
if (Version != null)
218+
{
219+
WriteDebug("Parsing package version");
220+
if (!NuGetVersion.TryParse(Version, out nugetVersion))
236221
{
237-
WriteDebug("Parsing package version");
238-
if (!NuGetVersion.TryParse(Version, out nugetVersion))
222+
if (Version.Trim().Equals("*"))
239223
{
240-
if (Version.Trim().Equals("*"))
241-
{
242-
versionRange = VersionRange.All;
243-
versionType = VersionType.VersionRange;
244-
}
245-
else if (!VersionRange.TryParse(Version, out versionRange))
246-
{
247-
WriteError(new ErrorRecord(
248-
new ArgumentException("Argument for -Version parameter is not in the proper format"),
249-
"IncorrectVersionFormat",
250-
ErrorCategory.InvalidArgument,
251-
this));
252-
253-
return;
254-
}
224+
versionRange = VersionRange.All;
225+
versionType = VersionType.VersionRange;
255226
}
256-
else
227+
else if (!VersionRange.TryParse(Version, out versionRange))
257228
{
258-
versionType = VersionType.SpecificVersion;
229+
WriteError(new ErrorRecord(
230+
new ArgumentException("Argument for -Version parameter is not in the proper format"),
231+
"IncorrectVersionFormat",
232+
ErrorCategory.InvalidArgument,
233+
this));
234+
235+
return;
259236
}
260237
}
261238
else
262239
{
263-
versionType = VersionType.NoVersion;
264-
}
265-
266-
foreach (PSResourceInfo pkg in _findHelper.FindByResourceName(
267-
name: Name,
268-
type: Type,
269-
versionRange: versionRange,
270-
nugetVersion: nugetVersion,
271-
versionType: versionType,
272-
version: Version,
273-
prerelease: Prerelease,
274-
tag: Tag,
275-
repository: Repository,
276-
includeDependencies: IncludeDependencies,
277-
suppressErrors: false))
278-
{
279-
WriteObject(pkg);
240+
versionType = VersionType.SpecificVersion;
280241
}
281242
}
282-
catch (Exception ex)
243+
else
283244
{
284-
WriteError(new ErrorRecord(
285-
ex,
286-
"FindPSResourceError",
287-
ErrorCategory.NotSpecified,
288-
this));
245+
versionType = VersionType.NoVersion;
246+
}
247+
248+
foreach (PSResourceInfo pkg in _findHelper.FindByResourceName(
249+
name: Name,
250+
type: Type,
251+
versionRange: versionRange,
252+
nugetVersion: nugetVersion,
253+
versionType: versionType,
254+
version: Version,
255+
prerelease: Prerelease,
256+
tag: Tag,
257+
repository: Repository,
258+
includeDependencies: IncludeDependencies,
259+
suppressErrors: false))
260+
{
261+
WriteObject(pkg);
289262
}
290263
}
291264

‎src/code/GetPSResourceRepository.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,15 @@ public sealed class GetPSResourceRepository : PSCmdlet
3737

3838
protected override void BeginProcessing()
3939
{
40-
WriteVerbose("Beginning Get-PSResourceRepository processing");
4140
RepositorySettings.CheckRepositoryStore();
42-
WriteVerbose("Repository store checked successfully");
4341
}
4442

4543
protected override void ProcessRecord()
4644
{
47-
WriteVerbose("Processing Get-PSResourceRepository cmdlet");
4845
string nameArrayAsString = (Name == null || !Name.Any() || string.Equals(Name[0], "*") || Name[0] == null)
4946
? "all" : string.Join(", ", Name);
5047
WriteDebug($"Reading repository info for '{nameArrayAsString}'");
5148
List<PSRepositoryInfo> items = RepositorySettings.Read(Name, out string[] errorList);
52-
WriteVerbose($"Read {items.Count} repositories");
5349

5450
// handle non-terminating errors
5551
foreach (string error in errorList)
@@ -61,14 +57,10 @@ protected override void ProcessRecord()
6157
this));
6258
}
6359

64-
WriteVerbose($"Returning {items.Count} repositories");
65-
6660
foreach (PSRepositoryInfo repo in items)
6761
{
6862
WriteObject(repo);
6963
}
70-
71-
WriteVerbose("Get-PSResourceRepository cmdlet processing complete");
7264
}
7365

7466
#endregion

‎src/code/RegisterPSResourceRepository.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,11 @@ class RegisterPSResourceRepository : PSCmdlet
115115

116116
protected override void BeginProcessing()
117117
{
118-
WriteVerbose("In RegisterPSResourceRepository::BeginProcessing()");
119118
RepositorySettings.CheckRepositoryStore();
120-
WriteVerbose("Done RegisterPSResourceRepository::BeginProcessing()");
121119

122120
}
123121
protected override void ProcessRecord()
124122
{
125-
WriteVerbose("In RegisterPSResourceRepository::ProcessRecord()");
126123
List<PSRepositoryInfo> items = new List<PSRepositoryInfo>();
127124

128125
PSRepositoryInfo.APIVersion? repoApiVersion = null;
@@ -134,7 +131,6 @@ protected override void ProcessRecord()
134131
switch (ParameterSetName)
135132
{
136133
case NameParameterSet:
137-
WriteDebug("In RegisterPSResourceRepository::NameParameterSet");
138134
if (!Utils.TryCreateValidUri(uriString: Uri,
139135
cmdletPassedIn: this,
140136
uriResult: out _uri,
@@ -145,7 +141,6 @@ protected override void ProcessRecord()
145141

146142
try
147143
{
148-
WriteDebug($"Registering repository '{Name}' with uri '{_uri}'");
149144
items.Add(RepositorySettings.AddRepository(Name, _uri, Priority, Trusted, repoApiVersion, CredentialInfo, Force, this, out string errorMsg));
150145

151146
if (!string.IsNullOrEmpty(errorMsg))
@@ -183,7 +178,6 @@ protected override void ProcessRecord()
183178
break;
184179

185180
case RepositoriesParameterSet:
186-
WriteDebug("In RegisterPSResourceRepository::RepositoriesParameterSet");
187181
try
188182
{
189183
items = RepositoriesParameterSetHelper();

‎src/code/Utils.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,6 @@ public static bool TryCreateValidUri(
429429
out Uri uriResult,
430430
out ErrorRecord errorRecord)
431431
{
432-
cmdletPassedIn.WriteVerbose($"Validating Uri: {uriString}");
433-
434432
errorRecord = null;
435433
if (Uri.TryCreate(uriString, UriKind.Absolute, out uriResult))
436434
{
@@ -652,8 +650,6 @@ public static PSCredential GetRepositoryCredentialFromSecretManagement(
652650

653651
public static string GetAzAccessToken(PSCmdlet cmdletPassedIn)
654652
{
655-
cmdletPassedIn.WriteVerbose("Getting Azure access token using DefaultAzureCredential");
656-
657653
var credOptions = new DefaultAzureCredentialOptions
658654
{
659655
ExcludeEnvironmentCredential = true,

‎test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ Describe 'Test HTTP Find-PSResource for ACR Server Protocol' -tags 'CI' {
2222
{
2323
Write-Verbose -Verbose "Using Az module for authentication"
2424
Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -Verbose
25-
Write-Verbose -Verbose "Registering ACR repository with Az authentication completed"
26-
Get-PSResourceRepository -Name $ACRRepoName -Verbose
27-
Write-Verbose -Verbose "Get-PSResourceRepository completed"
2825
}
2926
else
3027
{
@@ -39,25 +36,13 @@ Describe 'Test HTTP Find-PSResource for ACR Server Protocol' -tags 'CI' {
3936

4037
It "Find resource given specific Name, Version null" {
4138
# FindName()
42-
Write-Verbose -Verbose "Finding resource with Name: $testModuleName"
43-
44-
try {
45-
$res = Find-PSResource -Name $testModuleName -Repository $ACRRepoName -Verbose -Debug -ErrorAction Stop
46-
}
47-
catch {
48-
Write-Error "Error occurred while finding resource: $_"
49-
Write-Verbose -Verbose "Error details: $($_.Exception.Message)"
50-
Write-Verbose -Verbose "Stack trace: $($_.ScriptStackTrace)"
51-
}
52-
53-
Write-Verbose -Verbose "Find-PSResource completed"
39+
$res = Find-PSResource -Name $testModuleName -Repository $ACRRepoName -Verbose -Debug -ErrorAction Stop
5440
$res.Name | Should -Be $testModuleName
5541
$res.Version | Should -Be "5.0.0"
5642
}
5743

5844
It "Should not find resource given nonexistant Name" {
5945
# FindName()
60-
Write-Verbose -Verbose "Moved to the next test case to find non-existant resource"
6146
$res = Find-PSResource -Name NonExistantModule -Repository $ACRRepoName -ErrorVariable err -ErrorAction SilentlyContinue
6247
$res | Should -BeNullOrEmpty
6348
$err.Count | Should -BeGreaterThan 0

0 commit comments

Comments
 (0)