aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-10-18 14:06:32 +0200
committerAlex Auvolat <alex@adnab.me>2023-10-18 14:06:32 +0200
commit012ade5d4b81cc623f45042a1d3ca5c3ddafa569 (patch)
tree590058f91b1549302a2cf9842154852089b51228
parentef5ca86dfc2678e8fc16b99daffeac40093945ae (diff)
downloadgarage-012ade5d4b81cc623f45042a1d3ca5c3ddafa569.tar.gz
garage-012ade5d4b81cc623f45042a1d3ca5c3ddafa569.zip
jepsen: update jepsen and fix garage key info
-rw-r--r--script/jepsen.garage/project.clj2
-rw-r--r--script/jepsen.garage/src/jepsen/garage/grg.clj2
2 files changed, 2 insertions, 2 deletions
diff --git a/script/jepsen.garage/project.clj b/script/jepsen.garage/project.clj
index 20bb59c7..59d45484 100644
--- a/script/jepsen.garage/project.clj
+++ b/script/jepsen.garage/project.clj
@@ -5,6 +5,6 @@
:url "https://www.gnu.org/licenses/agpl-3.0.en.html"}
:main jepsen.garage
:dependencies [[org.clojure/clojure "1.11.1"]
- [jepsen "0.3.2-SNAPSHOT"]
+ [jepsen "0.3.3-SNAPSHOT"]
[amazonica "0.3.163"]]
:repl-options {:init-ns jepsen.garage})
diff --git a/script/jepsen.garage/src/jepsen/garage/grg.clj b/script/jepsen.garage/src/jepsen/garage/grg.clj
index 31f20852..4347b1a7 100644
--- a/script/jepsen.garage/src/jepsen/garage/grg.clj
+++ b/script/jepsen.garage/src/jepsen/garage/grg.clj
@@ -87,7 +87,7 @@
(defn s3-creds
"Get S3 credentials for node"
[node]
- (let [key-info (c/on node (c/exec binary :key :info grg-key))
+ (let [key-info (c/on node (c/exec binary :key :info grg-key :--show-secret))
[_ ak sk] (re-matches
#"(?s).*Key ID: (.*)\nSecret key: (.*)\nCan create.*"
key-info)]