Skip to content

fix static analysis error for Azure.Core #12293

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.

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 2 commits into from
Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public void Analyze(
foreach (var baseDirectory in cmdletProbingDirs.Where(s => !s.Contains("ServiceManagement") &&
!ModuleFilter.IsAzureStackModule(s) && Directory.Exists(Path.GetFullPath(s))))
{
SharedAssemblyLoader.Load(baseDirectory);
var probingDirectories = new List<string> {baseDirectory};

// Add current directory for probing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ public class DependencyAnalyzer : IStaticAnalyzer
"System.Security.AccessControl",
"System.Security.Principal.Windows",
"System.Data.SqlClient",
"System.Security.Cryptography.ProtectedData"
"System.Security.Cryptography.ProtectedData",
"System.Text.Json" //TODO: Compare Version along with Azure.Core
};

private readonly Dictionary<string, AssemblyRecord> _assemblies =
Expand Down Expand Up @@ -226,6 +227,7 @@ public void Analyze(IEnumerable<string> directories, IEnumerable<String> modules
_dependencyMapLogger = Logger.CreateLogger<DependencyMap>("DependencyMap.csv");
foreach (var baseDirectory in directories)
{
SharedAssemblyLoader.Load(baseDirectory);
foreach (var directoryPath in Directory.EnumerateDirectories(baseDirectory))
{
if (modulesToAnalyze != null &&
Expand Down Expand Up @@ -291,6 +293,9 @@ private bool AddSharedAssembly(AssemblyRecord assembly)
{
var stored = _sharedAssemblyReferences[assembly.AssemblyName];
if (assembly.Equals(stored) || IsFrameworkAssembly(assembly.AssemblyName) && assembly.Version.Major <= 4) return true;
//TODO: Compare Azure.Core version
if (string.Equals(assembly.AssemblyName.Name, "Azure.Core", StringComparison.InvariantCultureIgnoreCase))
return true;

_sharedConflictLogger.LogRecord(new SharedAssemblyConflict
{
Expand Down
26 changes: 1 addition & 25 deletions tools/StaticAnalysis/HelpAnalyzer/HelpAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void Analyze(IEnumerable<string> scopes, IEnumerable<string> modulesToAna
var helpLogger = Logger.CreateLogger<HelpIssue>("HelpIssues.csv");
foreach (var baseDirectory in scopes.Where(s => Directory.Exists(Path.GetFullPath(s))))
{
PreloadSharedAssemblies(baseDirectory);
SharedAssemblyLoader.Load(baseDirectory);
foreach (var directory in Directory.EnumerateDirectories(Path.GetFullPath(baseDirectory)))
{
if (modulesToAnalyze != null &&
Expand All @@ -116,30 +116,6 @@ public void Analyze(IEnumerable<string> scopes, IEnumerable<string> modulesToAna
}
}

private static void PreloadSharedAssemblies(string directory)
{
var sharedAssemblyFolder = Path.Combine(directory, "Az.Accounts", "NetCoreAssemblies");
if (Directory.Exists(sharedAssemblyFolder))
{
foreach (var file in Directory.GetFiles(sharedAssemblyFolder))
{
try
{
Console.WriteLine($"PreloadSharedAssemblies: Starting to load assembly {file}.");
Assembly.LoadFrom(file);
}
catch (Exception e)
{
Console.WriteLine($"PreloadSharedAssemblies: Failed to load assembly {Path.GetFileNameWithoutExtension(file)} with {e}");
}
}
}
else
{
Console.WriteLine($"PreloadSharedAssemblies: Could not find directory {sharedAssemblyFolder}.");
}
}

private void AnalyzeMamlHelp(
IEnumerable<string> scopes,
string directory,
Expand Down
47 changes: 47 additions & 0 deletions tools/StaticAnalysis/SharedAssemblyLoader.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text;

namespace StaticAnalysis
{
internal class SharedAssemblyLoader
{
public static HashSet<string> ProcessedFolderSet = new HashSet<string>();

public static void Load(string directory)
{
directory = Path.GetFullPath(directory);
if(!ProcessedFolderSet.Contains(directory))
{
ProcessedFolderSet.Add(directory);
PreloadSharedAssemblies(directory);
}
}

private static void PreloadSharedAssemblies(string directory)
{
var sharedAssemblyFolder = Path.Combine(directory, "Az.Accounts", "NetCoreAssemblies");
if (Directory.Exists(sharedAssemblyFolder))
{
foreach (var file in Directory.GetFiles(sharedAssemblyFolder))
{
try
{
Console.WriteLine($"PreloadSharedAssemblies: Starting to load assembly {file}.");
Assembly.LoadFrom(file);
}
catch (Exception e)
{
Console.WriteLine($"PreloadSharedAssemblies: Failed (but could be IGNORED) to load assembly {Path.GetFileNameWithoutExtension(file)} with {e}");
}
}
}
else
{
Console.WriteLine($"PreloadSharedAssemblies: Could not find directory {sharedAssemblyFolder}.");
}
}
}
}
2 changes: 2 additions & 0 deletions tools/StaticAnalysis/SignatureVerifier/SignatureVerifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ public void Analyze(IEnumerable<string> cmdletProbingDirs,
foreach (var baseDirectory in cmdletProbingDirs.Where(s => !s.Contains("ServiceManagement") &&
!ModuleFilter.IsAzureStackModule(s) && Directory.Exists(Path.GetFullPath(s))))
{
SharedAssemblyLoader.Load(baseDirectory);

//Add current directory for probing
probingDirectories.Add(baseDirectory);
probingDirectories.AddRange(Directory.EnumerateDirectories(Path.GetFullPath(baseDirectory)));
Expand Down