bump deps

Author: jumblerg

README.md

@@ -4,7 +4,7 @@ a boot task for spewing files into an S3 bucket.
 
 [](dependency)
 ```clojure
-[tailrecursion/boot-bucket "2.0.0"] ;; latest release
+[tailrecursion/boot-bucket "2.1.0"] ;; latest release
 ```
 [](/dependency)
 

build.boot

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

src/tailrecursion/boot_bucket.clj

@@ -6,7 +6,7 @@
     [boot.util :as util]))
 
 (def ^:private deps
-  '[[com.amazonaws/aws-java-sdk-s3 "1.11.399"]])
+  '[[com.amazonaws/aws-java-sdk-s3 "1.11.419"]])
 
 (defn- warn-deps [deps]
   (let [conflict (delay (util/warn "Overriding project dependencies, using:\n"))]
@@ -24,22 +24,24 @@
 
 (boot/deftask spew
   [b bucket NAME           str "AWS Bucket Identifier"
+   r region REGION         str "AWS Region to connect through (the bucket is global)"
    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."
+   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!)]
+ (let [pod  (pod/make-pod (pod-env deps))
+       out  (boot/tmp-dir!)
+       opts (assoc *opts* :region (or region "us-east-1"))]
   (boot/with-pre-wrap fileset
-    (util/info "Spewing files into the %s bucket...\n" bucket)
+    (util/info "Spewing files into the %s bucket through region %s...\n" bucket (opts :region))
     (let [src-files*  (boot/output-files fileset)
           tgt-digests (pod/with-call-in pod
-                        (tailrecursion.boot-bucket.client/list-digests ~*opts*))
+                        (tailrecursion.boot-bucket.client/list-digests ~opts))
           src-files   (remove #(some (fn [[p h]] (and (= (:path %) p) (= (:hash %) h))) tgt-digests) src-files*)
           fut-paths   (atom [])]
       (when (empty? src-files) (util/info "■ no changed files to upload\n"))
       (doseq [{:keys [dir path]} src-files]
-        (->> (tailrecursion.boot-bucket.client/put-file! ~*opts* ~(.getPath dir) ~path)
+        (->> (tailrecursion.boot-bucket.client/put-file! ~opts ~(.getPath dir) ~path)
                (pod/with-call-in pod)
                (future)
                (swap! fut-paths conj)))

src/tailrecursion/boot_bucket/client.clj

@@ -3,9 +3,8 @@
     [clojure.java.io :as io]
     [clojure.string :refer [lower-case]])
   (:import
-    [com.amazonaws.auth              BasicAWSCredentials]
-    [com.amazonaws.services.s3       AmazonS3]
-    [com.amazonaws.services.s3       AmazonS3Client]
+    [com.amazonaws.auth              AWSStaticCredentialsProvider BasicAWSCredentials]
+    [com.amazonaws.services.s3       AmazonS3ClientBuilder]
     [com.amazonaws.services.s3.model ListObjectsV2Request]
     [com.amazonaws.services.s3.model PutObjectRequest]
     [com.amazonaws.services.s3.model CannedAccessControlList]
@@ -20,13 +19,16 @@
    :public-read               CannedAccessControlList/PublicRead
    :public-read-write         CannedAccessControlList/PublicReadWrite})
 
-(defn client [acc-key sec-key]
-  (-> (BasicAWSCredentials. acc-key sec-key)
-      (AmazonS3Client.)
-      (delay)))
+(defn client [acc-key sec-key region]
+  (let [creds (AWSStaticCredentialsProvider. (BasicAWSCredentials. acc-key sec-key))]
+    (-> (AmazonS3ClientBuilder/standard)
+        (.withCredentials creds)
+        (.withRegion region)
+        (.build)
+        (delay))))
 
-(defn list-digests [{:keys [access-key secret-key bucket]}]
-  (let [client @(client access-key secret-key)]
+(defn list-digests [{:keys [access-key secret-key region bucket]}]
+  (let [client @(client access-key secret-key region)]
     (->> (.withBucketName (ListObjectsV2Request.) bucket)
          (.listObjectsV2 client)
          (.getObjectSummaries)
@@ -47,8 +49,8 @@
         (.withCannedAcl (canned-acls acl CannedAccessControlList/Private))
         (.withMetadata (reduce-kv meta-set! (ObjectMetadata.) (get metadata path)))))
 
-(defn put-file! [{:keys [access-key secret-key bucket canned-acl metadata]} base-dir path]
-  (let [client @(client access-key secret-key)
+(defn put-file! [{:keys [access-key secret-key region bucket canned-acl metadata]} base-dir path]
+  (let [client @(client access-key secret-key region)
         req    (request bucket base-dir path canned-acl metadata)]
     (.putObject client req)
     path))