Skip to content

Sync tools code from main branch to generation branch #23139

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 1 commit into from
Nov 2, 2023
Merged

Sync tools code from main branch to generation branch #23139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/CIFilterTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,6 @@ private bool ProcessTargetModule(Dictionary<string, string[]> csprojMap)
[BUILD_PHASE] = new HashSet<string>(GetBuildCsprojList(TargetModule, csprojMap).ToList()),
[TEST_PHASE] = new HashSet<string>(GetTestCsprojList(TargetModule, csprojMap).ToList())
};
foreach (var analysisPhase in ANALYSIS_PHASE_LIST)
{
influencedModuleInfo.Add(analysisPhase, new HashSet<string>(GetDependenceModuleList(TargetModule, csprojMap).ToList()));
}

Console.WriteLine("----------------- InfluencedModuleInfo TargetModule -----------------");
foreach (string phaseName in influencedModuleInfo.Keys)
Expand Down
17 changes: 17 additions & 0 deletions tools/StaticAnalysis/Exceptions/Az.CloudService/BreakingChangeIssues.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
"Module","ClassName","Target","Severity","ProblemId","Description","Remediation"
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'ProtectionMode' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IDdosSettings' has been removed.","Add the property 'ProtectionMode' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IDdosSettings'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'DdosProtectionPlanId' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IDdosSettings' has been removed.","Add the property 'DdosProtectionPlanId' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IDdosSettings'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'InboundNatRulesPortMapping' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ILoadBalancerBackendAddress' has been removed.","Add the property 'InboundNatRulesPortMapping' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ILoadBalancerBackendAddress'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'AdminState' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ILoadBalancerBackendAddress' has been removed.","Add the property 'AdminState' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ILoadBalancerBackendAddress'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'InboundNatRule' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IBackendAddressPool' has been removed.","Add the property 'InboundNatRule' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IBackendAddressPool'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'DrainPeriodInSecond' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IBackendAddressPool' has been removed.","Add the property 'DrainPeriodInSecond' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.IBackendAddressPool'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'FlushConnection' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ISubnet' has been removed.","Add the property 'FlushConnection' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ISubnet'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'AuxiliaryMode' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'AuxiliaryMode' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'VnetEncryptionSupported' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'VnetEncryptionSupported' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'DisableTcpStateTracking' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'DisableTcpStateTracking' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'FlushConnection' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'FlushConnection' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'FlushConnection' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ISubnet' has been removed.","Add the property 'FlushConnection' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.ISubnet'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'AuxiliaryMode' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'AuxiliaryMode' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'VnetEncryptionSupported' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'VnetEncryptionSupported' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'DisableTcpStateTracking' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'DisableTcpStateTracking' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
"Az.CloudService","Get-AzCloudServiceNetworkInterface","Get-AzCloudServiceNetworkInterface","0","3010","The property 'FlushConnection' of type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface' has been removed.","Add the property 'FlushConnection' back to type 'Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220701.INetworkInterface'."
39 changes: 14 additions & 25 deletions tools/StaticAnalysis/GeneratedSdkAnalyzer/SDKGeneratedCodeVerify.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,6 @@ Class GeneratedSdkIssue {
$ExceptionList = @()
$SavePath = $PWD

$skipModules = @(
'Az.AlertsManagement',
'Az.Automation',
'Az.CognitiveServices',
'Az.CosmosDB',
'Az.KeyVault',
'Az.NetAppFiles',
'Az.RecoveryServices',
'Az.RedisCache',
'Az.Storage',
'Az.Search',
'Az.Security',
'Az.Sql',
'Az.TrafficManager'
)

$MissReadMe = 9000
$GenSdkChanged = 9090
try {
Expand All @@ -69,12 +53,6 @@ try {
# Extract Module Name
$ModuleName = "Az." + ($_ -split "\/|\\")[1]

# Skip check for modules listed in $skipModules
if ($skipModules.Contains($ModuleName)) {
Write-Host "Skip checking $ModuleName"
continue
}

# Skip check for modules without README.md and .Sdk folder.
if (-not(Test-Path -Path "$PSScriptRoot/../../../$_/README.md" -PathType Leaf) -and -not(Test-Path -Path $PSScriptRoot/../../../$_))
{
Expand All @@ -88,8 +66,19 @@ try {

# Regenerate the Sdk under Generated folder
if( Test-Path -Path "README.md" -PathType Leaf){
Write-Host "Re-generating SDK under Generated folder for $ModuleName..."
npx autorest --use:@microsoft.azure/autorest.csharp@2.3.90
# Decide to use autorest powershell v4/ autorest csharp v3.
$readMeContent = Get-Content README.md
if ([regex]::Matches($readMeContent, '\s*powershell\s*:\s*true\s*') -and [regex]::Matches($readMeContent, '\s*isSdkGenerator\s*:\s*true\s*'))
{
Write-Host "Using autorest powershell v4:`nRe-generating SDK under Generated folder for $ModuleName..."
npx autorest --use:@autorest/powershell@4.x
}
else
{
Write-Host "Using autorest csharp v3:`nRe-generating SDK under Generated folder for $ModuleName..."
npx autorest --use:@microsoft.azure/autorest.csharp@2.3.90
}

If (($LASTEXITCODE -ne 0) -and ($LASTEXITCODE -ne $null))
{
$ExceptionList += [GeneratedSdkIssue]@{
Expand All @@ -101,7 +90,7 @@ try {
Remediation = ""
}
}
npx autorest README.md --version=v2

If (($LASTEXITCODE -ne 0) -and ($LASTEXITCODE -ne $null))
{
$ExceptionList += [GeneratedSdkIssue]@{
Expand Down