Skip to content

Make only region mandatory for SQS in ServiceControl.Monitoring installation #1544

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 1 commit into from
Dec 20, 2018
Merged

Make only region mandatory for SQS in ServiceControl.Monitoring installation #1544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/ServiceControlInstaller.Engine/Instances/MonitoringTransports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ public class MonitoringTransports
{
//INFO: Those types are used in the SCMU and in PS scripts. In both cases Match predicate is used to find a transport info.
// In the UI the matching is done based on the transport TypeName from app.config. In PS it's done based on human friendly names.
// As a result the Match predicate should evalute to true both for TypeName and human friendly name.
// As a result the Match predicate should evaluate to true both for TypeName and human friendly name.
// Matching separately on Name and TypeName would not be enough because we need to be backwards compatible.
// As a result Match is comparing to old/current names, old/current types.
new TransportInfo
{
Name = TransportNames.AmazonSQS,
ZipName = "AmazonSQS",
TypeName = "ServiceControl.Transports.AmazonSQS.ServiceControlSqsTransport, ServiceControl.Transports.AmazonSQS",
SampleConnectionString = "AccessKeyId=<ACCESSKEYID>;SecretAccessKey=<SECRETACCESSKEY>;Region=<REGION>;QueueNamePrefix=<prefix>",
Help = "'AccessKeyId', 'SecretAccessKey' and 'Region' are mandatory configurations.",
SampleConnectionString = "Region=<REGION>;QueueNamePrefix=<prefix>;AccessKeyId=<ACCESSKEYID>;SecretAccessKey=<SECRETACCESSKEY>",
Help = "'Region' is mandatory. Specify 'AccessKeyId' and 'SecretAccessKey' values to set the AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY environment variables if not using IAM roles or EC2 metadata.",
Matches = name => name.Equals(TransportNames.AmazonSQS, StringComparison.OrdinalIgnoreCase)
|| name.Equals("ServiceControl.Transports.AmazonSQS.ServiceControlSqsTransport, ServiceControl.Transports.AmazonSQS", StringComparison.OrdinalIgnoreCase)
|| name.Equals("NServiceBus.SqsTransport, NServiceBus.AmazonSQS", StringComparison.OrdinalIgnoreCase)
Expand Down