Remove references to shazam S3 bucket for logs, allow users to specify their own bucket

Author: Andrew Eacott

src/main/scala/datapipeline/dsl/Json.scala

@@ -217,7 +217,7 @@ object ResourceJsonRenderer {
           ("coreInstanceBidPrice" -> coreInstanceBidPrice.map(_.toString)) ~
           ("useOnDemandOnLastAttempt" -> useOnDemandOnLastAttempt.map(_.toString)) ~
           ("terminateAfter" -> terminateAfter.map(_.toString)) ~
-          ("emrLogUri" -> s"s3://szm-den-aws-data-pipeline/temp/$${environment}/$pipelineName/logs/emr") ~
+          ("emrLogUri" -> emrLogUri) ~
           ("keyPair" -> keyPair) ~
           ("region" -> region) ~
           ("applications" -> applications) ~

src/main/scala/datapipeline/dsl/Resource.scala

@@ -29,6 +29,7 @@ case class EmrCluster(name: String,
                       coreInstanceBidPrice: Option[BigDecimal] = None,
                       useOnDemandOnLastAttempt: Option[Boolean] = None,
                       terminateAfter: Option[FiniteDuration] = None,
+                      emrLogUri: Option[String] = None,
                       keyPair: Option[String] = None,
                       region: Option[String] = None,
                       applications: Seq[String] = Nil,