2.0.0 support canned acls

Author: jumblerg

README.md

@@ -4,7 +4,7 @@ a boot task for spewing files into an S3 bucket.
 
 [](dependency)
 ```clojure
-[tailrecursion/boot-bucket "1.1.0"] ;; latest release
+[tailrecursion/boot-bucket "2.0.0"] ;; latest release
 ```
 [](/dependency)
 
@@ -21,16 +21,16 @@ file basis to configure HTTP headers in S3 and cloundfront.
 
 in a departure from previous releases, as of `2.0.0`, boot-bucket defaults to
 the `:private` canned ACL, which should be changed to `:public-read` when
-serving files from an S3 bucket.  alternately, any of the following canned ACL
-keywords may be specified to the `access-control` parameter:
+serving files from an S3 bucket.  alternatively, any of the following canned ACL
+keywords may be specified to the `canned-acl` parameter:
 
 ```
 :private (default)
-:log-delivery-write        
-:bucket-owner-read         
-:bucket-owner-full-control 
-:authenticated-read        
-:public-read         
+:log-delivery-write
+:bucket-owner-read
+:bucket-owner-full-control
+:authenticated-read
+:public-read
 :public-read-write
 ```
 
@@ -92,9 +92,9 @@ with [boot-front][1] for deployments:
 (task-options!
   serve {:port 3001}
   sift  {:include #{#"index.html.out/" #"<app-ns>/"} :invert true}
-  spew  {:access-control :public-read
-	       :access-key     (System/getenv "<AWS_ACCESS_KEY_ENV_VAR>")
-         :secret-key     (System/getenv "<AWS_SECRET_KEY_ENV_VAR>")}
+  spew  {:canned-acl :public-read
+         :access-key (System/getenv "<AWS_ACCESS_KEY_ENV_VAR>")
+         :secret-key (System/getenv "<AWS_SECRET_KEY_ENV_VAR>")}
   burst {:access-key (System/getenv "<AWS_ACCESS_KEY_ENV_VAR>")
          :secret-key (System/getenv "<AWS_SECRET_KEY_ENV_VAR>")})
 ```
@@ -107,10 +107,10 @@ an `index.html.js` artifact that was compressed upstream by another task like
 
 ```clojure
 (spew
- :access-key     "<aws-access-key>"
- :secret-key     "<aws-secret-key>"
- :access-control :public-read
- :metadata       {"index.html.js" {:content-encoding "gzip"}})
+ :canned-acl :public-read
+ :access-key "<aws-access-key>"
+ :secret-key "<aws-secret-key>"
+ :metadata   {"index.html.js" {:content-encoding "gzip"}})
 ```
 
 note that it's often important to zip CLJS output as core/goog can weigh in at

build.boot

@@ -6,7 +6,7 @@
 (require
   '[adzerk.bootlaces :refer :all])
 
-(def +version+ "1.1.0")
+(def +version+ "2.0.0")
 
 (bootlaces! +version+)
 

src/tailrecursion/boot_bucket.clj

@@ -23,10 +23,11 @@
         (update :dependencies into deps))))
 
 (boot/deftask spew
-  [b bucket     NAME       str  "AWS Bucket Identifier"
-   a access-key ACCESS_KEY str  "AWS Access Key"
-   s secret-key SECRET_KEY str  "AWS Secret Key"
-   m metadata   META       edn  "Map of the form {\"index.html\" {:content-encoding \"gzip\"}}"]
+  [b bucket NAME           str "AWS Bucket Identifier"
+   a access-key ACCESS_KEY str "AWS Access Key"
+   s secret-key SECRET_KEY str "AWS Secret Key"
+   c canned-acl ACL        kw  "A keyword indicating which predefined ACL should be used."
+   m metadata META         edn "Map of the form {\"index.html\" {:content-encoding \"gzip\"}}"]
  (let [pod (pod/make-pod (pod-env deps))
        out (boot/tmp-dir!)]
   (boot/with-pre-wrap fileset

src/tailrecursion/boot_bucket/client.clj

@@ -11,6 +11,15 @@
     [com.amazonaws.services.s3.model CannedAccessControlList]
     [com.amazonaws.services.s3.model ObjectMetadata]))
 
+(def canned-acls
+  {:private                   CannedAccessControlList/Private
+   :log-delivery-write        CannedAccessControlList/LogDeliveryWrite
+   :bucket-owner-read         CannedAccessControlList/BucketOwnerRead
+   :bucket-owner-full-control CannedAccessControlList/BucketOwnerFullControl
+   :authenticated-read        CannedAccessControlList/AuthenticatedRead
+   :public-read               CannedAccessControlList/PublicRead
+   :public-read-write         CannedAccessControlList/PublicReadWrite})
+
 (defn client [acc-key sec-key]
   (-> (BasicAWSCredentials. acc-key sec-key)
       (AmazonS3Client.)
@@ -33,13 +42,13 @@
     "content-type"        (.setContentType        o v)
                           (.addUserMetadata       o k v)) o)
 
-(defn request [bucket base-dir path metadata]
+(defn request [bucket base-dir path acl metadata]
   (doto (PutObjectRequest. bucket path (io/file base-dir path))
-        (.withCannedAcl CannedAccessControlList/PublicRead)
+        (.withCannedAcl (canned-acls acl CannedAccessControlList/Private))
         (.withMetadata (reduce-kv meta-set! (ObjectMetadata.) (get metadata path)))))
 
-(defn put-file! [{:keys [access-key secret-key bucket metadata]} base-dir path]
+(defn put-file! [{:keys [access-key secret-key bucket canned-acl metadata]} base-dir path]
   (let [client @(client access-key secret-key)
-        req    (request bucket base-dir path metadata)]
+        req    (request bucket base-dir path canned-acl metadata)]
     (.putObject client req)
     path))