From 0f615635b6868f24c7c4d8127ae8a4fc3802377a Mon Sep 17 00:00:00 2001 From: danielmarbach Date: Wed, 19 Dec 2018 16:52:30 +0100 Subject: [PATCH 1/3] Replace Old with Legacy for ASB --- .../Instances/TransportNames.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs b/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs index 499d8110bb..e5cc6d1a9a 100644 --- a/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs +++ b/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs @@ -4,9 +4,9 @@ public class TransportNames { public const string AzureServiceBus = "Azure Service Bus"; - public const string AzureServiceBusEndpointOrientedTopology = "Azure Service Bus - Endpoint-oriented topology (Old)"; + public const string AzureServiceBusEndpointOrientedTopology = "Azure Service Bus - Endpoint-oriented topology (Legacy)"; - public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Old)"; + public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Legacy)"; public const string AmazonSQS = "AmazonSQS"; From 92a7288f21b31773c848548a54eaafc84d945a39 Mon Sep 17 00:00:00 2001 From: Sean Feldman Date: Wed, 19 Dec 2018 16:27:49 -0700 Subject: [PATCH 2/3] Approve transport name change --- .../ApprovalFiles/APIApprovals.TransportNames.approved.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt index aa3f747993..3ce22bfaa7 100644 --- a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt +++ b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt @@ -6,8 +6,8 @@ namespace ServiceControlInstaller.Engine.Instances { public const string AmazonSQS = "AmazonSQS"; public const string AzureServiceBus = "Azure Service Bus"; - public const string AzureServiceBusEndpointOrientedTopology = "Azure Service Bus - Endpoint-oriented topology (Old)"; - public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Old)"; + public const string AzureServiceBusEndpointOrientedTopology = "Azure Service Bus - Endpoint-oriented topology (Legacy)"; + public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Legacy)"; public const string AzureStorageQueue = "Azure Storage Queue"; public const string MSMQ = "MSMQ"; public const string RabbitMQConventionalRoutingTopology = "RabbitMQ - Conventional routing topology"; From db654504369c43c3d7693851773cefa4be98a0ec Mon Sep 17 00:00:00 2001 From: danielmarbach Date: Thu, 20 Dec 2018 09:31:02 +0100 Subject: [PATCH 3/3] Backward compatible transport names --- .../APIApprovals.TransportNames.approved.txt | 4 +++- .../Instances/MonitoringTransports.cs | 2 ++ .../Instances/ServiceControlCoreTransports.cs | 2 ++ .../Instances/TransportNames.cs | 12 +++++++----- .../MonitoringInstances/NewMonitoringInstance.cs | 2 +- .../NewServiceControlInstance.cs | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt index 3ce22bfaa7..9a7b007316 100644 --- a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt +++ b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt @@ -2,12 +2,14 @@ [assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName=".NET Framework 4")] namespace ServiceControlInstaller.Engine.Instances { - public class TransportNames + public class static TransportNames { public const string AmazonSQS = "AmazonSQS"; public const string AzureServiceBus = "Azure Service Bus"; public const string AzureServiceBusEndpointOrientedTopology = "Azure Service Bus - Endpoint-oriented topology (Legacy)"; + public const string AzureServiceBusEndpointOrientedTopologyOld = "Azure Service Bus - Endpoint-oriented topology (Old)"; public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Legacy)"; + public const string AzureServiceBusForwardingTopologyOld = "Azure Service Bus - Forwarding topology (Old)"; public const string AzureStorageQueue = "Azure Storage Queue"; public const string MSMQ = "MSMQ"; public const string RabbitMQConventionalRoutingTopology = "RabbitMQ - Conventional routing topology"; diff --git a/src/ServiceControlInstaller.Engine/Instances/MonitoringTransports.cs b/src/ServiceControlInstaller.Engine/Instances/MonitoringTransports.cs index 9ffa227327..7338baad74 100644 --- a/src/ServiceControlInstaller.Engine/Instances/MonitoringTransports.cs +++ b/src/ServiceControlInstaller.Engine/Instances/MonitoringTransports.cs @@ -31,6 +31,7 @@ public class MonitoringTransports TypeName = "ServiceControl.Transports.LegacyAzureServiceBus.EndpointOrientedTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus", SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=;SharedSecretValue=", Matches = name => name.Equals(TransportNames.AzureServiceBusEndpointOrientedTopology, StringComparison.OrdinalIgnoreCase) + || name.Equals(TransportNames.AzureServiceBusEndpointOrientedTopologyOld, StringComparison.OrdinalIgnoreCase) || name.Equals("ServiceControl.Transports.LegacyAzureServiceBus.EndpointOrientedTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus", StringComparison.OrdinalIgnoreCase) }, new TransportInfo @@ -40,6 +41,7 @@ public class MonitoringTransports TypeName = "ServiceControl.Transports.LegacyAzureServiceBus.ForwardingTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus", SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=;SharedSecretValue=", Matches = name => name.Equals(TransportNames.AzureServiceBusForwardingTopology, StringComparison.OrdinalIgnoreCase) + || name.Equals(TransportNames.AzureServiceBusForwardingTopologyOld, StringComparison.OrdinalIgnoreCase) || name.Equals("AzureServiceBus", StringComparison.OrdinalIgnoreCase) || name.Equals("NServiceBus.AzureServiceBusTransport, NServiceBus.Azure.Transports.WindowsAzureServiceBus", StringComparison.OrdinalIgnoreCase) || name.Equals("ServiceControl.Transports.LegacyAzureServiceBus.ForwardingTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus", StringComparison.OrdinalIgnoreCase) diff --git a/src/ServiceControlInstaller.Engine/Instances/ServiceControlCoreTransports.cs b/src/ServiceControlInstaller.Engine/Instances/ServiceControlCoreTransports.cs index a29c423c58..69edf03bf8 100644 --- a/src/ServiceControlInstaller.Engine/Instances/ServiceControlCoreTransports.cs +++ b/src/ServiceControlInstaller.Engine/Instances/ServiceControlCoreTransports.cs @@ -25,6 +25,7 @@ public class ServiceControlCoreTransports ZipName = "AzureServiceBus", SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=;SharedSecretValue=", Matches = name => name.Equals(TransportNames.AzureServiceBusEndpointOrientedTopology, StringComparison.OrdinalIgnoreCase) + || name.Equals(TransportNames.AzureServiceBusEndpointOrientedTopologyOld, StringComparison.OrdinalIgnoreCase) || name.Equals("AzureServiceBus", StringComparison.OrdinalIgnoreCase) || name.Equals("ServiceControl.Transports.ASB.ASBEndpointTopologyTransportCustomization, ServiceControl.Transports.ASB", StringComparison.OrdinalIgnoreCase) || name.Equals("NServiceBus.AzureServiceBusTransport, NServiceBus.Azure.Transports.WindowsAzureServiceBus", StringComparison.OrdinalIgnoreCase) @@ -36,6 +37,7 @@ public class ServiceControlCoreTransports ZipName = "AzureServiceBus", SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=;SharedSecretValue=", Matches = name => name.Equals(TransportNames.AzureServiceBusForwardingTopology, StringComparison.OrdinalIgnoreCase) + || name.Equals(TransportNames.AzureServiceBusForwardingTopologyOld, StringComparison.OrdinalIgnoreCase) || name.Equals("ServiceControl.Transports.ASB.ASBForwardingTopologyTransportCustomization, ServiceControl.Transports.ASB", StringComparison.OrdinalIgnoreCase) }, new TransportInfo diff --git a/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs b/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs index e5cc6d1a9a..ffae570457 100644 --- a/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs +++ b/src/ServiceControlInstaller.Engine/Instances/TransportNames.cs @@ -1,12 +1,16 @@ -namespace ServiceControlInstaller.Engine.Instances +namespace ServiceControlInstaller.Engine.Instances { - public class TransportNames + public static class TransportNames { public const string AzureServiceBus = "Azure Service Bus"; public const string AzureServiceBusEndpointOrientedTopology = "Azure Service Bus - Endpoint-oriented topology (Legacy)"; - + // for backward compatibility + public const string AzureServiceBusEndpointOrientedTopologyOld = "Azure Service Bus - Endpoint-oriented topology (Old)"; + public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Legacy)"; + // for backward compatibility + public const string AzureServiceBusForwardingTopologyOld = "Azure Service Bus - Forwarding topology (Old)"; public const string AmazonSQS = "AmazonSQS"; @@ -19,7 +23,5 @@ public class TransportNames public const string RabbitMQConventionalRoutingTopology = "RabbitMQ - Conventional routing topology"; public const string RabbitMQDirectRoutingTopology = "RabbitMQ - Direct routing topology (Old)"; - - TransportNames() { } } } \ No newline at end of file diff --git a/src/ServiceControlInstaller.PowerShell/Cmdlets/MonitoringInstances/NewMonitoringInstance.cs b/src/ServiceControlInstaller.PowerShell/Cmdlets/MonitoringInstances/NewMonitoringInstance.cs index 5fd632931f..948b1f4eef 100644 --- a/src/ServiceControlInstaller.PowerShell/Cmdlets/MonitoringInstances/NewMonitoringInstance.cs +++ b/src/ServiceControlInstaller.PowerShell/Cmdlets/MonitoringInstances/NewMonitoringInstance.cs @@ -44,7 +44,7 @@ public class NewMonitoringInstance : PSCmdlet public string ErrorQueue { get; set; } [Parameter(Mandatory = true, HelpMessage = "Specify the NServiceBus Transport to use")] - [ValidateSet(TransportNames.AzureServiceBusForwardingTopology, TransportNames.AzureServiceBusEndpointOrientedTopology, TransportNames.AzureServiceBus, TransportNames.AzureStorageQueue, TransportNames.MSMQ, TransportNames.SQLServer, TransportNames.RabbitMQDirectRoutingTopology, TransportNames.RabbitMQConventionalRoutingTopology, TransportNames.AmazonSQS)] + [ValidateSet(TransportNames.AzureServiceBusForwardingTopology, TransportNames.AzureServiceBusForwardingTopologyOld, TransportNames.AzureServiceBusEndpointOrientedTopology, TransportNames.AzureServiceBusEndpointOrientedTopologyOld, TransportNames.AzureServiceBus, TransportNames.AzureStorageQueue, TransportNames.MSMQ, TransportNames.SQLServer, TransportNames.RabbitMQDirectRoutingTopology, TransportNames.RabbitMQConventionalRoutingTopology, TransportNames.AmazonSQS)] public string Transport { get; set; } [Parameter(Mandatory = false, HelpMessage = "Specify the Windows Service Display name. If unspecified the instance name will be used")] diff --git a/src/ServiceControlInstaller.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs b/src/ServiceControlInstaller.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs index eb19ae53f3..d3ac883f52 100644 --- a/src/ServiceControlInstaller.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs +++ b/src/ServiceControlInstaller.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs @@ -64,7 +64,7 @@ public class NewServiceControlInstance : PSCmdlet public string AuditLogQueue { get; set; } [Parameter(Mandatory = true, HelpMessage = "Specify the NServiceBus Transport to use")] - [ValidateSet(TransportNames.AzureServiceBus, TransportNames.AzureServiceBusForwardingTopology, TransportNames.AzureServiceBusEndpointOrientedTopology, TransportNames.AzureStorageQueue, TransportNames.MSMQ, TransportNames.SQLServer, TransportNames.RabbitMQDirectRoutingTopology, TransportNames.RabbitMQConventionalRoutingTopology, TransportNames.AmazonSQS)] + [ValidateSet(TransportNames.AzureServiceBus, TransportNames.AzureServiceBusForwardingTopology, TransportNames.AzureServiceBusForwardingTopologyOld, TransportNames.AzureServiceBusEndpointOrientedTopology, TransportNames.AzureServiceBusEndpointOrientedTopologyOld, TransportNames.AzureStorageQueue, TransportNames.MSMQ, TransportNames.SQLServer, TransportNames.RabbitMQDirectRoutingTopology, TransportNames.RabbitMQConventionalRoutingTopology, TransportNames.AmazonSQS)] public string Transport { get; set; } [Parameter(Mandatory = false, HelpMessage = "Specify the Windows Service Display name. If unspecified the instance name will be used")]