Skip to content

Commit 5ed3250

Browse files
anamnavianamnavi
committed
add debug messages to indicate which method is being stepped through
1 parent abfbf42 commit 5ed3250

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

‎src/code/ContainerRegistryServerAPICalls.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ private Stream InstallVersion(
301301
string packageVersion,
302302
out ErrorRecord errRecord)
303303
{
304+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::InstallVersion()");
304305
errRecord = null;
305306
string packageNameLowercase = packageName.ToLower();
306307
string accessToken = string.Empty;
@@ -371,6 +372,7 @@ private Stream InstallVersion(
371372
/// </summary>
372373
internal string GetContainerRegistryAccessToken(out ErrorRecord errRecord)
373374
{
375+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetContainerRegistryAccessToken()");
374376
string accessToken = string.Empty;
375377
string containerRegistryAccessToken = string.Empty;
376378
string tenantID = string.Empty;
@@ -437,6 +439,7 @@ internal string GetContainerRegistryAccessToken(out ErrorRecord errRecord)
437439
/// </summary>
438440
internal bool IsContainerRegistryUnauthenticated(string containerRegistyUrl, out ErrorRecord errRecord)
439441
{
442+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::IsContainerRegistryUnauthenticated()");
440443
errRecord = null;
441444
string endpoint = $"{containerRegistyUrl}/v2/";
442445
HttpResponseMessage response;
@@ -463,6 +466,7 @@ internal bool IsContainerRegistryUnauthenticated(string containerRegistyUrl, out
463466
/// </summary>
464467
internal string GetContainerRegistryRefreshToken(string tenant, string accessToken, out ErrorRecord errRecord)
465468
{
469+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetContainerRegistryRefreshToken()");
466470
string content = string.Format(containerRegistryRefreshTokenTemplate, Registry, tenant, accessToken);
467471
var contentHeaders = new Collection<KeyValuePair<string, string>> { new KeyValuePair<string, string>("Content-Type", "application/x-www-form-urlencoded") };
468472
string exchangeUrl = string.Format(containerRegistryOAuthExchangeUrlTemplate, Registry);
@@ -480,6 +484,7 @@ internal string GetContainerRegistryRefreshToken(string tenant, string accessTok
480484
/// </summary>
481485
internal string GetContainerRegistryAccessTokenByRefreshToken(string refreshToken, out ErrorRecord errRecord)
482486
{
487+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetContainerRegistryAccessTokenByRefreshToken()");
483488
string content = string.Format(containerRegistryAccessTokenTemplate, Registry, refreshToken);
484489
var contentHeaders = new Collection<KeyValuePair<string, string>> { new KeyValuePair<string, string>("Content-Type", "application/x-www-form-urlencoded") };
485490
string tokenUrl = string.Format(containerRegistryOAuthTokenUrlTemplate, Registry);
@@ -501,6 +506,7 @@ internal string GetContainerRegistryAccessTokenByRefreshToken(string refreshToke
501506
/// </summary>
502507
private string GetDigestFromManifest(JObject manifest, out ErrorRecord errRecord)
503508
{
509+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetDigestFromManifest()");
504510
errRecord = null;
505511
string digest = String.Empty;
506512

@@ -544,6 +550,7 @@ private string GetDigestFromManifest(JObject manifest, out ErrorRecord errRecord
544550
/// </summary>
545551
internal JObject GetContainerRegistryRepositoryManifest(string packageName, string version, string containerRegistryAccessToken, out ErrorRecord errRecord)
546552
{
553+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetContainerRegistryRepositoryManifest()");
547554
// example of manifestUrl: https://psgetregistry.azurecr.io/hello-world:3.0.0
548555
string manifestUrl = string.Format(containerRegistryManifestUrlTemplate, Registry, packageName, version);
549556
var defaultHeaders = GetDefaultHeaders(containerRegistryAccessToken);
@@ -556,6 +563,7 @@ internal JObject GetContainerRegistryRepositoryManifest(string packageName, stri
556563
/// </summary>
557564
internal async Task<HttpContent> GetContainerRegistryBlobAsync(string packageName, string digest, string containerRegistryAccessToken)
558565
{
566+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetContainerRegistryBlobAsync()");
559567
string blobUrl = string.Format(containerRegistryBlobDownloadUrlTemplate, Registry, packageName, digest);
560568
var defaultHeaders = GetDefaultHeaders(containerRegistryAccessToken);
561569
return await GetHttpContentResponseJObject(blobUrl, defaultHeaders);
@@ -585,6 +593,7 @@ internal JObject FindContainerRegistryImageTags(string packageName, string versi
585593
* }
586594
* }]
587595
*/
596+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::FindContainerRegistryImageTags()");
588597
string resolvedVersion = string.Equals(version, "*", StringComparison.OrdinalIgnoreCase) ? null : $"/{version}";
589598
string findImageUrl = string.Format(containerRegistryFindImageVersionUrlTemplate, Registry, packageName, resolvedVersion);
590599
var defaultHeaders = GetDefaultHeaders(containerRegistryAccessToken);
@@ -596,6 +605,7 @@ internal JObject FindContainerRegistryImageTags(string packageName, string versi
596605
/// </summary>
597606
internal Hashtable GetContainerRegistryMetadata(string packageName, string exactTagVersion, string containerRegistryAccessToken, out ErrorRecord errRecord)
598607
{
608+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetContainerRegistryMetadata()");
599609
Hashtable requiredVersionResponse = new Hashtable();
600610

601611
var foundTags = FindContainerRegistryManifest(packageName, exactTagVersion, containerRegistryAccessToken, out errRecord);
@@ -712,6 +722,7 @@ internal Hashtable GetContainerRegistryMetadata(string packageName, string exact
712722
/// </summary>
713723
internal JObject FindContainerRegistryManifest(string packageName, string version, string containerRegistryAccessToken, out ErrorRecord errRecord)
714724
{
725+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::FindContainerRegistryManifest()");
715726
var createManifestUrl = string.Format(containerRegistryManifestUrlTemplate, Registry, packageName, version);
716727
_cmdletPassedIn.WriteDebug($"GET manifest url: {createManifestUrl}");
717728

@@ -724,6 +735,7 @@ internal JObject FindContainerRegistryManifest(string packageName, string versio
724735
/// </summary>
725736
internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string packageName, out ErrorRecord errRecord)
726737
{
738+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetMetadataProperty()");
727739
errRecord = null;
728740
ContainerRegistryInfo serverPkgInfo = null;
729741

@@ -803,6 +815,7 @@ internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string pac
803815
/// </summary>
804816
internal async Task<HttpResponseMessage> UploadManifest(string packageName, string packageVersion, string configPath, bool isManifest, string containerRegistryAccessToken)
805817
{
818+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::UploadManifest()");
806819
try
807820
{
808821
var createManifestUrl = string.Format(containerRegistryManifestUrlTemplate, Registry, packageName, packageVersion);
@@ -817,6 +830,7 @@ internal async Task<HttpResponseMessage> UploadManifest(string packageName, stri
817830

818831
internal async Task<HttpContent> GetHttpContentResponseJObject(string url, Collection<KeyValuePair<string, string>> defaultHeaders)
819832
{
833+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetHttpContentResponseJObject()");
820834
try
821835
{
822836
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);
@@ -834,6 +848,7 @@ internal async Task<HttpContent> GetHttpContentResponseJObject(string url, Colle
834848
/// </summary>
835849
internal JObject GetHttpResponseJObjectUsingDefaultHeaders(string url, HttpMethod method, Collection<KeyValuePair<string, string>> defaultHeaders, out ErrorRecord errRecord)
836850
{
851+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetHttpResponseJObjectUsingDefaultHeaders()");
837852
try
838853
{
839854
errRecord = null;
@@ -883,6 +898,7 @@ internal JObject GetHttpResponseJObjectUsingDefaultHeaders(string url, HttpMetho
883898
/// </summary>
884899
internal JObject GetHttpResponseJObjectUsingContentHeaders(string url, HttpMethod method, string content, Collection<KeyValuePair<string, string>> contentHeaders, out ErrorRecord errRecord)
885900
{
901+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetHttpResponseJObjectUsingContentHeaders()");
886902
errRecord = null;
887903
try
888904
{
@@ -1122,6 +1138,7 @@ internal bool PushNupkgContainerRegistry(string psd1OrPs1File,
11221138
Hashtable dependencies,
11231139
out ErrorRecord errRecord)
11241140
{
1141+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::PushNupkgContainerRegistry()");
11251142
string fullNupkgFile = System.IO.Path.Combine(outputNupkgDir, packageName + "." + packageVersion.ToNormalizedString() + ".nupkg");
11261143
string packageNameLowercase = packageName.ToLower();
11271144

@@ -1178,6 +1195,7 @@ internal bool PushNupkgContainerRegistry(string psd1OrPs1File,
11781195
/// </summary>
11791196
private string UploadNupkgFile(string packageNameLowercase, string containerRegistryAccessToken, string fullNupkgFile, out ErrorRecord errRecord)
11801197
{
1198+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::UploadNupkgFile()");
11811199
_cmdletPassedIn.WriteVerbose("Start uploading blob");
11821200
string nupkgDigest = string.Empty;
11831201
errRecord = null;
@@ -1240,6 +1258,7 @@ private string UploadNupkgFile(string packageNameLowercase, string containerRegi
12401258
/// </summary>
12411259
private void CreateAndUploadEmptyFile(string outputNupkgDir, string pkgNameLower, string containerRegistryAccessToken, out ErrorRecord errRecord)
12421260
{
1261+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::CreateAndUploadEmptyFile()");
12431262
_cmdletPassedIn.WriteVerbose("Create an empty file");
12441263
string emptyFileName = "empty" + Guid.NewGuid().ToString() + ".txt";
12451264
var emptyFilePath = System.IO.Path.Combine(outputNupkgDir, emptyFileName);
@@ -1290,6 +1309,7 @@ private void CreateAndUploadEmptyFile(string outputNupkgDir, string pkgNameLower
12901309
/// </summary>
12911310
private string CreateConfigFile(string configFilePath, out ErrorRecord errRecord)
12921311
{
1312+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::CreateConfigFile()");
12931313
string configFileDigest = string.Empty;
12941314
_cmdletPassedIn.WriteVerbose("Create the config file");
12951315
while (File.Exists(configFilePath))
@@ -1336,6 +1356,7 @@ private bool TryCreateAndUploadManifest(string fullNupkgFile,
13361356
string containerRegistryAccessToken,
13371357
out ErrorRecord errRecord)
13381358
{
1359+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::TryCreateAndUploadManifest()");
13391360
errRecord = null;
13401361
string packageNameLowercase = packageName.ToLower();
13411362
FileInfo nupkgFile = new FileInfo(fullNupkgFile);
@@ -1377,6 +1398,7 @@ private string CreateManifestContent(
13771398
ResourceType resourceType,
13781399
string metadata)
13791400
{
1401+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::CreateManifestContent()");
13801402
StringBuilder stringBuilder = new StringBuilder();
13811403
StringWriter stringWriter = new StringWriter(stringBuilder);
13821404
JsonTextWriter jsonWriter = new JsonTextWriter(stringWriter);
@@ -1436,6 +1458,7 @@ private string CreateManifestContent(
14361458
/// </summary>
14371459
private string CreateDigest(string fileName, out ErrorRecord errRecord)
14381460
{
1461+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::CreateDigest()");
14391462
errRecord = null;
14401463
string digest = string.Empty;
14411464
FileInfo fileInfo = new FileInfo(fileName);
@@ -1490,6 +1513,7 @@ private string CreateDigest(string fileName, out ErrorRecord errRecord)
14901513
/// </summary>
14911514
private string CreateMetadataContent(ResourceType resourceType, Hashtable parsedMetadata, out ErrorRecord errRecord)
14921515
{
1516+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::CreateMetadataContent()");
14931517
errRecord = null;
14941518
string jsonString = string.Empty;
14951519

@@ -1533,6 +1557,7 @@ private string CreateMetadataContent(ResourceType resourceType, Hashtable parsed
15331557
/// </summary>
15341558
internal async Task<string> GetStartUploadBlobLocation(string packageName, string containerRegistryAccessToken)
15351559
{
1560+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetStartUploadBlobLocation()");
15361561
try
15371562
{
15381563
var defaultHeaders = GetDefaultHeaders(containerRegistryAccessToken);
@@ -1550,6 +1575,7 @@ internal async Task<string> GetStartUploadBlobLocation(string packageName, strin
15501575
/// </summary>
15511576
internal async Task<HttpResponseMessage> EndUploadBlob(string location, string filePath, string digest, bool isManifest, string containerRegistryAccessToken)
15521577
{
1578+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::EndUploadBlob()");
15531579
try
15541580
{
15551581
var endUploadUrl = string.Format(containerRegistryEndUploadTemplate, Registry, location, digest);
@@ -1571,6 +1597,7 @@ internal async Task<HttpResponseMessage> EndUploadBlob(string location, string f
15711597
/// </summary>
15721598
private Hashtable[] FindPackagesWithVersionHelper(string packageName, VersionType versionType, VersionRange versionRange, NuGetVersion requiredVersion, bool includePrerelease, bool getOnlyLatest, out ErrorRecord errRecord)
15731599
{
1600+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::FindPackagesWithVersionHelper()");
15741601
string accessToken = string.Empty;
15751602
string tenantID = string.Empty;
15761603
string registryUrl = Repository.Uri.ToString();
@@ -1624,6 +1651,7 @@ private Hashtable[] FindPackagesWithVersionHelper(string packageName, VersionTyp
16241651
/// </summary>
16251652
private SortedDictionary<NuGet.Versioning.SemanticVersion, string> GetPackagesWithRequiredVersion(List<JToken> allPkgVersions, VersionType versionType, VersionRange versionRange, NuGetVersion specificVersion, string packageName, bool includePrerelease, out ErrorRecord errRecord)
16261653
{
1654+
_cmdletPassedIn.WriteDebug("In ContainerRegistryServerAPICalls::GetPackagesWithRequiredVersion()");
16271655
errRecord = null;
16281656
// we need NuGetVersion to sort versions by order, and string pkgVersionString (which is the exact tag from the server) to call GetContainerRegistryMetadata() later with exact version tag.
16291657
SortedDictionary<NuGet.Versioning.SemanticVersion, string> sortedPkgs = new SortedDictionary<SemanticVersion, string>(VersionComparer.Default);

0 commit comments

Comments
 (0)