added token and cookie auth

Author: milt

src/cli/com/yetanalytics/datasim/cli/generate.clj

@@ -56,6 +56,12 @@
 (def password-desc
   "The Basic Auth password for the LRS.")
 
+(def token-desc
+  "An optional bearer token to use in the Authorization header (overrides username and password if present).")
+
+(def cookie-desc
+  "An optional cookie string to send in the Cookie header.")
+
 (def batch-size-desc
   "The batch size, i.e. how many statements to send at a time, for POSTing.")
 
@@ -76,6 +82,12 @@
    ["-P" "--password URI" "LRS password"
     :id :password
     :desc password-desc]
+   [nil "--token TOKEN" "Bearer Token"
+    :id :token
+    :desc token-desc]
+   [nil "--cookie COOKIE" "Authentication Cookie"
+    :id :cookie
+    :desc cookie-desc]
    ["-B" "--batch-size SIZE" "LRS POST batch size"
     :id       :batch-size
     :default  25
@@ -154,6 +166,8 @@
   (let [{:keys [endpoint
                 username
                 password
+                token
+                cookie
                 batch-size
                 concurrency
                 post-limit
@@ -164,7 +178,9 @@
         {:endpoint   endpoint
          :batch-size batch-size
          :username   username
-         :password   password}]
+         :password   password
+         :token      token
+         :cookie     cookie}]
     (if async
       (post-async! input post-options post-limit select-agents concurrency)
       (post-sync! input post-options post-limit select-agents))))

src/main/com/yetanalytics/datasim/client.clj

@@ -25,10 +25,11 @@
   (format "%s/statements" endpoint))
 
 (defn- post-options [http-options batch]
-  (merge default-http-options
-         http-options
-         {:body (json/encode batch)
-          :as :stream}))
+  (merge-with merge
+              default-http-options
+              http-options
+              {:body (json/encode batch)
+               :as :stream}))
 
 ;; `http/post` cannot be resolved since it's defined using `http/defreq`
 #_{:clj-kondo/ignore [:unresolved-var]}
@@ -41,21 +42,34 @@
               (post-options http-options batch)
               callback-fn)))
 
+(defn- auth-options
+  [{:keys [username
+           password
+           token
+           cookie]}]
+  (cond
+    (and username password)
+    {:basic-auth [username password]}
+    token
+    {:headers {"Authorization" (format "Bearer %s" token)}}
+    cookie
+    {:headers {"Cookie" token}}
+    :else {}))
+
 (defn post-statements
   "Given LRS options and a `statement-seq`, send them to an LRS in synchronous
    batches. If `print-ids?` is `true`, returned statement IDs will be printed
    to stdout. `username` and `password` in the options map are the Basic Auth
    credentials of the LRS."
   [{:keys [endpoint
-           batch-size
-           username
-           password]
+           batch-size]
+    :as options
     :or {batch-size 25}}
    statement-seq
    & {:keys [print-ids?]
       :or   {print-ids? true}}]
   ;; TODO: Exponential backoff, etc
-  (let [http-options {:basic-auth [username password]}]
+  (let [http-options (auth-options options)]
     (loop [batches (partition-all batch-size statement-seq)
            success 0
            fail    []]
@@ -82,14 +96,14 @@
 (defn post-statements-async
   "Given LRS options and a channel with statements, send them to an LRS in
    asynchronous batches. `username` and `password` in the options map are the
-   Basic Auth credentials of the LRS.
+   Basic Auth credentials of the LRS. Other auth methods are supported via
+   `token` and `cookie`.
 
    Returns a channel that will reciveve `[:success <list of statement ids>]`
    for each batch or `[:fail <failing request>]`. Will stop sending on failure."
   [{:keys [endpoint
-           batch-size
-           username
-           password]
+           batch-size]
+    :as options
     :or {batch-size 25}}
    statement-chan
    & {:keys [concurrency
@@ -98,7 +112,7 @@
       :or {concurrency 4
            buffer-in   100 ; 10x default batch size
            buffer-out  100}}]
-  (let [http-opts {:basic-auth [username password]}
+  (let [http-opts (auth-options options)
         run?      (atom true)
         in-chan   (a/chan buffer-in (partition-all batch-size))
         out-chan  (a/chan buffer-out) ; is this.. backpressure?