Skip to content

[Eng] Fixed data plane suffix in Linux system #28138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 6, 2025
Merged

[Eng] Fixed data plane suffix in Linux system #28138

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5bb176
fix suffix to match actual file names
VeryEarly Jul 5, 2025
0406737
fix
VeryEarly Jul 5, 2025
953c895
fix
VeryEarly Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions tools/BuildScripts/BuildScripts.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ function Update-GeneratedSubModule {

# save guid from psd1 if existed for later use
$subModuleNameTrimmed = $SubModuleName.split('.')[-2]
if (Test-Path (Join-Path $GeneratedDirectory "Az.$subModuleNameTrimmed.psd1")) {
$guid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName "Az.$subModuleNameTrimmed.psd1").GUID
$psd1Name = Get-ChildItem $GeneratedDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psd1" } | Foreach-Object {$_.Name}
if ($psd1Name -And (Test-Path (Join-Path $GeneratedDirectory $psd1Name))) {
$guid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName $psd1Name).GUID
}

# clean generated directory before update
Expand All @@ -160,22 +161,31 @@ function Update-GeneratedSubModule {
if (Test-Path $localModulesPath) {
Remove-Item -Path $localModulesPath -Recurse -Force
}
$fileToUpdate = @('generated', 'resources', "Az.$subModuleNameTrimmed.psd1", "Az.$subModuleNameTrimmed.psm1", "Az.$subModuleNameTrimmed.format.ps1xml", 'exports', 'internal', 'test-module.ps1', 'check-dependencies.ps1')

$psd1Name = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psd1" } | Foreach-Object {$_.Name}
$psm1Name = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psm1" } | Foreach-Object {$_.Name}
$formatName = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.format\.ps1xml" } | Foreach-Object {$_.Name}
$csprojName = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.csproj" } | Foreach-Object {$_.Name}
$fileToUpdate = @('generated', 'resources', $psd1Name, $psm1Name, $formatName, 'exports', 'internal', 'test-module.ps1', 'check-dependencies.ps1')
# Copy from src/ to generated/
$fileToUpdate | Foreach-Object {
$moveFrom = Join-Path $SourceDirectory $_
$moveTo = Join-Path $GeneratedDirectory $_
Write-Host "Copying $moveFrom to $moveTo ..." -ForegroundColor Cyan
Copy-Item -Path $moveFrom -Destination $moveTo -Recurse -Force
}
$cSubModuleNameTrimmed = $subModuleNameTrimmed
if ($csprojName -match "^Az\.(?<cSubModuleName>\w+)\.csproj$") {
$cSubModuleNameTrimmed = $Matches["cSubModuleName"]
}
# regenerate csproj
New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName "Az.$subModuleNameTrimmed.csproj" -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed -SubModuleNameFull $SubModuleName
New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName $csprojName -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $cSubModuleNameTrimmed -SubModuleNameFull $SubModuleName

# revert guid in psd1 so that no conflict in updating this file
if ($guid) {
$psd1Path = Join-Path $GeneratedDirectory "Az.$subModuleNameTrimmed.psd1"
$psd1Path = Join-Path $GeneratedDirectory $psd1Name
$psd1Content = Get-Content $psd1Path
$newGuid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName "Az.$subModuleNameTrimmed.psd1").GUID
$newGuid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName $psd1Name).GUID
$psd1Content -replace $newGuid, $guid | Set-Content $psd1Path -Force
}

Expand Down
Loading