Skip to content

Commit 35054be

Browse files
authored
Fix the CFS issue in OOB release pipeline (#28325)
1 parent 95c2009 commit 35054be

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

tools/VersionController/Models/ModuleHelper.cs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,27 @@ internal class ModuleHelper
1414
/// <returns></returns>
1515
internal static string GetLatestVersionFromPSGallery(string moduleName, ReleaseType releaseType = ReleaseType.STS)
1616
{
17-
1817
string version = null;
19-
string findModuleScript = releaseType == ReleaseType.STS ? $"Find-Module {moduleName} -Repository PSGallery -AllVersions" : "Find-Module Az -Repository PSGallery -AllVersions";
20-
string filterRequiredReleaseTypeScript = releaseType == ReleaseType.STS ? "" : "| Where-Object {([System.Version]($_.Version)).Major%2 -eq 0}";
21-
string sortModuleScript = "| Sort-Object {[System.Version]$_.Version} -Descending";
18+
string findModuleScript;
19+
20+
if (!string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_URL")))
21+
{
22+
string repository = System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_NAME");
23+
findModuleScript = @"
24+
$AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force;
25+
$credentialsObject = [pscredential]::new('ONEBRANCH_TOKEN', $AccessTokenSecureString);
26+
";
27+
findModuleScript += releaseType == ReleaseType.STS
28+
? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version * -Credential $credentialsObject"
29+
: $"Find-PSResource -Name Az -Repository {repository} -Version * -Credential $credentialsObject";
30+
}
31+
else
32+
{
33+
string repository = "PSGallery";
34+
findModuleScript = releaseType == ReleaseType.STS ? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version *" : $"Find-PSResource -Name Az -Repository {repository} -Version *";
35+
}
36+
string filterRequiredReleaseTypeScript = releaseType == ReleaseType.STS ? "" : "| Where-Object {$_.Version.Major % 2 -eq 0}";
37+
string sortModuleScript = "| Sort-Object {$_.Version} -Descending";
2238
string getLastModuleVersionScript = releaseType == ReleaseType.STS ?
2339
$"({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Version" :
2440
$"(({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Dependencies | Where-Object {{$_.Name -eq '{moduleName}'}})[1]";

0 commit comments

Comments
 (0)