Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
namespace ServiceControlInstaller.Engine.Configuration.ServiceControl
{
using System;
using System.Data.Common;
using System.IO;
using Instances;

Expand All @@ -12,7 +14,7 @@ public ServiceControlAppConfig(IServiceControlInstance instance) : base(Path.Com

protected override void UpdateSettings()
{
Config.ConnectionStrings.ConnectionStrings.Set("NServiceBus/Transport", details.ConnectionString);
Config.ConnectionStrings.ConnectionStrings.Set("NServiceBus/Transport", UpdateConnectionString());
var settings = Config.AppSettings.Settings;
var version = details.Version;
settings.Set(ServiceControlSettings.InstanceName, details.InstanceName, version);
Expand All @@ -37,6 +39,9 @@ protected override void UpdateSettings()
settings.RemoveIfRetired(ServiceControlSettings.AuditLogQueue, version);
settings.RemoveIfRetired(ServiceControlSettings.ForwardAuditMessages, version);
settings.RemoveIfRetired(ServiceControlSettings.InternalQueueName, version);
settings.RemoveIfRetired(ServiceControlSettings.LicensingComponentRabbitMqManagementApiUrl, version);
settings.RemoveIfRetired(ServiceControlSettings.LicensingComponentRabbitMqManagementApiUsername, version);
settings.RemoveIfRetired(ServiceControlSettings.LicensingComponentRabbitMqManagementApiPassword, version);

RemoveRavenDB35Settings(settings, version);
}
Expand All @@ -62,6 +67,43 @@ public override void SetTransportType(string transportTypeName)
settings.Set(ServiceControlSettings.TransportType, transportTypeName, version);
}

IServiceControlInstance details;
string UpdateConnectionString()
{
var connectionStringBuilder = new DbConnectionStringBuilder { ConnectionString = details.ConnectionString };

MigrateLicensingComponentRabbitMqManagementApiSettings(connectionStringBuilder);

return connectionStringBuilder.ConnectionString;
}

void MigrateLicensingComponentRabbitMqManagementApiSettings(DbConnectionStringBuilder connectionStringBuilder)
{
if (!details.TransportPackage.Name.Contains("rabbitmq", StringComparison.OrdinalIgnoreCase))
{
return;
}

var settings = Config.AppSettings.Settings;

var legacySetting = settings[ServiceControlSettings.LicensingComponentRabbitMqManagementApiUrl.Name];
if (legacySetting is not null && !connectionStringBuilder.ContainsKey("ManagementApiUrl"))
{
connectionStringBuilder.Add("ManagementApiUrl", legacySetting.Value);
}

legacySetting = settings[ServiceControlSettings.LicensingComponentRabbitMqManagementApiUsername.Name];
if (legacySetting is not null && !connectionStringBuilder.ContainsKey("ManagementApiUserName"))
{
connectionStringBuilder.Add("ManagementApiUserName", legacySetting.Value);
}

legacySetting = settings[ServiceControlSettings.LicensingComponentRabbitMqManagementApiPassword.Name];
if (legacySetting is not null && !connectionStringBuilder.ContainsKey("ManagementApiPassword"))
{
connectionStringBuilder.Add("ManagementApiPassword", legacySetting.Value);
}
}

readonly IServiceControlInstance details;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,23 @@ public static class ServiceControlSettings
Name = "ServiceControl/EnableFullTextSearchOnBodies",
SupportedFrom = new SemanticVersion(4, 17, 0)
};

public static readonly SettingInfo LicensingComponentRabbitMqManagementApiUrl = new()
{
Name = "LicensingComponent/RabbitMQ/ApiUrl",
RemovedFrom = new SemanticVersion(6, 5, 0)
};

public static readonly SettingInfo LicensingComponentRabbitMqManagementApiUsername = new()
{
Name = "LicensingComponent/RabbitMQ/UserName",
RemovedFrom = new SemanticVersion(6, 5, 0)
};

public static readonly SettingInfo LicensingComponentRabbitMqManagementApiPassword = new()
{
Name = "LicensingComponent/RabbitMQ/Password",
RemovedFrom = new SemanticVersion(6, 5, 0)
};
}
}