ACR Integration: Publish-PSResource methods (PowerShell#1501)

alerickson · Apr 1, 2024 · 15ef0fd · 15ef0fd
1 parent c00a1f5
commit 15ef0fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/code/ACRServerAPICalls.cs b/src/code/ACRServerAPICalls.cs
@@ -960,7 +960,7 @@ private static Collection<KeyValuePair<string, string>> GetDefaultHeaders(string
                 };
         }
 
-        private bool PushNupkgACR(string outputNupkgDir, string pkgName, NuGetVersion pkgVersion, PSRepositoryInfo repository, out ErrorRecord errRecord)
+        internal bool PushNupkgACR(string outputNupkgDir, string pkgName, NuGetVersion pkgVersion, PSRepositoryInfo repository, out ErrorRecord errRecord)
         {
             errRecord = null;
             // Push the nupkg to the appropriate repository

diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs
@@ -15,8 +15,6 @@
 using System.Management.Automation;
 using System.Net;
 using System.Net.Http;
-using System.Security.Cryptography;
-using System.Text;
 using System.Threading;
 using System.Xml;
 
@@ -138,6 +136,8 @@ public PSCredential ProxyCredential {
         private string pathToModuleDirToPublish = string.Empty;
         private ResourceType resourceType = ResourceType.None;
         private NetworkCredential _networkCredential;
+        string userAgentString = UserAgentInfo.UserAgentString();
+
         #endregion
 
         #region Method overrides
@@ -482,16 +482,16 @@ out string[] _
 
                 string repositoryUri = repository.Uri.AbsoluteUri;
 
-                if (repository.RepositoryProvider == PSRepositoryInfo.RepositoryProviderType.ACR)
+                if (repository.ApiVersion == PSRepositoryInfo.APIVersion.acr)
                 {
-                    // TODO: Create instance of ACR server class and call PushNupkgACR
-                   /*
-                    if (!PushNupkgACR(outputNupkgDir, repository, out ErrorRecord pushNupkgACRError))
+                    ACRServerAPICalls acrServer = new ACRServerAPICalls(repository, this, _networkCredential, userAgentString);
+
+                    if (!acrServer.PushNupkgACR(outputNupkgDir, _pkgName, _pkgVersion, repository, out ErrorRecord pushNupkgACRError))
                     {
                         WriteError(pushNupkgACRError);
+                        // exit out of processing
                         return;
                     }
-                   */
                 }
                 else
                 {