Skip to content

Commit 05599fe

Browse files
tobiastobias
committed
Update to latest Cognitect aws-api
This newer version uses a java.net.http client instead of jetty-client, so we no longer need our client fork. Fixes #903.
1 parent 984a15b commit 05599fe

File tree

6 files changed

+51
-81
lines changed

6 files changed

+51
-81
lines changed

‎dependabot/deps-list.txt‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ com.beust/jcommander 1.48 (Apache-2.0)
2222
com.cemerick/friend 0.2.3 (EPL-1.0)
2323
com.cognitect/transit-clj 1.0.329 (Apache-2.0)
2424
com.cognitect/transit-java 1.0.362 (Apache-2.0)
25-
com.cognitect.aws/api 0.8.692 (Apache-2.0)
26-
com.cognitect.aws/endpoints 1.1.12.489 (Apache-2.0)
27-
com.cognitect.aws/s3 847.2.1398.0 (Apache-2.0)
28-
com.cognitect.aws/sqs 847.2.1398.0 (Apache-2.0)
29-
com.cognitect.aws/ssm 847.2.1365.0 (Apache-2.0)
25+
com.cognitect.aws/api 0.8.741 (Apache-2.0)
26+
com.cognitect.aws/endpoints 871.2.31.64 (Apache-2.0)
27+
com.cognitect.aws/s3 871.2.31.64 (Apache-2.0)
28+
com.cognitect.aws/sqs 871.2.29.52 (Apache-2.0)
29+
com.cognitect.aws/ssm 871.2.31.64 (Apache-2.0)
3030
com.fasterxml.jackson.core/jackson-annotations 2.15.2 (Apache-2.0)
3131
com.fasterxml.jackson.core/jackson-core 2.15.2 (Apache-2.0)
3232
com.fasterxml.jackson.core/jackson-databind 2.15.2 (Apache-2.0)
@@ -101,26 +101,24 @@ org.bouncycastle/bcutil-jdk18on 1.78 (Bouncy Castle Licence)
101101
org.checkerframework/checker-qual 3.42.0 (MIT)
102102
org.clj-commons/clj-http-lite 1.0.13 (MIT)
103103
org.clojure/clojure 1.12.1 (EPL-1.0)
104-
org.clojure/core.async 1.6.681 (EPL-1.0)
105-
org.clojure/core.cache 1.0.225 (EPL-1.0)
106-
org.clojure/core.memoize 1.0.257 (EPL-1.0)
104+
org.clojure/core.async 1.8.741 (EPL-1.0)
105+
org.clojure/core.cache 1.1.234 (EPL-1.0)
106+
org.clojure/core.memoize 1.1.266 (EPL-1.0)
107107
org.clojure/core.rrb-vector 0.1.2 (EPL-1.0)
108108
org.clojure/core.specs.alpha 0.4.74 (EPL-1.0)
109-
org.clojure/data.json 2.5.0 (EPL-1.0)
110-
org.clojure/data.priority-map 1.1.0 (EPL-1.0)
109+
org.clojure/data.json 2.5.1 (EPL-1.0)
110+
org.clojure/data.priority-map 1.2.0 (EPL-1.0)
111111
org.clojure/data.xml 0.2.0-alpha9 (EPL-1.0)
112112
org.clojure/java.data 1.2.107 (EPL-1.0)
113113
org.clojure/spec.alpha 0.5.238 (EPL-1.0)
114114
org.clojure/test.check 1.1.1 (EPL-1.0)
115-
org.clojure/tools.analyzer 1.1.1 (EPL-1.0)
116-
org.clojure/tools.analyzer.jvm 1.2.3 (EPL-1.0)
115+
org.clojure/tools.analyzer 1.2.0 (EPL-1.0)
116+
org.clojure/tools.analyzer.jvm 1.3.2 (EPL-1.0)
117117
org.clojure/tools.logging 1.2.4 (EPL-1.0)
118118
org.clojure/tools.macro 0.1.5 (EPL-1.0)
119119
org.clojure/tools.nrepl 0.2.11 (EPL-1.0)
120-
org.clojure/tools.reader 1.4.2 (EPL-1.0)
120+
org.clojure/tools.reader 1.5.0 (EPL-1.0)
121121
org.codehaus.plexus/plexus-utils 3.3.0 (Apache-2.0)
122-
org.eclipse.jetty/jetty-alpn-client 11.0.24 (Eclipse Public License - Version 2.0)
123-
org.eclipse.jetty/jetty-client 11.0.24 (Eclipse Public License - Version 2.0)
124122
org.eclipse.jetty/jetty-http 11.0.24 (Eclipse Public License - Version 2.0)
125123
org.eclipse.jetty/jetty-io 11.0.24 (Eclipse Public License - Version 2.0)
126124
org.eclipse.jetty/jetty-security 11.0.24 (Eclipse Public License - Version 2.0)
@@ -147,7 +145,6 @@ org.ring-clojure/ring-core-protocols 1.12.1 (MIT)
147145
org.ring-clojure/ring-jakarta-servlet 1.13.0 (MIT)
148146
org.ring-clojure/ring-websocket-protocols 1.12.1 (MIT)
149147
org.slf4j/slf4j-api 2.0.13 (MIT)
150-
org.tcrawley/cognitect-http-client 1.11.130 (Apache-2.0)
151148
org.tukaani/xz 1.9 (Public Domain)
152149
org.yaml/snakeyaml 1.33 (Apache-2.0)
153150
potemkin/potemkin 0.4.5 (MIT)

‎dependabot/deps-tree.txt‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
com.cognitect.aws/ssm 847.2.1365.0
1+
com.cognitect.aws/ssm 871.2.31.64
22
buddy/buddy-core 1.11.423
33
. commons-codec/commons-codec 1.16.0
44
X org.bouncycastle/bcpkix-jdk18on 1.75 :use-top
@@ -7,17 +7,19 @@ buddy/buddy-core 1.11.423
77
org.clojure/clojure 1.12.1
88
. org.clojure/spec.alpha 0.5.238
99
. org.clojure/core.specs.alpha 0.4.74
10-
com.cognitect.aws/api 0.8.692
11-
. org.clojure/data.json 2.5.0
12-
X org.clojure/tools.logging 1.2.4 :use-top
13-
X org.clojure/data.xml 0.2.0-alpha8 :use-top
14-
. org.clojure/core.async 1.6.681
15-
. org.clojure/tools.analyzer.jvm 1.2.3
16-
. org.clojure/tools.analyzer 1.1.1
17-
X org.clojure/core.memoize 1.0.253 :older-version
10+
com.cognitect.aws/api 0.8.741
11+
. org.clojure/data.json 2.5.1
12+
X org.clojure/tools.logging 1.3.0 :use-top
13+
X org.clojure/data.xml 0.2.0-alpha9 :use-top
14+
. org.clojure/core.async 1.8.741
15+
. org.clojure/tools.analyzer.jvm 1.3.2
16+
. org.clojure/tools.analyzer 1.2.0
17+
. org.clojure/core.memoize 1.1.266 :newer-version
18+
. org.clojure/core.cache 1.1.234
19+
. org.clojure/data.priority-map 1.2.0
1820
. org.ow2.asm/asm 9.2
19-
X org.clojure/tools.reader 1.3.6 :older-version
20-
com.cognitect.aws/endpoints 1.1.12.489
21+
. org.clojure/tools.reader 1.5.0 :newer-version
22+
com.cognitect.aws/endpoints 871.2.31.64
2123
org.clojure/tools.logging 1.2.4
2224
duct/hikaricp-component 0.1.2
2325
X com.stuartsierra/component 0.3.2 :use-top
@@ -35,7 +37,7 @@ valip/valip 0.2.0
3537
X commons-collections/commons-collections 2.1 :use-top
3638
. xml-apis/xml-apis 1.0.b2
3739
X commons-logging/commons-logging 1.0.4 :older-version
38-
com.cognitect.aws/sqs 847.2.1398.0
40+
com.cognitect.aws/sqs 871.2.29.52
3941
org.apache.lucene/lucene-analyzers-common 8.11.4
4042
X org.apache.lucene/lucene-core 8.11.4 :use-top
4143
ring/ring-defaults 0.5.0
@@ -65,6 +67,10 @@ ring/ring-jetty-adapter 1.13.0
6567
X ring/ring-core 1.13.0 :use-top
6668
. org.eclipse.jetty/jetty-server 11.0.24
6769
. org.eclipse.jetty/jetty-http 11.0.24
70+
. org.eclipse.jetty/jetty-io 11.0.24
71+
. org.eclipse.jetty/jetty-util 11.0.24
72+
X org.slf4j/slf4j-api 2.0.9 :use-top
73+
X org.slf4j/slf4j-api 2.0.9 :use-top
6874
. org.eclipse.jetty/jetty-io 11.0.24
6975
. org.eclipse.jetty/jetty-util 11.0.24
7076
X org.slf4j/slf4j-api 2.0.9 :use-top
@@ -108,21 +114,6 @@ org.apache.commons/commons-email 1.5
108114
org.postgresql/postgresql 42.7.2
109115
. org.checkerframework/checker-qual 3.42.0
110116
com.github.seancorfield/honeysql 2.4.1078
111-
org.tcrawley/cognitect-http-client 1.11.130
112-
. org.eclipse.jetty/jetty-http 11.0.24
113-
. org.eclipse.jetty/jetty-io 11.0.24
114-
. org.eclipse.jetty/jetty-util 11.0.24
115-
X org.slf4j/slf4j-api 2.0.9 :use-top
116-
. org.eclipse.jetty/jetty-util 11.0.24
117-
X org.slf4j/slf4j-api 2.0.9 :use-top
118-
. org.eclipse.jetty/jetty-client 11.0.24
119-
. org.eclipse.jetty/jetty-alpn-client 11.0.24
120-
. org.eclipse.jetty/jetty-io 11.0.24
121-
X org.slf4j/slf4j-api 2.0.9 :use-top
122-
. org.eclipse.jetty/jetty-http 11.0.24
123-
. org.eclipse.jetty/jetty-io 11.0.24
124-
X org.slf4j/slf4j-api 2.0.9 :use-top
125-
. org.clojure/core.async 1.6.681
126117
org.yaml/snakeyaml 1.33
127118
aero/aero 1.1.6
128119
clj-http/clj-http 3.12.3
@@ -161,9 +152,9 @@ org.apache.lucene/lucene-queryparser 8.11.4
161152
. org.apache.lucene/lucene-sandbox 8.11.4
162153
org.bouncycastle/bcprov-jdk18on 1.78
163154
ring-middleware-format/ring-middleware-format 0.7.5
164-
. org.clojure/core.memoize 1.0.257
155+
X org.clojure/core.memoize 1.0.257 :superseded
165156
. org.clojure/core.cache 1.0.225 :newer-version
166-
. org.clojure/data.priority-map 1.1.0
157+
X org.clojure/data.priority-map 1.1.0 :parent-omitted
167158
X ring/ring-core 1.9.5 :use-top
168159
X cheshire/cheshire 5.10.2 :use-top
169160
X org.clojure/tools.reader 1.3.6 :superseded
@@ -264,13 +255,13 @@ cheshire/cheshire 5.10.1
264255
. tigris/tigris 0.1.2
265256
org.mindrot/jbcrypt 0.4
266257
com.taoensso/nippy 3.4.2
267-
. org.clojure/tools.reader 1.4.2 :newer-version
258+
X org.clojure/tools.reader 1.4.2 :superseded
268259
. com.taoensso/encore 3.112.0
269260
. org.clojure/tools.reader 1.4.2
270261
. com.taoensso/truss 1.11.0
271262
. org.tukaani/xz 1.9
272263
. io.airlift/aircompressor 0.27
273-
com.cognitect.aws/s3 847.2.1398.0
264+
com.cognitect.aws/s3 871.2.31.64
274265
clj-stacktrace/clj-stacktrace 0.2.8
275266
org.slf4j/slf4j-api 2.0.13
276267
org.apache.maven/maven-model 3.8.4

‎dependabot/pom.xml‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependency>
1111
<groupId>com.cognitect.aws</groupId>
1212
<artifactId>ssm</artifactId>
13-
<version>847.2.1365.0</version>
13+
<version>871.2.31.64</version>
1414
</dependency>
1515
<dependency>
1616
<groupId>buddy</groupId>
@@ -25,18 +25,12 @@
2525
<dependency>
2626
<groupId>com.cognitect.aws</groupId>
2727
<artifactId>api</artifactId>
28-
<version>0.8.692</version>
29-
<exclusions>
30-
<exclusion>
31-
<groupId>com.cognitect</groupId>
32-
<artifactId>http-client</artifactId>
33-
</exclusion>
34-
</exclusions>
28+
<version>0.8.741</version>
3529
</dependency>
3630
<dependency>
3731
<groupId>com.cognitect.aws</groupId>
3832
<artifactId>endpoints</artifactId>
39-
<version>1.1.12.489</version>
33+
<version>871.2.31.64</version>
4034
</dependency>
4135
<dependency>
4236
<groupId>org.clojure</groupId>
@@ -67,7 +61,7 @@
6761
<dependency>
6862
<groupId>com.cognitect.aws</groupId>
6963
<artifactId>sqs</artifactId>
70-
<version>847.2.1398.0</version>
64+
<version>871.2.29.52</version>
7165
</dependency>
7266
<dependency>
7367
<groupId>org.apache.lucene</groupId>
@@ -119,11 +113,6 @@
119113
<artifactId>honeysql</artifactId>
120114
<version>2.4.1078</version>
121115
</dependency>
122-
<dependency>
123-
<groupId>org.tcrawley</groupId>
124-
<artifactId>cognitect-http-client</artifactId>
125-
<version>1.11.130</version>
126-
</dependency>
127116
<dependency>
128117
<groupId>org.yaml</groupId>
129118
<artifactId>snakeyaml</artifactId>
@@ -272,7 +261,7 @@
272261
<dependency>
273262
<groupId>com.cognitect.aws</groupId>
274263
<artifactId>s3</artifactId>
275-
<version>847.2.1398.0</version>
264+
<version>871.2.31.64</version>
276265
</dependency>
277266
<dependency>
278267
<groupId>clj-stacktrace</groupId>

‎deps.edn‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@
2020
org.openid4java/openid4java-nodeps
2121
;; not used, excluded to address CVE-2012-0881, CVE-2013-4002, CVE-2009-2625
2222
net.sourceforge.nekohtml/nekohtml]}
23-
;; Note: there is a newer api release that uses the built-in java http client
24-
;; instead of using jetty client, but we can't upgrade to it until
25-
;; https://github.com/cognitect-labs/aws-api/issues/261 is addressed.
26-
com.cognitect.aws/api {:mvn/version "0.8.692"
27-
;; we use org.tcrawley/cognitect-http-client instead to use Jetty 11
28-
:exclusions [com.cognitect/http-client]}
29-
com.cognitect.aws/endpoints {:mvn/version "1.1.12.489"}
30-
com.cognitect.aws/s3 {:mvn/version "847.2.1398.0"}
31-
com.cognitect.aws/sqs {:mvn/version "847.2.1398.0"}
32-
com.cognitect.aws/ssm {:mvn/version "847.2.1365.0"}
23+
com.cognitect.aws/api {:mvn/version "0.8.741"}
24+
com.cognitect.aws/endpoints {:mvn/version "871.2.31.64"}
25+
com.cognitect.aws/s3 {:mvn/version "871.2.31.64"}
26+
com.cognitect.aws/sqs {:mvn/version "871.2.29.52"}
27+
com.cognitect.aws/ssm {:mvn/version "871.2.31.64"}
3328
com.github.scribejava/scribejava-apis {:mvn/version "8.3.1"}
3429
com.github.seancorfield/honeysql {:mvn/version "2.4.1078"}
3530
com.github.seancorfield/next.jdbc {:mvn/version "1.3.925"}
@@ -43,7 +38,7 @@
4338
duct/hikaricp-component {:mvn/version "0.1.2"
4439
:exclusions [org.slf4j/slf4j-nop]}
4540

46-
;; manully imported clj-kondo configs from 2.x branch to .clj-kondo/imports/hiccup/hiccup
41+
;; manually imported clj-kondo configs from 2.x branch to .clj-kondo/imports/hiccup/hiccup
4742
hiccup/hiccup {:mvn/version "1.0.5"}
4843

4944
kirasystems/aging-session {:mvn/version "0.5.0"
@@ -76,7 +71,6 @@
7671
;; allows logging to be properly configured instead of going to stdout, and I
7772
;; don't know why! - Toby 2024-05-05
7873
org.slf4j/slf4j-api {:mvn/version "2.0.13"}
79-
org.tcrawley/cognitect-http-client {:mvn/version "1.11.130"}
8074

8175
net.cgrand/regex {:mvn/version "1.0.1"}
8276

‎docker-compose.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21
services:
32
dev-db:
43
image: postgres:15.5
@@ -30,7 +29,7 @@ services:
3029
MINIO_ROOT_USER: fake-access-key
3130
MINIO_ROOT_PASSWORD: fake-secret-key
3231
elasticmq:
33-
image: "softwaremill/elasticmq:1.4.2"
32+
image: "softwaremill/elasticmq:1.6.12"
3433
ports:
3534
- "9324:9324"
3635
- "9325:9325"

‎test/clojars/unit/s3_test.clj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
(finally
3939
(clear-bucket)))))
4040

41-
(deftest put-object+get-object-details-work
41+
(deftest put-file+get-object-details-work
4242
(let [s3 (real-s3-client)]
43-
(s3/put-object s3 "a-key" (io/input-stream (io/resource "fake.jar")))
43+
(s3/put-file s3 "fake.jar" (io/resource "fake.jar"))
4444
(is (match?
4545
{:ETag "d7c2e3e6ed5ab399efcb2fb7d8faa87c"
4646
:ContentLength 8
47-
:ContentType "application/octet-stream"
47+
:ContentType "application/x-java-archive"
4848
:AcceptRanges "bytes"}
49-
(s3/get-object-details s3 "a-key")))))
49+
(s3/get-object-details s3 "fake.jar")))))
5050

5151
(deftest list-entries-works
5252
(doseq [[client-type s3] [[:mock (s3/mock-s3-client)] [:real (real-s3-client)]]]

0 commit comments

Comments
 (0)