ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-12 18:18:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ServiceConfiguration.OneFuzzVersion (#2316)

Browse Source
This commit is contained in:
George Pollard
2022-08-30 12:08:56 +12:00
committed by GitHub
parent 5a8aa33af1
commit ef434db201
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ApiService/ApiService/Functions/Info.cs
View File

@ -31,13 +31,13 @@ public class Info {
var asm = Assembly.GetExecutingAssembly(); var asm = Assembly.GetExecutingAssembly();
var gitVersion = ReadResource(asm, "ApiService.onefuzzlib.git.version"); var gitVersion = ReadResource(asm, "ApiService.onefuzzlib.git.version");
var buildId = ReadResource(asm, "ApiService.onefuzzlib.build.id"); var buildId = ReadResource(asm, "ApiService.onefuzzlib.build.id");
var versionString = asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion; var versionString = context.ServiceConfiguration.OneFuzzVersion;
return new InfoResponse( return new InfoResponse(
ResourceGroup: resourceGroup, ResourceGroup: resourceGroup,
Subscription: subscription, Subscription: subscription,
Region: region, Region: region,
Versions: new Dictionary<string, InfoVersion> { { "onefuzz", new(gitVersion, buildId, versionString ?? "") } }, Versions: new Dictionary<string, InfoVersion> { { "onefuzz", new(gitVersion, buildId, versionString) } },
InstanceId: await _context.Containers.GetInstanceId(), InstanceId: await _context.Containers.GetInstanceId(),
InsightsAppid: config.ApplicationInsightsAppId, InsightsAppid: config.ApplicationInsightsAppId,
InsightsInstrumentationKey: config.ApplicationInsightsInstrumentationKey); InsightsInstrumentationKey: config.ApplicationInsightsInstrumentationKey);

20
src/ApiService/ApiService/ServiceConfiguration.cs
View File

@ -1,4 +1,6 @@
namespace Microsoft.OneFuzz.Service; using System.Reflection;
namespace Microsoft.OneFuzz.Service;
public enum LogDestination { public enum LogDestination {
Console, Console,
@ -49,6 +51,11 @@ public interface IServiceConfig {
public class ServiceConfiguration : IServiceConfig { public class ServiceConfiguration : IServiceConfig {
// Version is baked into the assembly by the build process:
private static readonly string? _oneFuzzVersion =
Assembly.GetExecutingAssembly()
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
public ServiceConfiguration() { public ServiceConfiguration() {
#if DEBUG #if DEBUG
LogDestinations = new LogDestination[] { LogDestination.AppInsights, LogDestination.Console }; LogDestinations = new LogDestination[] { LogDestination.AppInsights, LogDestination.Console };
@ -86,7 +93,16 @@ public class ServiceConfiguration : IServiceConfig {
public string? OneFuzzOwner { get => Environment.GetEnvironmentVariable("ONEFUZZ_OWNER"); } public string? OneFuzzOwner { get => Environment.GetEnvironmentVariable("ONEFUZZ_OWNER"); }
public string? OneFuzzResourceGroup { get => Environment.GetEnvironmentVariable("ONEFUZZ_RESOURCE_GROUP"); } public string? OneFuzzResourceGroup { get => Environment.GetEnvironmentVariable("ONEFUZZ_RESOURCE_GROUP"); }
public string? OneFuzzTelemetry { get => Environment.GetEnvironmentVariable("ONEFUZZ_TELEMETRY"); } public string? OneFuzzTelemetry { get => Environment.GetEnvironmentVariable("ONEFUZZ_TELEMETRY"); }
public string OneFuzzVersion { get => Environment.GetEnvironmentVariable("ONEFUZZ_VERSION") ?? "0.0.0"; }
public string OneFuzzVersion {
get {
// version can be overridden by config:
return Environment.GetEnvironmentVariable("ONEFUZZ_VERSION")
?? _oneFuzzVersion
?? throw new InvalidOperationException("Unable to read OneFuzz version from assembly");
}
}
public string? OneFuzzAllowOutdatedAgent => Environment.GetEnvironmentVariable("ONEFUZZ_ALLOW_OUTDATED_AGENT"); public string? OneFuzzAllowOutdatedAgent => Environment.GetEnvironmentVariable("ONEFUZZ_ALLOW_OUTDATED_AGENT");
public string OneFuzzNodeDisposalStrategy { get => Environment.GetEnvironmentVariable("ONEFUZZ_NODE_DISPOSAL_STRATEGY") ?? "scale_in"; } public string OneFuzzNodeDisposalStrategy { get => Environment.GetEnvironmentVariable("ONEFUZZ_NODE_DISPOSAL_STRATEGY") ?? "scale_in"; }

4
src/ApiService/ApiService/onefuzzlib/ReproOperations.cs
View File

@ -31,8 +31,8 @@ public interface IReproOperations : IStatefulOrm<Repro, VmState> {
public class ReproOperations : StatefulOrm<Repro, VmState, ReproOperations>, IReproOperations { public class ReproOperations : StatefulOrm<Repro, VmState, ReproOperations>, IReproOperations {
private static readonly Dictionary<Os, string> DEFAULT_OS = new() private static readonly Dictionary<Os, string> DEFAULT_OS = new()
{ {
{Os.Linux, "Canonical:UbuntuServer:18.04-LTS:latest"}, { Os.Linux, "Canonical:UbuntuServer:18.04-LTS:latest" },
{Os.Windows, "MicrosoftWindowsDesktop:Windows-10:20h2-pro:latest"} { Os.Windows, "MicrosoftWindowsDesktop:Windows-10:20h2-pro:latest" }
}; };
const string DEFAULT_SKU = "Standard_DS1_v2"; const string DEFAULT_SKU = "Standard_DS1_v2";