Set ACL as public-read for uploads to S3

Inline the tiny part of the s3 plugin that we use,
since it doesn't provide this extension point.
(And our usage of S3 is pretty trivial otherwise.)

Author: adriaanm

build.sbt

@@ -1,5 +1,5 @@
 import com.typesafe.sbt.SbtGit._
-import S3._
+import ScalaDist.upload
 
 // so we don't require a native git install
 useJGit
@@ -16,9 +16,26 @@ Versioning.settings
 // are known/understood, at scala/scala-dist#171
 scalaVersion := version.value
 
-s3Settings
+mappings in upload := Seq()
 
-host in upload := "downloads.typesafe.com.s3.amazonaws.com"
+upload := {
+  import com.amazonaws.{ClientConfiguration, Protocol}
+  import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
+  import com.amazonaws.services.s3.AmazonS3ClientBuilder
+  import com.amazonaws.services.s3.model.{CannedAccessControlList, PutObjectRequest}
+
+  // the publishing job runs on an EC2 instance that has access to the S3 bucket via its IAM instance profile
+  val client = AmazonS3ClientBuilder.defaultClient
+
+  val log = streams.value.log
+
+  (mappings in upload).value map { case (file, key) =>
+    log.debug("Uploading "+ file.getAbsolutePath() +" as "+ key)
+
+    // since the s3 bucket is in a separate account from where the EC2 CI instances are, must explicitly set acl as public-read
+    client.putObject(new PutObjectRequest("downloads.typesafe.com", key, file).withCannedAcl(CannedAccessControlList.PublicRead))
+  }
+}
 
 ScalaDist.settings
 

project/ScalaDist.scala

@@ -6,10 +6,12 @@ import com.typesafe.sbt.packager.MappingsHelper._
 import com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.useNativeZip
 import com.typesafe.sbt.packager.Keys._
 
-import com.typesafe.sbt.S3Plugin.S3.upload
+import com.amazonaws.services.s3.model.PutObjectResult
 
 // can't call it Universal -- that's taken by the packager
 object ScalaDist {
+  val upload=TaskKey[Seq[PutObjectResult]]("s3-upload","Uploads files to an S3 bucket.")
+
   def createMappingsWith(deps: Seq[(String, ModuleID, Artifact, File)],
                          distMappingGen: (ModuleID, Artifact, File) => Seq[(File, String)]): Seq[(File, String)] =
     deps flatMap {
@@ -88,13 +90,13 @@ object ScalaDist {
 
       // create mappings from the unzip scala-dist zip
       contentOf(tmpdir) filter {
-	case (file, dest) => !(dest.endsWith("MANIFEST.MF") || dest.endsWith("META-INF"))
+        case (file, dest) => !(dest.endsWith("MANIFEST.MF") || dest.endsWith("META-INF"))
       } map {
         // make unix scripts executable (heuristically...)
-	case (file, dest) if (dest startsWith "bin/") && !(dest endsWith ".bat") =>
+        case (file, dest) if (dest startsWith "bin/") && !(dest endsWith ".bat") =>
           file.setExecutable(true, true)
-	  file -> dest
-	case mapping => mapping
+          file -> dest
+        case mapping => mapping
       }
 
     // core jars: use simple name for backwards compat

project/plugins.sbt

@@ -2,9 +2,10 @@ scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.9")
+libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.11.277"
 
 // git plugin
 resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.4")
+