solving merge conflicts

Author: stas

src/ApiService/ApiService/Auth/AuthenticationMiddleware.cs

@@ -4,14 +4,15 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Azure.Functions.Worker.Middleware;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.OneFuzz.Service.Auth;
 
 public sealed class AuthenticationMiddleware : IFunctionsWorkerMiddleware {
     private readonly IConfigOperations _config;
-    private readonly ILogTracer _log;
+    private readonly ILogger _log;
 
-    public AuthenticationMiddleware(IConfigOperations config, ILogTracer log) {
+    public AuthenticationMiddleware(IConfigOperations config, ILogger<AuthenticationMiddleware> log) {
         _config = config;
         _log = log;
     }
@@ -64,7 +65,7 @@ private async Async.ValueTask BadIssuer(
         IEnumerable<string> allowedTenants) {
 
         var tenantsStr = string.Join("; ", allowedTenants);
-        _log.Error($"issuer not from allowed tenant. issuer: {token.Issuer:Tag:Issuer} - tenants: {tenantsStr:Tag:Tenants}");
+        _log.LogError($"issuer not from allowed tenant. issuer: {token.Issuer:Tag:Issuer} - tenants: {tenantsStr:Tag:Tenants}");
 
         var response = HttpResponseData.CreateResponse(request);
         var status = HttpStatusCode.BadRequest;

src/ApiService/ApiService/Auth/AuthorizationMiddleware.cs

@@ -5,14 +5,14 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Azure.Functions.Worker.Middleware;
-
+using Microsoft.Extensions.Logging;
 namespace Microsoft.OneFuzz.Service.Auth;
 
 public sealed class AuthorizationMiddleware : IFunctionsWorkerMiddleware {
     private readonly IEndpointAuthorization _auth;
-    private readonly ILogTracer _log;
+    private readonly ILogger _log;
 
-    public AuthorizationMiddleware(IEndpointAuthorization auth, ILogTracer log) {
+    public AuthorizationMiddleware(IEndpointAuthorization auth, ILogger<AuthorizationMiddleware> log) {
         _auth = auth;
         _log = log;
     }

src/ApiService/ApiService/Functions/AgentCommands.cs

@@ -1,14 +1,14 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class AgentCommands {
     private readonly ILogger _log;
     private readonly IOnefuzzContext _context;
 
-    public AgentCommands(ILogger log, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public AgentCommands(ILogger log, IOnefuzzContext context) {
         _log = log;
         _context = context;
     }

src/ApiService/ApiService/Functions/AgentEvents.cs

@@ -2,15 +2,15 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
-
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class AgentEvents {
     private readonly ILogger _log;
     private readonly IOnefuzzContext _context;
 
-    public AgentEvents(ILogger log, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public AgentEvents(ILogger<AgentEvents> log, IOnefuzzContext context) {
         _log = log;
         _context = context;
     }

src/ApiService/ApiService/Functions/AgentRegistration.cs

@@ -1,15 +1,15 @@
 using Azure.Storage.Sas;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class AgentRegistration {
     private readonly ILogger _log;
     private readonly IOnefuzzContext _context;
 
-    public AgentRegistration(ILogger log, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public AgentRegistration(ILogger<AgentRegistration> log, IOnefuzzContext context) {
         _log = log;
         _context = context;
     }

src/ApiService/ApiService/Functions/Containers.cs

@@ -1,15 +1,15 @@
 using Azure.Storage.Sas;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class ContainersFunction {
     private readonly ILogger _logger;
     private readonly IOnefuzzContext _context;
 
-    public ContainersFunction(ILogger<ContainersFunction> logger, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public ContainersFunction(ILogger<ContainersFunction> logger, IOnefuzzContext context) {
         _logger = logger;
         _context = context;
     }

src/ApiService/ApiService/Functions/Events.cs

@@ -1,14 +1,14 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class EventsFunction {
     private readonly ILogger _log;
     private readonly IOnefuzzContext _context;
 
-    public EventsFunction(ILogger<EventsFunction> log, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public EventsFunction(ILogger<EventsFunction> log, IOnefuzzContext context) {
         _context = context;
         _log = log;
     }

src/ApiService/ApiService/Functions/Jobs.cs

@@ -1,15 +1,15 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class Jobs {
     private readonly IOnefuzzContext _context;
     private readonly ILogger _logTracer;
 
-    public Jobs(IEndpointAuthorization auth, IOnefuzzContext context, ILogger<Jobs> logTracer) {
+    public Jobs(IOnefuzzContext context, ILogger<Jobs> logTracer) {
         _context = context;
         _logTracer = logTracer;
     }

src/ApiService/ApiService/Functions/Migrations/JinjaToScriban.cs

@@ -1,7 +1,7 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class JinjaToScriban {
@@ -10,7 +10,7 @@ public class JinjaToScriban {
     private readonly IOnefuzzContext _context;
 
 
-    public JinjaToScriban(ILogger<JinjaToScriban> log, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public JinjaToScriban(ILogger<JinjaToScriban> log, IOnefuzzContext context) {
         _log = log;
         _context = context;
     }

src/ApiService/ApiService/Functions/Node.cs

@@ -1,15 +1,15 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.OneFuzz.Service.Auth;
 using Microsoft.Extensions.Logging;
+using Microsoft.OneFuzz.Service.Auth;
 namespace Microsoft.OneFuzz.Service.Functions;
 
 public class Node {
     private readonly ILogger _log;
     private readonly IOnefuzzContext _context;
 
-    public Node(ILogger<Node> log, IEndpointAuthorization auth, IOnefuzzContext context) {
+    public Node(ILogger<Node> log, IOnefuzzContext context) {
         _log = log;
         _context = context;
     }