fix(s3): ensure sqs queue names are valid

Author: cfieber

front50-s3/src/main/java/com/netflix/spinnaker/front50/model/TemporarySQSQueue.java

@@ -59,8 +59,9 @@ public TemporarySQSQueue(AmazonSQS amazonSQS, AmazonSNS amazonSNS, String snsTop
     this.amazonSQS = amazonSQS;
     this.amazonSNS = amazonSNS;
 
+    String sanitizedInstanceId = getSanitizedInstanceId(instanceId);
     String snsTopicArn = getSnsTopicArn(amazonSNS, snsTopicName);
-    String sqsQueueName = snsTopicName + "__" + instanceId;
+    String sqsQueueName = snsTopicName + "__" + sanitizedInstanceId;
     String sqsQueueArn = snsTopicArn.substring(0, snsTopicArn.lastIndexOf(":") + 1).replace("sns", "sqs") + sqsQueueName;
 
     this.temporaryQueue = createQueue(snsTopicArn, sqsQueueArn, sqsQueueName);
@@ -151,6 +152,10 @@ private TemporaryQueue createQueue(String snsTopicArn, String sqsQueueArn, Strin
     return new TemporaryQueue(snsTopicArn, sqsQueueArn, sqsQueueUrl, snsTopicSubscriptionArn);
   }
 
+  static String getSanitizedInstanceId(String instanceId) {
+    return instanceId.replaceAll("[^\\w\\-]", "_");
+  }
+
   protected static class TemporaryQueue {
     final String snsTopicArn;
     final String sqsQueueArn;

front50-s3/src/test/groovy/com/netflix/spinnaker/front50/model/TemporarySQSQueueSpec.groovy

@@ -67,4 +67,16 @@ class TemporarySQSQueueSpec extends Specification {
     1 * amazonSNS.unsubscribe("arn:subscription")
     0 * _
   }
+
+  def "should convert instanceId into something SQS queue ARN friendly"() {
+    expect:
+    TemporarySQSQueue.getSanitizedInstanceId(source) == expected
+
+    where:
+    source                 | expected
+    '127.0.0.1'            | '127_0_0_1'
+    'my-host.local'        | 'my-host_local'
+    'localhoser'           | 'localhoser'
+    'something123-ABC.def' | 'something123-ABC_def'
+  }
 }