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, new CompleteInstanceRequest() { ConnectionString = _instanceProvisioner.GetConnectionString("EdFi_Ods") }))
+                            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

@@ -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,7 +110,7 @@ public async Task<IEnumerable<AdminConsoleInstance>> GetInstancesAsync(string? t
         else
         {
             _logger.LogError("AdminApi Settings has not been set properly.");
-            return new List<AdminConsoleInstance>();
+            return [];
         }
     }
 

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

@@ -21,7 +21,7 @@ public interface IInstanceProvisioner
 
         string[] GetInstancesDatabases();
 
-        string GetConnectionString(string name);
+        string GetOdsConnectionString(string instanceName);
 
         string Tenant { get; set; }
 

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

@@ -44,11 +44,12 @@ public string Tenant
             }
         }
 
-        public string GetConnectionString(string name)
+        public string GetOdsConnectionString(string instanceName)
         {
-            if (string.IsNullOrEmpty(name))
-                throw new ArgumentNullException(nameof(name));
-            return _connectionStringsProvider.GetConnectionString(name);
+            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();