hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 01:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Address review comments.

Browse Source
This commit is contained in:
Calum Grant
2020-03-31 15:21:51 +01:00
parent 69041bc959
commit 9a5e80667e
3 changed files with 23 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
csharp/autobuilder/Semmle.Autobuild/AutobuildOptions.cs
View File

@@ -107,13 +107,8 @@ namespace Semmle.Autobuild
static readonly Regex linuxEnvRegEx = new Regex(@"\$([a-zA-Z_][a-zA-Z_0-9]*)", RegexOptions.Compiled);
public static string? AsStringWithExpandedEnvVarsMaybeNull(this string? value, IBuildActions actions)
{
if (string.IsNullOrEmpty(value))
return value;
return value.AsStringWithExpandedEnvVars(actions);
}
public static string? AsStringWithExpandedEnvVarsMaybeNull(this string? value, IBuildActions actions) =>
value?.AsStringWithExpandedEnvVars(actions);
public static string AsStringWithExpandedEnvVars(this string value, IBuildActions actions)
{

54
csharp/autobuilder/Semmle.Autobuild/Autobuilder.cs
View File

@@ -185,34 +185,28 @@ namespace Semmle.Autobuild
});
CodeQLExtractorCSharpRoot = Actions.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_ROOT");
SemmleDist = Actions.GetEnvironmentVariable("SEMMLE_DIST");
CodeQLJavaHome = Actions.GetEnvironmentVariable("CODEQL_JAVA_HOME");
SemmleJavaHome = Actions.GetEnvironmentVariable("SEMMLE_JAVA_HOME");
if(CodeQLJavaHome is null && SemmleJavaHome is null)
throw new InvalidEnvironmentException("The environment variables CODEQL_JAVA_HOME and SEMMLE_JAVA_HOME have not been set.");
SemmlePlatformTools = Actions.GetEnvironmentVariable("SEMMLE_PLATFORM_TOOLS");
if (CodeQLExtractorCSharpRoot is null && SemmleDist is null)
throw new InvalidEnvironmentException("The environment variables CODEQL_EXTRACTOR_CSHARP_ROOT and SEMMLE_DIST have not been set.");
JavaHome =
Actions.GetEnvironmentVariable("CODEQL_JAVA_HOME") ??
Actions.GetEnvironmentVariable("SEMMLE_JAVA_HOME") ??
throw new InvalidEnvironmentException("The environment variable CODEQL_JAVA_HOME or SEMMLE_JAVA_HOME has not been set.");
var trapDir = Actions.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_TRAP_DIR") ?? Actions.GetEnvironmentVariable("TRAP_FOLDER");
Distribution =
CodeQLExtractorCSharpRoot ??
SemmleDist ??
throw new InvalidEnvironmentException("The environment variable CODEQL_EXTRACTOR_CSHARP_ROOT or SEMMLE_DIST has not been set.");
if (trapDir is null)
throw new InvalidEnvironmentException("The environment variables CODEQL_EXTRACTOR_CSHARP_TRAP_DIR and TRAP_FOLDER have not been set.");
TrapDir =
Actions.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_TRAP_DIR") ??
Actions.GetEnvironmentVariable("TRAP_FOLDER") ??
throw new InvalidEnvironmentException("The environment variable CODEQL_EXTRACTOR_CSHARP_TRAP_DIR or TRAP_FOLDER has not been set.");
TrapDir = trapDir;
var sourceArchiveDir = Actions.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR") ?? Actions.GetEnvironmentVariable("SOURCE_ARCHIVE");
if(sourceArchiveDir is null)
throw new InvalidEnvironmentException("The environment variables CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR and SOURCE_ARCHIVE have not been set.");
SourceArchiveDir = sourceArchiveDir;
SourceArchiveDir =
Actions.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR") ??
Actions.GetEnvironmentVariable("SOURCE_ARCHIVE") ??
throw new InvalidEnvironmentException("The environment variable CODEQL_EXTRACTOR_CSHARP_SOURCE_ARCHIVE_DIR or SOURCE_ARCHIVE has not been set.");
}
private string TrapDir { get; }
@@ -407,29 +401,19 @@ namespace Semmle.Autobuild
/// </summary>
private string? CodeQLExtractorCSharpRoot { get; }
/// <summary>
/// Value of CODEQL_JAVA_HOME environment variable.
/// </summary>
private string? CodeQLJavaHome { get; }
/// <summary>
/// Value of SEMMLE_DIST environment variable.
/// </summary>
private string? SemmleDist { get; }
public string Distribution => CodeQLExtractorCSharpRoot ?? SemmleDist!;
public string Distribution { get; }
public string JavaHome => CodeQLJavaHome ?? SemmleJavaHome!;
/// <summary>
/// Value of SEMMLE_JAVA_HOME environment variable.
/// </summary>
public string? SemmleJavaHome { get; private set; }
public string JavaHome { get; }
/// <summary>
/// Value of SEMMLE_PLATFORM_TOOLS environment variable.
/// </summary>
public string? SemmlePlatformTools { get; private set; }
public string? SemmlePlatformTools { get; }
/// <summary>
/// The absolute path of the odasa executable.

4
csharp/extractor/Semmle.Util/CanonicalPathCache.cs
View File

@@ -127,8 +127,8 @@ namespace Semmle.Util
if (parent != null)
{
string? name = Path.GetFileName(path);
string? parentPath = cache.GetCanonicalPath(parent.FullName);
var name = Path.GetFileName(path);
var parentPath = cache.GetCanonicalPath(parent.FullName);
try
{
string[] entries = Directory.GetFileSystemEntries(parentPath, name);