Skip to content

Commit 71cc75c

Browse files
committed
Address comments
1 parent 8a74fb2 commit 71cc75c

File tree

2 files changed

+29
-32
lines changed

2 files changed

+29
-32
lines changed

src/code/PSRepositoryInfo.cs

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System;
55
using System.Management.Automation;
6+
using System.Net;
67

78
namespace Microsoft.PowerShell.PSResourceGet.UtilClasses
89
{
@@ -100,9 +101,36 @@ public PSRepositoryInfo(string name, Uri uri, int priority, bool trusted, PSCred
100101

101102
internal bool IsMARRepository()
102103
{
103-
return (ApiVersion == APIVersion.ContainerRegistry && Uri.Host.StartsWith("mcr.microsoft") );
104+
return (ApiVersion == APIVersion.ContainerRegistry && Uri.Host.StartsWith("mcr.microsoft"));
104105
}
105106

107+
public static bool IsContainerRegistry(string uri)
108+
{
109+
if (uri.EndsWith(".azurecr.io") || uri.EndsWith(".azurecr.io/") || uri.Contains("mcr.microsoft.com") || uri.StartsWith("mcr.microsoft"))
110+
{
111+
return true;
112+
}
113+
114+
return false;
115+
}
116+
117+
public static NetworkCredential SetNetworkCredentials(PSRepositoryInfo repository, NetworkCredential networkCredential, PSCmdlet cmdletPassedIn)
118+
{
119+
NetworkCredential networkCreds = new NetworkCredential();
120+
if (repository.CredentialProvider.Equals(PSRepositoryInfo.CredentialProviderType.AzArtifacts))
121+
{
122+
cmdletPassedIn.WriteVerbose("Setting credential provider network credentials");
123+
networkCreds = Utils.SetCredentialProviderNetworkCredential(repository, networkCredential, cmdletPassedIn);
124+
}
125+
else
126+
{
127+
cmdletPassedIn.WriteVerbose("Setting Secret Management network credentials");
128+
networkCreds = Utils.SetSecretManagementNetworkCredential(repository, networkCredential, cmdletPassedIn);
129+
}
130+
131+
return networkCreds;
132+
}
133+
106134
#endregion
107135
}
108136
}

src/code/Utils.cs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -996,37 +996,6 @@ public static NetworkCredential SetCredentialProviderNetworkCredential(
996996
return networkCredential;
997997
}
998998

999-
public static NetworkCredential SetNetworkCredentials(PSRepositoryInfo repository, NetworkCredential networkCredential, PSCmdlet cmdletPassedIn)
1000-
{
1001-
NetworkCredential networkCreds = new NetworkCredential();
1002-
if (repository.CredentialProvider.Equals(PSRepositoryInfo.CredentialProviderType.AzArtifacts))
1003-
{
1004-
cmdletPassedIn.WriteVerbose("Setting credential provider network credentials");
1005-
networkCreds = Utils.SetCredentialProviderNetworkCredential(repository, networkCredential, cmdletPassedIn);
1006-
}
1007-
else
1008-
{
1009-
cmdletPassedIn.WriteVerbose("Setting Secret Management network credentials");
1010-
networkCreds = Utils.SetSecretManagementNetworkCredential(repository, networkCredential, cmdletPassedIn);
1011-
}
1012-
1013-
return networkCreds;
1014-
}
1015-
1016-
#endregion
1017-
1018-
#region Container Registry methods
1019-
1020-
public static bool IsContainerRegistry(string uri)
1021-
{
1022-
if (uri.EndsWith(".azurecr.io") || uri.EndsWith(".azurecr.io/") || uri.Contains("mcr.microsoft.com") || uri.StartsWith("mcr.microsoft"))
1023-
{
1024-
return true;
1025-
}
1026-
1027-
return false;
1028-
}
1029-
1030999
#endregion
10311000

10321001
#region Path methods

0 commit comments

Comments
 (0)