Skip to content

Replace Old with Legacy for ASB #1545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielmarbach merged 3 commits into from
Dec 20, 2018
Merged

Replace Old with Legacy for ASB #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f61563
Replace Old with Legacy for ASB
danielmarbach Dec 19, 2018
92a7288
Approve transport name change
SeanFeldman Dec 19, 2018
db65450
Backward compatible transport names
danielmarbach Dec 20, 2018
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
8 changes: 5 additions & 3 deletions src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.TransportNames.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (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 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";
Expand Down
2 changes: 2 additions & 0 deletions src/ServiceControlInstaller.Engine/Instances/MonitoringTransports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class MonitoringTransports
TypeName = "ServiceControl.Transports.LegacyAzureServiceBus.EndpointOrientedTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus",
SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>",
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
Expand All @@ -40,6 +41,7 @@ public class MonitoringTransports
TypeName = "ServiceControl.Transports.LegacyAzureServiceBus.ForwardingTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus",
SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>",
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)
Expand Down
2 changes: 2 additions & 0 deletions src/ServiceControlInstaller.Engine/Instances/ServiceControlCoreTransports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class ServiceControlCoreTransports
ZipName = "AzureServiceBus",
SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>",
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)
Expand All @@ -36,6 +37,7 @@ public class ServiceControlCoreTransports
ZipName = "AzureServiceBus",
SampleConnectionString = "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>",
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
Expand Down
16 changes: 9 additions & 7 deletions src/ServiceControlInstaller.Engine/Instances/TransportNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (Old)";

public const string AzureServiceBusForwardingTopology = "Azure Service Bus - Forwarding topology (Old)";
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";

Expand All @@ -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() { }
}
}
2 changes: 1 addition & 1 deletion src/ServiceControlInstaller.PowerShell/Cmdlets/MonitoringInstances/NewMonitoringInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion ...eControlInstaller.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down