Release 8.7.1 (hotfix) (#3459)

* Remove the retention policy setting (#3452)

---------

Co-authored-by: Cheick Keita <[email protected]>

Author: AdamL-Microsoft

.devcontainer/devcontainer.json

@@ -13,7 +13,6 @@
 					"**/target/**": true
 				},
 				"lldb.executable": "/usr/bin/lldb",
-				"dotnet.server.useOmnisharp": true,
 				"omnisharp.enableEditorConfigSupport": true,
 				"omnisharp.enableRoslynAnalyzers": true,
 				"python.defaultInterpreterPath": "/workspaces/onefuzz/src/venv/bin/python",
@@ -49,4 +48,4 @@
 	"features": {
 		"ghcr.io/devcontainers/features/azure-cli:1": {}
 	}
-}
+}

.github/workflows/ci.yml

@@ -542,11 +542,9 @@ jobs:
 
           mkdir -p artifacts/linux-libfuzzer
           mkdir -p artifacts/linux-libfuzzer-with-options
-          mkdir -p artifacts/mariner-libfuzzer
           (cd libfuzzer ; make )
           cp -r libfuzzer/fuzz.exe libfuzzer/seeds artifacts/linux-libfuzzer
           cp -r libfuzzer/fuzz.exe libfuzzer/seeds artifacts/linux-libfuzzer-with-options
-          cp -r libfuzzer/fuzz.exe libfuzzer/seeds artifacts/mariner-libfuzzer
 
           mkdir -p artifacts/linux-libfuzzer-regression
           (cd libfuzzer-regression ; make )

CHANGELOG.md

@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 8.7.1
+
+### Fixed
+
+* Service: Removed deprecated Azure retention policy setting that was causing scaleset deployment errors [#3452](https://github.com/microsoft/onefuzz/pull/3452)
+
 ## 8.7.0
 
 ### Added

CURRENT_VERSION

@@ -1 +1 @@
-8.7.0
+8.7.1

src/ApiService/ApiService/Functions/QueueJobResult.cs

@@ -33,19 +33,6 @@ public enum HeartbeatType {
     TaskAlive,
 }
 
-[SkipRename]
-public enum JobResultType {
-    NewCrashingInput,
-    NoReproCrashingInput,
-    NewReport,
-    NewUniqueReport,
-    NewRegressionReport,
-    NewCoverage,
-    NewCrashDump,
-    CoverageData,
-    RuntimeStats,
-}
-
 public record HeartbeatData(HeartbeatType Type);
 
 public record TaskHeartbeatEntry(
@@ -54,16 +41,6 @@ public record TaskHeartbeatEntry(
     Guid MachineId,
     HeartbeatData[] Data);
 
-public record JobResultData(JobResultType Type);
-
-public record TaskJobResultEntry(
-    Guid TaskId,
-    Guid? JobId,
-    Guid MachineId,
-    JobResultData Data,
-    Dictionary<string, double> Value
-    );
-
 public record NodeHeartbeatEntry(Guid NodeId, HeartbeatData[] Data);
 
 public record NodeCommandStopIfFree();
@@ -915,27 +892,6 @@ public record SecretAddress<T>(Uri Url) : ISecret<T> {
 public record SecretData<T>(ISecret<T> Secret) {
 }
 
-public record JobResult(
-    [PartitionKey][RowKey] Guid JobId,
-    string Project,
-    string Name,
-    double NewCrashingInput = 0,
-    double NoReproCrashingInput = 0,
-    double NewReport = 0,
-    double NewUniqueReport = 0,
-    double NewRegressionReport = 0,
-    double NewCrashDump = 0,
-    double InstructionsCovered = 0,
-    double TotalInstructions = 0,
-    double CoverageRate = 0,
-    double IterationCount = 0
-) : EntityBase() {
-    public JobResult(Guid JobId, string Project, string Name) : this(
-        JobId: JobId,
-        Project: Project,
-        Name: Name, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) { }
-}
-
 public record JobConfig(
     string Project,
     string Name,
@@ -1100,7 +1056,6 @@ public record TaskUnitConfig(
     string? InstanceTelemetryKey,
     string? MicrosoftTelemetryKey,
     Uri HeartbeatQueue,
-    Uri JobResultQueue,
     Dictionary<string, string> Tags
     ) {
     public Uri? inputQueue { get; set; }

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -118,7 +118,6 @@ public static async Async.Task Main() {
                 .AddScoped<IVmOperations, VmOperations>()
                 .AddScoped<ISecretsOperations, SecretsOperations>()
                 .AddScoped<IJobOperations, JobOperations>()
-                .AddScoped<IJobResultOperations, JobResultOperations>()
                 .AddScoped<INsgOperations, NsgOperations>()
                 .AddScoped<IScheduler, Scheduler>()
                 .AddScoped<IConfig, Config>()

src/ApiService/ApiService/Program.cs

@@ -71,7 +71,6 @@ private static BlobContainerSasPermissions ConvertPermissions(ContainerPermissio
             InstanceTelemetryKey: _serviceConfig.ApplicationInsightsInstrumentationKey,
             MicrosoftTelemetryKey: _serviceConfig.OneFuzzTelemetry,
             HeartbeatQueue: await _queue.GetQueueSas("task-heartbeat", StorageType.Config, QueueSasPermissions.Add) ?? throw new Exception("unable to get heartbeat queue sas"),
-            JobResultQueue: await _queue.GetQueueSas("job-result", StorageType.Config, QueueSasPermissions.Add) ?? throw new Exception("unable to get heartbeat queue sas"),
             Tags: task.Config.Tags ?? new Dictionary<string, string>()
         );
 

src/ApiService/ApiService/onefuzzlib/Config.cs

@@ -36,9 +36,7 @@ public async Async.Task<IList<VMExtensionWrapper>> GenericExtensions(AzureLocati
         var extensions = new List<VMExtensionWrapper>();
 
         var instanceConfig = await _context.ConfigOperations.Fetch();
-        if (vmOs == Os.Windows) {
-            extensions.Add(await MonitorExtension(region));
-        }
+        extensions.Add(await MonitorExtension(region, vmOs));
 
         var depenency = DependencyExtension(region, vmOs);
         if (depenency is not null) {
@@ -331,21 +329,37 @@ public async Async.Task<VMExtensionWrapper> AgentConfig(AzureLocation region, Os
         throw new NotSupportedException($"unsupported OS: {vmOs}");
     }
 
-    public async Async.Task<VMExtensionWrapper> MonitorExtension(AzureLocation region) {
+    public async Async.Task<VMExtensionWrapper> MonitorExtension(AzureLocation region, Os vmOs) {
         var settings = await _context.LogAnalytics.GetMonitorSettings();
         var extensionSettings = JsonSerializer.Serialize(new { WorkspaceId = settings.Id }, _extensionSerializerOptions);
         var protectedExtensionSettings = JsonSerializer.Serialize(new { WorkspaceKey = settings.Key }, _extensionSerializerOptions);
-        return new VMExtensionWrapper {
-            Location = region,
-            Name = "OMSExtension",
-            TypePropertiesType = "MicrosoftMonitoringAgent",
-            Publisher = "Microsoft.EnterpriseCloud.Monitoring",
-            TypeHandlerVersion = "1.0",
-            AutoUpgradeMinorVersion = true,
-            Settings = new BinaryData(extensionSettings),
-            ProtectedSettings = new BinaryData(protectedExtensionSettings),
-            EnableAutomaticUpgrade = false
-        };
+        if (vmOs == Os.Windows) {
+            return new VMExtensionWrapper {
+                Location = region,
+                Name = "OMSExtension",
+                TypePropertiesType = "MicrosoftMonitoringAgent",
+                Publisher = "Microsoft.EnterpriseCloud.Monitoring",
+                TypeHandlerVersion = "1.0",
+                AutoUpgradeMinorVersion = true,
+                Settings = new BinaryData(extensionSettings),
+                ProtectedSettings = new BinaryData(protectedExtensionSettings),
+                EnableAutomaticUpgrade = false
+            };
+        } else if (vmOs == Os.Linux) {
+            return new VMExtensionWrapper {
+                Location = region,
+                Name = "OmsAgentForLinux",
+                TypePropertiesType = "OmsAgentForLinux",
+                Publisher = "Microsoft.EnterpriseCloud.Monitoring",
+                TypeHandlerVersion = "1.0",
+                AutoUpgradeMinorVersion = true,
+                Settings = new BinaryData(extensionSettings),
+                ProtectedSettings = new BinaryData(protectedExtensionSettings),
+                EnableAutomaticUpgrade = false
+            };
+        } else {
+            throw new NotSupportedException($"unsupported os: {vmOs}");
+        }
     }
 
 

src/ApiService/ApiService/onefuzzlib/Extension.cs

@@ -19,7 +19,6 @@ public interface IOnefuzzContext {
     IExtensions Extensions { get; }
     IIpOperations IpOperations { get; }
     IJobOperations JobOperations { get; }
-    IJobResultOperations JobResultOperations { get; }
     ILogAnalytics LogAnalytics { get; }
     INodeMessageOperations NodeMessageOperations { get; }
     INodeOperations NodeOperations { get; }
@@ -84,7 +83,6 @@ public OnefuzzContext(IServiceProvider serviceProvider) {
     public IVmOperations VmOperations => _serviceProvider.GetRequiredService<IVmOperations>();
     public ISecretsOperations SecretsOperations => _serviceProvider.GetRequiredService<ISecretsOperations>();
     public IJobOperations JobOperations => _serviceProvider.GetRequiredService<IJobOperations>();
-    public IJobResultOperations JobResultOperations => _serviceProvider.GetRequiredService<IJobResultOperations>();
     public IScheduler Scheduler => _serviceProvider.GetRequiredService<IScheduler>();
     public IConfig Config => _serviceProvider.GetRequiredService<IConfig>();
     public ILogAnalytics LogAnalytics => _serviceProvider.GetRequiredService<ILogAnalytics>();