[AC-225] - Sends Ods DB connection string to Admin Api on Instance completed (#40)

* Sends Ods DB connection string to Admin Api on Instance completed

* Some fixes

Author: DavidJGapCR

src/EdFi.AdminConsole.InstanceManagementWorker/Application.cs

@@ -73,7 +73,7 @@ public async Task CreateInstances()
 
                             await _instanceProvisioner.AddDbInstanceAsync(instanceName, DbInstanceType.Minimal);
 
-                            if (!await _adminApiCaller.CompleteInstanceAsync(instance.Id, instance.TenantName))
+                            if (!await _adminApiCaller.CompleteInstanceAsync(instance.Id, instance.TenantName, new CompleteInstanceRequest() { ConnectionString = _instanceProvisioner.GetOdsConnectionString(instanceName) }))
                                 _logger.LogError("Not able to complete instance.");
 
                             _logger.LogInformation("Completed processing instance with name: {InstanceName}", instanceName);

src/EdFi.AdminConsole.InstanceMgrWorker.Core/Features/AdminApi/AdminApiCaller.cs

@@ -17,7 +17,7 @@ public interface IAdminApiCaller
 
     Task<IEnumerable<AdminConsoleInstance>> GetInstancesAsync(string? tenant, string status = nameof(InstanceStatus.Pending));
 
-    Task<bool> CompleteInstanceAsync(int instanceId, string? tenant);
+    Task<bool> CompleteInstanceAsync(int instanceId, string? tenant, CompleteInstanceRequest request);
 
     Task<bool> DeletedInstanceAsync(int instanceId, string? tenant);
 
@@ -68,7 +68,7 @@ public async Task<IEnumerable<AdminConsoleTenant>> GetTenantsAsync()
         else
         {
             _logger.LogError("AdminApi Settings has not been set properly.");
-            return new List<AdminConsoleTenant>();
+            return [];
         }
     }
 
@@ -110,15 +110,15 @@ public async Task<IEnumerable<AdminConsoleInstance>> GetInstancesAsync(string? t
         else
         {
             _logger.LogError("AdminApi Settings has not been set properly.");
-            return new List<AdminConsoleInstance>();
+            return [];
         }
     }
 
-    public async Task<bool> CompleteInstanceAsync(int instanceId, string? tenant)
+    public async Task<bool> CompleteInstanceAsync(int instanceId, string? tenant, CompleteInstanceRequest request)
     {
         if (AdminApiConnectionDataValidator.IsValid(_logger, _adminApiOptions))
         {
-            var response = await _adminApiClient.AdminApiPost(string.Format(_adminApiOptions.AdminConsoleCompleteInstancesURL, instanceId), tenant);
+            var response = await _adminApiClient.AdminApiPost(string.Format(_adminApiOptions.AdminConsoleCompleteInstancesURL, instanceId), tenant, request);
 
             return (response.StatusCode is System.Net.HttpStatusCode.NoContent or System.Net.HttpStatusCode.OK);
         }

src/EdFi.AdminConsole.InstanceMgrWorker.Core/Features/AdminApi/AdminApiClient.cs

@@ -9,6 +9,7 @@
 using EdFi.AdminConsole.InstanceMgrWorker.Core.Infrastructure;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace EdFi.AdminConsole.InstanceMgrWorker.Core.Features.AdminApi;
@@ -17,27 +18,19 @@ public interface IAdminApiClient
 {
     Task<ApiResponse> AdminApiGet(string url, string? tenant);
 
-    Task<ApiResponse> AdminApiPost(string url, string? tenant);
+    Task<ApiResponse> AdminApiPost(string url, string? tenant, object? body = null);
 }
 
-public class AdminApiClient : IAdminApiClient
+public class AdminApiClient(
+    IAppHttpClient appHttpClient,
+    ILogger logger,
+    IOptions<AdminApiSettings> adminApiOptions
+    ) : IAdminApiClient
 {
-    private readonly IAppHttpClient _appHttpClient;
-    protected readonly ILogger _logger;
-    private readonly IAdminApiSettings _adminApiOptions;
-    private string _accessToken;
-
-    public AdminApiClient(
-        IAppHttpClient appHttpClient,
-        ILogger logger,
-        IOptions<AdminApiSettings> adminApiOptions
-    )
-    {
-        _appHttpClient = appHttpClient;
-        _logger = logger;
-        _adminApiOptions = adminApiOptions.Value;
-        _accessToken = string.Empty;
-    }
+    private readonly IAppHttpClient _appHttpClient = appHttpClient;
+    protected readonly ILogger _logger = logger;
+    private readonly AdminApiSettings _adminApiOptions = adminApiOptions.Value;
+    private string _accessToken = string.Empty;
 
     public async Task<ApiResponse> AdminApiGet(string url, string? tenant)
     {
@@ -79,18 +72,18 @@ public async Task<ApiResponse> AdminApiGet(string url, string? tenant)
         return response;
     }
 
-    public async Task<ApiResponse> AdminApiPost(string url, string? tenant)
+    public async Task<ApiResponse> AdminApiPost(string url, string? tenant, object? body = null)
     {
         ApiResponse response = new ApiResponse(HttpStatusCode.InternalServerError, "Unknown error.");
         await GetAccessToken();
 
         const int RetryAttempts = 3;
         var currentAttempt = 0;
 
-        StringContent? content = null;
+        StringContent? content = new StringContent(body != null ? JsonConvert.SerializeObject(body) : string.Empty, Encoding.UTF8, "application/json");
+
         if (!string.IsNullOrEmpty(tenant))
         {
-            content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
             content.Headers.Add("tenant", tenant);
         }
 

src/EdFi.AdminConsole.InstanceMgrWorker.Core/Features/AdminApi/CompleteInstanceRequest.cs

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+// Licensed to the Ed-Fi Alliance under one or more agreements.
+// The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+// See the LICENSE and NOTICES files in the project root for more information.
+
+namespace EdFi.AdminConsole.InstanceMgrWorker.Core.Features.AdminApi;
+public class CompleteInstanceRequest
+{
+    public string ConnectionString { get; set; } = string.Empty;
+}

src/EdFi.AdminConsole.InstanceMgrWorker.Provisioner/Provisioners/ConfigConnectionStringsProvider.cs

@@ -7,16 +7,10 @@
 
 namespace EdFi.AdminConsole.InstanceMgrWorker.Configuration.Provisioners
 {
-    public class ConfigConnectionStringsProvider : IMgrWorkerConfigConnectionStringsProvider
+    public class ConfigConnectionStringsProvider(IConfiguration config) : IMgrWorkerConfigConnectionStringsProvider
     {
-        private string _tenant;
-        private readonly IConfiguration _config;
-
-        public ConfigConnectionStringsProvider(IConfiguration config)
-        {
-            _tenant = string.Empty;
-            _config = config;
-        }
+        private string _tenant = string.Empty;
+        private readonly IConfiguration _config = config;
 
         public int Count => ConnectionStringProviderByName.Keys.Count;
 

src/EdFi.AdminConsole.InstanceMgrWorker.Provisioner/Provisioners/IInstanceProvisioner.cs

@@ -21,6 +21,8 @@ public interface IInstanceProvisioner
 
         string[] GetInstancesDatabases();
 
+        string GetOdsConnectionString(string instanceName);
+
         string Tenant { get; set; }
 
         Task AddDbInstanceAsync(string instanceName, DbInstanceType instanceType);

src/EdFi.AdminConsole.InstanceMgrWorker.Provisioner/Provisioners/InstanceDatabaseNameBuilder.cs

@@ -5,7 +5,6 @@
 
 using EdFi.Ods.Common.Database;
 using EdFi.Ods.Common.Extensions;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace EdFi.AdminConsole.InstanceMgrWorker.Configuration.Provisioners
 {

src/EdFi.AdminConsole.InstanceMgrWorker.Provisioner/Provisioners/InstanceProvisionerBase.cs

@@ -4,7 +4,6 @@
 // See the LICENSE and NOTICES files in the project root for more information.
 
 using System.Data.Common;
-using EdFi.Admin.DataAccess.Utils;
 using EdFi.Ods.Common.Extensions;
 using Microsoft.Extensions.Configuration;
 
@@ -45,6 +44,14 @@ public string Tenant
             }
         }
 
+        public string GetOdsConnectionString(string instanceName)
+        {
+            if (string.IsNullOrEmpty(instanceName))
+                throw new ArgumentNullException(nameof(instanceName));
+
+            return string.Format(_connectionStringsProvider.GetConnectionString("EdFi_Ods"), _databaseNameBuilder.OdsDatabaseName(null, instanceName));
+        }
+
         public string[] GetInstancesDatabases() => GetInstancesDatabasesAsync().GetResultSafely();
 
         public void AddDbInstance(string instanceName, DbInstanceType instanceType)

src/EdFi.AdminConsole.InstanceMgrWorker.Provisioner/Provisioners/PostgresInstanceProvisioner.cs

@@ -5,18 +5,14 @@
 
 using System.Data.Common;
 using Dapper;
-using EdFi.Admin.DataAccess.Utils;
 using Microsoft.Extensions.Configuration;
 using Npgsql;
 
 namespace EdFi.AdminConsole.InstanceMgrWorker.Configuration.Provisioners
 {
-    public class PostgresInstanceProvisioner : InstanceProvisionerBase
+    public class PostgresInstanceProvisioner(IConfiguration configuration,
+        IMgrWorkerConfigConnectionStringsProvider connectionStringsProvider, IMgrWorkerIDatabaseNameBuilder databaseNameBuilder) : InstanceProvisionerBase(configuration, connectionStringsProvider, databaseNameBuilder)
     {
-        public PostgresInstanceProvisioner(IConfiguration configuration,
-            IMgrWorkerConfigConnectionStringsProvider connectionStringsProvider, IMgrWorkerIDatabaseNameBuilder databaseNameBuilder)
-            : base(configuration, connectionStringsProvider, databaseNameBuilder) { }
-
         public override async Task RenameDbInstancesAsync(string oldName, string newName)
         {
             using (var conn = CreateConnection())

src/InstanceMgrWorker.Core.UnitTests/Features/AdminApi/AdminApiCallerTests.cs

@@ -109,7 +109,11 @@ public class When_instances_are_completed : Given_an_admin_api
         private ILogger<When_instances_are_returned_from_api> _logger;
         private IAdminApiCaller _adminApiCaller;
         private IAdminApiClient _adminApiClient;
-        private int instanceId = 1;
+        private readonly int instanceId = 1;
+        private readonly CompleteInstanceRequest completeInstanceRequest = new CompleteInstanceRequest()
+        {
+            ConnectionString = ""
+        };
 
         [SetUp]
         public void SetUp()
@@ -118,7 +122,7 @@ public void SetUp()
 
             _adminApiClient = A.Fake<IAdminApiClient>();
 
-            A.CallTo(() => _adminApiClient.AdminApiPost(string.Format(Testing.GetAdminApiSettings().Value.AdminConsoleCompleteInstancesURL, instanceId), null))
+            A.CallTo(() => _adminApiClient.AdminApiPost(string.Format(Testing.GetAdminApiSettings().Value.AdminConsoleCompleteInstancesURL, instanceId), null, completeInstanceRequest))
                 .Returns(new ApiResponse(HttpStatusCode.OK, string.Empty));
 
             _adminApiCaller = new AdminApiCaller(_logger, _adminApiClient, Testing.GetAdminApiSettings());
@@ -127,7 +131,7 @@ public void SetUp()
         [Test]
         public async Task should_return_successfully()
         {
-            var result = await _adminApiCaller.CompleteInstanceAsync(1, null);
+            var result = await _adminApiCaller.CompleteInstanceAsync(1, null, completeInstanceRequest);
 
             result.ShouldBe(true);
         }