[eng] Update the logic of resource repository in VersionController (#27382)

Author: wyunchi-ms

tools/PublishModules.psm1

@@ -473,22 +473,38 @@ function Save-PackageLocally {
     $ModuleName = $module['ModuleName']
     $RequiredVersion = $module['RequiredVersion']
 
+    $AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force
+    $credentialsObject = [pscredential]::new("ONEBRANCH_TOKEN", $AccessTokenSecureString)
+
+
     # Only check for the modules that specifies = required exact dependency version
     if ($RequiredVersion -ne $null) {
         Write-Output "Checking for required module $ModuleName, $RequiredVersion"
         if (Find-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Repository $TempRepo -ErrorAction SilentlyContinue) {
             Write-Output "Required dependency $ModuleName, $RequiredVersion found in the repo $TempRepo"
         } else {
+            if (Test-Path Env:\DEFAULT_PS_REPOSITORY_URL) {
+                $PSRepositoryUrl = $Env:DEFAULT_PS_REPOSITORY_URL
+                $AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force
+                $credentialsObject = [pscredential]::new("ONEBRANCH_TOKEN", $AccessTokenSecureString)
+            }
+            else {
+                $PSRepositoryUrl = "https://www.powershellgallery.com/api/v2"
+            }
             Write-Warning "Required dependency $ModuleName, $RequiredVersion not found in the repo $TempRepo"
-            Write-Output "Downloading the package from PsGallery to the path $TempRepoPath"
-            # We try to download the package from the PsGallery as we are likely intending to use the existing version of the module.
-            # If the module not found in psgallery, the following commnad would fail and hence publish to local repo process would fail as well
-            Save-Package -Name $ModuleName -RequiredVersion $RequiredVersion -ProviderName Nuget -Path $TempRepoPath -Source https://www.powershellgallery.com/api/v2 | Out-Null
+            Write-Output "Downloading the package from $PSRepositoryUrl to the path $TempRepoPath"
+            # We try to download the package from the PSRepositoryUrl as we are likely intending to use the existing version of the module.
+            # If the module not found in PSRepositoryUrl, the following command would fail and hence publish to local repo process would fail as well
+            if (Test-Path Env:\DEFAULT_PS_REPOSITORY_URL) {
+                Save-PSResource -Name $ModuleName -Version $RequiredVersion -Path $TempRepoPath -Repository $Env:DEFAULT_PS_REPOSITORY_NAME -Credential $credentialsObject -AsNupkg
+            } else {
+                Save-PSResource -Name $ModuleName -Version $RequiredVersion -Path $TempRepoPath -Repository PSGallery -AsNupkg 
+            }
             $NupkgFilePath = Join-Path -Path $TempRepoPath -ChildPath "$ModuleName.$RequiredVersion.nupkg"
             $ModulePaths = $env:PSModulePath -split ';'
             $DestinationModulePath = [System.IO.Path]::Combine($ModulePaths[0], $ModuleName, $RequiredVersion)
             Expand-Archive -Path $NupkgFilePath -DestinationPath $DestinationModulePath -Force
-            Write-Output "Downloaded the package sucessfully"
+            Write-Output "Downloaded the package successfully"
         }
     }
 }
@@ -583,7 +599,6 @@ function Add-AllModules {
     foreach ($module in $Keys) {
         $modulePath = $Modules[$module]
         Write-Output "Adding $module modules to local repo"
-
         # Save missing dependencies locally from PS gallery.
         Save-PackagesFromPsGallery -TempRepo $TempRepo -TempRepoPath $TempRepoPath -ModulePaths $modulePath
 

tools/VersionController/Models/ModuleHelper.cs

@@ -35,15 +35,32 @@ internal static string GetLatestVersionFromPSGallery(string moduleName, ReleaseT
         /// Get version from PSGallery and merge into one list.
         /// </summary>
         /// <returns>A list of version</returns>
-        internal static List<AzurePSVersion> GetAllVersionsFromGallery(string moduleName, string psRepository)
+        internal static List<AzurePSVersion> GetAllVersionsFromGallery(string moduleName)
         {
             HashSet<AzurePSVersion> galleryVersion = new HashSet<AzurePSVersion>();
             using (PowerShell powershell = PowerShell.Create())
             {
-                powershell.AddScript($"Find-Module -Name {moduleName} -Repository {psRepository} -AllowPrerelease -AllVersions");
+                string findModuleScript;
+                
+                if (!string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_URL")))
+                {
+                    string repository = System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_NAME");
+                    findModuleScript = @"
+$secpasswd = ConvertTo-SecureString $Env:DEFAULT_PS_REPOSITORY_PASSWORD -AsPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential ($Env:DEFAULT_PS_REPOSITORY_USER, $secpasswd)
+Find-PSResource -Name " + moduleName + " -Repository " + repository + " -Credential $credential -Prerelease";
+                }
+                else
+                {
+                    string repository = "PSGallery";
+                    findModuleScript = $"Find-PSResource -Name {moduleName} -Repository {repository} -Prerelease";
+                }
+                
+                powershell.AddScript(findModuleScript);
                 var cmdletResult = powershell.Invoke();
                 foreach (var versionInformation in cmdletResult)
                 {
+                    System.Console.WriteLine(versionInformation);
                     if (versionInformation.Properties["Version"]?.Value != null)
                     {
                         galleryVersion.Add(new AzurePSVersion(versionInformation.Properties["Version"]?.Value?.ToString()));

tools/VersionController/Models/VersionBumper.cs

@@ -44,7 +44,6 @@ public class VersionBumper
         private AzurePSVersion _assignedVersion { get; set;}
 
         public AzurePSVersion MinimalVersion { get; set; }
-        public string PSRepositories { get; set; }
 
         private ReleaseType _releaseType { get; set; }
 
@@ -227,7 +226,7 @@ private string GetBumpedVersion()
                 versionBump = Version.MINOR;
             }
 
-            List<AzurePSVersion> galleryVersion = ModuleHelper.GetAllVersionsFromGallery(_fileHelper.ModuleName, PSRepositories);
+            List<AzurePSVersion> galleryVersion = ModuleHelper.GetAllVersionsFromGallery(_fileHelper.ModuleName);
             AzurePSVersion bumpedVersion = galleryVersion.Count == 0 ? new AzurePSVersion(0, 1, 0) : GetBumpedVersionByType(new AzurePSVersion(_oldVersion), versionBump);
             AzurePSVersion maxGAedVersionInGallery = ModuleHelper.GetLatestVersionFromGalleryUnderSameMajorVersion(bumpedVersion, galleryVersion, false);
             AzurePSVersion maxPreGAedVersionInGallery = ModuleHelper.GetLatestVersionFromGalleryUnderSameMajorVersion(bumpedVersion, galleryVersion, true);

tools/VersionController/Program.cs

@@ -160,28 +160,6 @@ private static bool GetModuleReadMe(string directory)
         /// </summary>
         private static void BumpVersions()
         {
-            string targetRepositories = null;
-            using (PowerShell powershell = PowerShell.Create())
-            {
-                powershell.AddScript("Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process;");
-                powershell.AddScript("Register-PackageSource -Name PSGallery -Location https://www.powershellgallery.com/api/v2 -ProviderName PowerShellGet");
-                powershell.AddScript("Get-PSRepository");
-                var repositories = powershell.Invoke();
-                string psgallery = null;
-                foreach (var repo in repositories)
-                {
-                    if ("https://www.powershellgallery.com/api/v2".Equals(repo.Properties["SourceLocation"]?.Value))
-                    {
-                        psgallery = repo.Properties["Name"]?.Value?.ToString();
-                    }
-                }
-                if (psgallery == null)
-                {
-                    throw new Exception("Cannot calculate module version because PSGallery is not available.");
-                }
-                targetRepositories = psgallery;
-            }
-
             var changedModules = new List<string>();
             foreach (var directory in _projectDirectories)
             {
@@ -254,7 +232,6 @@ private static void BumpVersions()
                 } else {
                     _versionBumper = new VersionBumper(new VersionFileHelper(_rootDirectory, outputModuleManifestFile, projectModuleManifestPath), changedModules, _releaseType);
                 }
-                _versionBumper.PSRepositories = targetRepositories;
                 if (_minimalVersion.ContainsKey(moduleName))
                 {
                     _versionBumper.MinimalVersion = _minimalVersion[moduleName];