send clientid with cookie

Author: milt

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

@@ -62,6 +62,9 @@
 (def cookie-desc
   "An optional cookie string to send in the Cookie header.")
 
+(def credential-id-desc
+  "An optional credentialID parameter to send to the LRS.")
+
 (def batch-size-desc
   "The batch size, i.e. how many statements to send at a time, for POSTing.")
 
@@ -88,6 +91,9 @@
    [nil "--cookie COOKIE" "Authentication Cookie"
     :id :cookie
     :desc cookie-desc]
+   [nil "--credential-id UUID" "Yet LRS Credential ID for use with cookie auth."
+    :id :credential-id
+    :desc credential-id-desc]
    ["-B" "--batch-size SIZE" "LRS POST batch size"
     :id       :batch-size
     :default  25
@@ -168,19 +174,21 @@
                 password
                 token
                 cookie
+                credential-id
                 batch-size
                 concurrency
                 post-limit
                 select-agents
                 async]}
         options
         post-options
-        {:endpoint   endpoint
-         :batch-size batch-size
-         :username   username
-         :password   password
-         :token      token
-         :cookie     cookie}]
+        {:endpoint      endpoint
+         :batch-size    batch-size
+         :username      username
+         :password      password
+         :token         token
+         :cookie        cookie
+         :credential-id credential-id}]
     (if async
       (post-async! input post-options post-limit select-agents concurrency)
       (post-sync! input post-options post-limit select-agents))))

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

@@ -120,7 +120,7 @@
 (defn validate-input*
   "Perform validation on `input` and fail w/ early termination if
    it is not valid.
-   
+
    When this is called, we should have valid individual inputs. However, there
    may be cross-validation that needs to happen, so we compose the
    comprehensive spec from the options and check that."

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

@@ -46,15 +46,20 @@
   [{: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 {}))
+           cookie
+           credential-id]}]
+  (let [opts (cond
+               (and username password)
+               {:basic-auth [username password]}
+               token
+               {:headers {"Authorization" (format "Bearer %s" token)}}
+               cookie
+               (cond-> {:headers {"Cookie" cookie}}
+                 credential-id
+                 (assoc :query-params {:credentialID credential-id}))
+               :else {})]
+    (println opts)
+    opts))
 
 (defn post-statements
   "Given LRS options and a `statement-seq`, send them to an LRS in synchronous