Sync tools folder from main branch to generation branch

Author: azurepowershell

tools/ExecuteCIStep.ps1

@@ -327,7 +327,6 @@ If ($StaticAnalysisUX)
     If ("" -Ne $UXModuleList)
     {
         Write-Host "Running static analysis for UX metadata..."
-        .("$PSScriptRoot/StaticAnalysis/UXMetadataAnalyzer/PrepareUXMetadata.ps1") -RepoArtifacts $RepoArtifacts -Configuration $Configuration
         dotnet $RepoArtifacts/StaticAnalysis/StaticAnalysis.Netcore.dll -p $RepoArtifacts/$Configuration -r $StaticAnalysisOutputDirectory --analyzers ux -u -m $UXModuleList
     }
     Return

tools/Gen2Master/MoveFromGeneration2Master.ps1

@@ -259,7 +259,12 @@ Function Move-Generation2MasterHybrid {
             }
 
             #copy generated docs to help folder
-            Copy-Item -Path ("$SourcePath\{0}\docs\*" -f $submoduleDir.Name) -Destination "$DestPath\$ModuleName\help" -Filter *-*
+            #Assume psd1 and help are in the same folder.
+            $Psd1FolderPostfix = '';
+            if (-not (Test-Path (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName) -ChildPath "Az.$ModuleName.psd1"))) {
+                $Psd1FolderPostfix = '.Management'
+            }
+            Copy-Item -Path ("$SourcePath\{0}\docs\*" -f $submoduleDir.Name) -Destination "$DestPath\$ModuleName$Psd1FolderPostfix\help" -Filter *-*
 
             #Region generate-info.json Here have a issue that user may not use latest version to generate the code.
             $generateInfo = @{}
@@ -299,10 +304,6 @@ Function Move-Generation2MasterHybrid {
             dotnet sln $SolutionPath add (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $submoduleDir.Name) -ChildPath Az.$submoduleName.csproj)
 
             # Update psd1
-            $Psd1FolderPostfix = '';
-            if (-not (Test-Path (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName) -ChildPath "Az.$ModuleName.psd1"))) {
-                $Psd1FolderPostfix = '.Management'
-            }
             $DestPsd1Path = Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName$Psd1FolderPostfix) -ChildPath "Az.$ModuleName.psd1"
             $Psd1Metadata = Import-LocalizedData -BaseDirectory (Join-Path -Path $DestPath -ChildPath $ModuleName$Psd1FolderPostfix) -FileName "Az.$ModuleName.psd1"
             $SubModulePsd1MetaData = Import-LocalizedData -BaseDirectory (Join-Path -Path $SourcePath -ChildPath $submoduleDir.Name) -FileName "Az.$submoduleName.psd1"

tools/StaticAnalysis/Exceptions/Az.Compute/UXMetadataIssues.csv

@@ -0,0 +1,2 @@
+"Module","Severity","ResourceType","SubResourceType","Command","Description"
+"Az.Compute","1","Microsoft.Compute","virtualMachineScaleSets","Stop-AzVmss","The value of -StayProvisioned is not defined."

tools/StaticAnalysis/Exceptions/Az.KeyVault/UXMetadataIssues.csv

@@ -0,0 +1,4 @@
+"Module","Severity","ResourceType","SubResourceType","Command","Description"
+"Az.KeyVault","1","Microsoft.KeyVault","vaults","Get-AzKeyVaultKey","resourceGroupName is defined in path but cannot find in example"
+"Az.KeyVault","1","Microsoft.KeyVault","vaults","Get-AzKeyVaultCertificate","resourceGroupName is defined in path but cannot find in example"
+"Az.KeyVault","1","Microsoft.KeyVault","vaults","Get-AzKeyVaultSecret","resourceGroupName is defined in path but cannot find in example"

tools/StaticAnalysis/Exceptions/Az.MobileNetwork/SignatureIssues.csv

@@ -0,0 +1,3 @@
+"Module","Severity","ResourceType","SubResourceType","Command","Description"
+"Az.RedisEnterpriseCache","1","Microsoft.Cache","redisEnterprise-databases","Invoke-AzRedisEnterpriseCacheForceDatabaseUnlink","Cannot find a matched parameter set for example of Invoke-AzRedisEnterpriseCacheForceDatabaseUnlink"
+"Az.RedisEnterpriseCache","1","Microsoft.Cache","redisEnterprise-databases","Invoke-AzRedisEnterpriseCacheForceDatabaseUnlink","databaseName is defined in path but cannot find in example"

tools/StaticAnalysis/Exceptions/Az.RedisEnterpriseCache/UXMetadataIssues.csv

@@ -111,21 +111,19 @@ public void Analyze(
                         continue;
                     }
                     string moduleName = Path.GetFileName(directory);
-
+                    string moduleFolder = Path.Combine(savedDirectory, "src", moduleName.Replace("Az.", ""));
                     Directory.SetCurrentDirectory(directory);
 
                     var moduleMetadata = MetadataLoader.GetModuleMetadata(moduleName);
 
-                    string UXFolder = Path.Combine(directory, "UX");
-                    if (!Directory.Exists(UXFolder))
-                    {
-                        continue;
-                    }
-
-                    var UXMetadataPathList = Directory.EnumerateFiles(UXFolder, "*.json", SearchOption.AllDirectories);
-                    foreach (var UXMetadataPath in UXMetadataPathList)
+                    string[] UXFolders = Directory.GetDirectories(moduleFolder, "UX", SearchOption.AllDirectories);
+                    foreach (var UXFolder in UXFolders)
                     {
-                        ValidateUXMetadata(moduleName, UXMetadataPath, moduleMetadata, issueLogger);
+                        var UXMetadataPathList = Directory.EnumerateFiles(UXFolder, "*.json", SearchOption.AllDirectories);
+                        foreach (var UXMetadataPath in UXMetadataPathList)
+                        {
+                            ValidateUXMetadata(moduleName, UXMetadataPath, moduleMetadata, issueLogger);
+                        }
                     }
                     Directory.SetCurrentDirectory(savedDirectory);
                 }
@@ -261,8 +259,15 @@ private void ValidateParametersDefinedInPathContainsInExample(IssueLoggerContext
         private void ValidateParametersInExampleDefinedInPath(IssueLoggerContext context, HashSet<string> parametersFromHttpPath, UXMetadataCommandExample example, ReportLogger<UXMetadataIssue> issueLogger)
         {
             var exampleParameterPathRegex = new Regex(@"path\.([\w]+)");
-            foreach (string parameterInExample in example.Parameters.Select(x => x.Value))
+            foreach (var parameter in example.Parameters)
             {
+                string parameterInExample = parameter.Value;
+                if (parameterInExample == null)
+                {
+                    string description = string.Format("The value of {0} is not defined.", parameter.Name);
+                    issueLogger.LogUXMetadataIssue(context, 1, description);
+                    continue;
+                }
                 var match = exampleParameterPathRegex.Match(parameterInExample);
                 if (!match.Success)
                 {

tools/StaticAnalysis/UXMetadataAnalyzer/PrepareUXMetadata.ps1

@@ -58,7 +58,7 @@ public bool Match(IReportRecord other)
 
         public IReportRecord Parse(string line)
         {
-            var matcher = "\"([^\"]+)\",\"([^\"]+)\",\"([^\"]+)\",\"([^\"]+)\",\"([^\"]+)\",\"([^\"]+)\"";
+            var matcher = "\"([^\"]+)\",\"([^\"]+)\",\"([^\"]+)\",\"([^\"]+)\",\"([^\"]*)\",\"([^\"]+)\"";
             var match = Regex.Match(line, matcher);
             if (!match.Success || match.Groups.Count < 7)
             {