Skip to content

Commit 05faeea

Browse files
anamnavianamnavi
authored
Rename ACR to ContainerRegistry (PowerShell#1600)
1 parent d823c71 commit 05faeea

11 files changed

+133
-139
lines changed

‎src/code/ACRResponseUtil.cs renamed to ‎src/code/ContainerRegistryResponseUtil.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
1111
{
12-
internal class ACRResponseUtil : ResponseUtil
12+
internal class ContainerRegistryResponseUtil : ResponseUtil
1313
{
1414
#region Members
1515

@@ -19,7 +19,7 @@ internal class ACRResponseUtil : ResponseUtil
1919

2020
#region Constructor
2121

22-
public ACRResponseUtil(PSRepositoryInfo repository) : base(repository)
22+
public ContainerRegistryResponseUtil(PSRepositoryInfo repository) : base(repository)
2323
{
2424
Repository = repository;
2525
}
@@ -30,12 +30,6 @@ public ACRResponseUtil(PSRepositoryInfo repository) : base(repository)
3030

3131
public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResults responseResults)
3232
{
33-
// in FindHelper:
34-
// serverApi.FindName() -> return responses, and out errRecord
35-
// check outErrorRecord
36-
//
37-
// acrConverter.ConvertToPSResourceInfo(responses) -> return PSResourceResult
38-
// check resourceResult for error, write if needed
3933
Hashtable[] responses = responseResults.HashtableResponse;
4034
foreach (Hashtable response in responses)
4135
{
@@ -59,7 +53,7 @@ public override IEnumerable<PSResourceResult> ConvertToPSResourceResult(FindResu
5953
{
6054
using (JsonDocument pkgVersionEntry = JsonDocument.Parse(response["Metadata"].ToString()))
6155
{
62-
PSResourceInfo.TryConvertFromACRJson(response["Name"].ToString(), pkgVersionEntry, resourceType, out pkg, Repository, out responseConversionError);
56+
PSResourceInfo.TryConvertFromContainerRegistryJson(response["Name"].ToString(), pkgVersionEntry, resourceType, out pkg, Repository, out responseConversionError);
6357
}
6458
}
6559
catch (Exception e)

‎src/code/ACRServerAPICalls.cs renamed to ‎src/code/ContainerRegistryServerAPICalls.cs

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

‎src/code/PSRepositoryInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public enum RepositoryProviderType
7474
public int Priority { get; }
7575

7676
/// <summary>
77-
/// the type of repository provider (eg, AzureDevOps, ACR, etc.)
77+
/// the type of repository provider (eg, AzureDevOps, ContainerRegistry, etc.)
7878
/// </summary>
7979
public RepositoryProviderType RepositoryProvider { get; }
8080

‎src/code/PSResourceInfo.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -804,10 +804,10 @@ public static bool TryConvertFromJson(
804804
}
805805

806806
/// <summary>
807-
/// Converts ACR JsonDocument entry to PSResourceInfo instance
808-
/// used for ACR Server API call find response conversion to PSResourceInfo object
807+
/// Converts ContainerRegistry JsonDocument entry to PSResourceInfo instance
808+
/// used for ContainerRegistry Server API call find response conversion to PSResourceInfo object
809809
/// </summary>
810-
public static bool TryConvertFromACRJson(
810+
public static bool TryConvertFromContainerRegistryJson(
811811
string packageName,
812812
JsonDocument packageMetadata,
813813
ResourceType? resourceType,
@@ -820,7 +820,7 @@ public static bool TryConvertFromACRJson(
820820

821821
if (packageMetadata == null)
822822
{
823-
errorMsg = "TryConvertFromACRJson: Invalid json object. Object cannot be null.";
823+
errorMsg = "TryConvertFromContainerRegistryJson: Invalid json object. Object cannot be null.";
824824
return false;
825825
}
826826

@@ -865,7 +865,7 @@ public static bool TryConvertFromACRJson(
865865
{
866866
errorMsg = string.Format(
867867
CultureInfo.InvariantCulture,
868-
@"TryConvertFromACRJson: Neither 'ModuleVersion' nor 'Version' could be found in package metadata");
868+
@"TryConvertFromContainerRegistryJson: Neither 'ModuleVersion' nor 'Version' could be found in package metadata");
869869

870870
return false;
871871
}
@@ -874,7 +874,7 @@ public static bool TryConvertFromACRJson(
874874
{
875875
errorMsg = string.Format(
876876
CultureInfo.InvariantCulture,
877-
@"TryConvertFromACRJson: Cannot parse NormalizedVersion or System.Version from version in metadata.");
877+
@"TryConvertFromContainerRegistryJson: Cannot parse NormalizedVersion or System.Version from version in metadata.");
878878

879879
return false;
880880
}
@@ -967,7 +967,7 @@ public static bool TryConvertFromACRJson(
967967
// Dependencies
968968
if (rootDom.TryGetProperty("RequiredModules", out JsonElement requiredModulesElement))
969969
{
970-
metadata["Dependencies"] = ParseACRDependencies(requiredModulesElement, out errorMsg).ToArray();
970+
metadata["Dependencies"] = ParseContainerRegistryDependencies(requiredModulesElement, out errorMsg).ToArray();
971971
}
972972

973973
var additionalMetadataHashtable = new Dictionary<string, string>
@@ -1008,7 +1008,7 @@ public static bool TryConvertFromACRJson(
10081008
{
10091009
errorMsg = string.Format(
10101010
CultureInfo.InvariantCulture,
1011-
@"TryConvertFromACRJson: Cannot parse PSResourceInfo from json object with error: {0}",
1011+
@"TryConvertFromContainerRegistryJson: Cannot parse PSResourceInfo from json object with error: {0}",
10121012
ex.Message);
10131013

10141014
return false;
@@ -1519,7 +1519,7 @@ internal static Dependency[] ParseHttpDependencies(string dependencyString)
15191519
return dependencyList.ToArray();
15201520
}
15211521

1522-
internal static List<Dependency> ParseACRDependencies(JsonElement requiredModulesElement, out string errorMsg)
1522+
internal static List<Dependency> ParseContainerRegistryDependencies(JsonElement requiredModulesElement, out string errorMsg)
15231523
{
15241524
errorMsg = string.Empty;
15251525
List<Dependency> pkgDeps = new List<Dependency>();

‎src/code/PublishPSResource.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ out string[] _
312312
{
313313
WriteError(new ErrorRecord(
314314
manifestReadError,
315-
"ManifestFileReadParseForACRPublishError",
315+
"ManifestFileReadParseForContainerRegistryPublishError",
316316
ErrorCategory.ReadError,
317317
this));
318318

@@ -496,12 +496,12 @@ out string[] _
496496

497497
if (repository.ApiVersion == PSRepositoryInfo.APIVersion.ContainerRegistry)
498498
{
499-
ACRServerAPICalls acrServer = new ACRServerAPICalls(repository, this, _networkCredential, userAgentString);
499+
ContainerRegistryServerAPICalls containerRegistryServer = new ContainerRegistryServerAPICalls(repository, this, _networkCredential, userAgentString);
500500

501501
var pkgMetadataFile = (resourceType == ResourceType.Script) ? pathToScriptFileToPublish : pathToModuleManifestToPublish;
502-
if (!acrServer.PushNupkgACR(pkgMetadataFile, outputNupkgDir, _pkgName, _pkgVersion, repository, resourceType, parsedMetadata, dependencies, out ErrorRecord pushNupkgACRError))
502+
if (!containerRegistryServer.PushNupkgContainerRegistry(pkgMetadataFile, outputNupkgDir, _pkgName, _pkgVersion, repository, resourceType, parsedMetadata, dependencies, out ErrorRecord pushNupkgContainerRegistryError))
503503
{
504-
WriteError(pushNupkgACRError);
504+
WriteError(pushNupkgContainerRegistryError);
505505
// exit out of processing
506506
return;
507507
}

‎src/code/ResponseUtilFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static ResponseUtil GetResponseUtil(PSRepositoryInfo repository)
3131
break;
3232

3333
case PSRepositoryInfo.APIVersion.ContainerRegistry:
34-
currentResponseUtil = new ACRResponseUtil(repository);
34+
currentResponseUtil = new ContainerRegistryResponseUtil(repository);
3535
break;
3636

3737
case PSRepositoryInfo.APIVersion.Unknown:

‎src/code/ServerFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static ServerApiCall GetServer(PSRepositoryInfo repository, PSCmdlet cmdl
6060
break;
6161

6262
case PSRepositoryInfo.APIVersion.ContainerRegistry:
63-
currentServer = new ACRServerAPICalls(repository, cmdletPassedIn, networkCredential, userAgentString);
63+
currentServer = new ContainerRegistryServerAPICalls(repository, cmdletPassedIn, networkCredential, userAgentString);
6464
break;
6565

6666
case PSRepositoryInfo.APIVersion.Unknown:

‎src/code/Utils.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ public static string GetAzAccessToken()
661661
return token.Token;
662662
}
663663

664-
public static string GetACRAccessTokenFromSecretManagement(
664+
public static string GetContainerRegistryAccessTokenFromSecretManagement(
665665
string repositoryName,
666666
PSCredentialInfo repositoryCredentialInfo,
667667
PSCmdlet cmdletPassedIn)
@@ -701,7 +701,7 @@ public static string GetACRAccessTokenFromSecretManagement(
701701
new PSInvalidOperationException(
702702
message: $"Microsoft.PowerShell.SecretManagement\\Get-Secret encountered an error while reading secret \"{repositoryCredentialInfo.SecretName}\" from vault \"{repositoryCredentialInfo.VaultName}\" for PSResourceRepository ({repositoryName}) authentication.",
703703
innerException: terminatingError),
704-
"ACRRepositoryCannotGetSecretFromVault",
704+
"ContainerRegistryRepositoryCannotGetSecretFromVault",
705705
ErrorCategory.InvalidOperation,
706706
cmdletPassedIn));
707707
}
@@ -720,7 +720,7 @@ public static string GetACRAccessTokenFromSecretManagement(
720720
cmdletPassedIn.ThrowTerminatingError(
721721
new ErrorRecord(
722722
new PSNotSupportedException($"Secret \"{repositoryCredentialInfo.SecretName}\" from vault \"{repositoryCredentialInfo.VaultName}\" has an invalid type. The only supported type is PSCredential."),
723-
"ACRRepositoryTokenIsInvalidSecretType",
723+
"ContainerRegistryRepositoryTokenIsInvalidSecretType",
724724
ErrorCategory.InvalidType,
725725
cmdletPassedIn));
726726

‎test/FindPSResourceTests/FindPSResourceACRServer.Tests.ps1 renamed to ‎test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1

File renamed without changes.

‎test/InstallPSResourceTests/InstallPSResourceACRServer.Tests.ps1 renamed to ‎test/InstallPSResourceTests/InstallPSResourceContainerRegistryServer.Tests.ps1

File renamed without changes.

‎test/PublishPSResourceTests/PublishPSResourceACRServer.Tests.ps1 renamed to ‎test/PublishPSResourceTests/PublishPSResourceContainerRegistryServer.Tests.ps1

File renamed without changes.

0 commit comments

Comments
 (0)