Parameterize http client, update todo.txt

2 files changed, 32 insertions, 30 deletions

diff --git a/desmoctl.scm b/desmoctl.scm
index d69f443..bc4c187 100644
--- a/desmoctl.scm
+++ b/desmoctl.scm
@@ -82,6 +82,8 @@
    (test "returns catcher return value when exn thrown" 'caught
 	 (try-catch (lambda (e) 'caught) (lambda () (car '()))))))
 
+(define (id . args) (apply values args))q
+
 (define (assocar key alist)
   (match (assoc key alist)
     [#f #f]
@@ -283,60 +285,60 @@
   ;; (print (format "~%mock-post-fn called with: ~A" rest))
   rest)
 
-(define (post-fn url api-key json)
-  (with-input-from-request
-   (make-request method: 'POST
-                 uri: (uri-reference url)
-		 headers: (headers `((x-api-key ,api-key))))
-   json read-string))
-
 (define (mock-get-fn . rest)
   ;; (print (format "~%mock-get-fn called with: ~A" rest))
   rest)
 
-(define (get-fn url api-key)
-  (with-input-from-request
-   (make-request method: 'GET
-		 uri: (uri-reference url)
-		 headers: (headers `((x-api-key ,api-key))))
-   #f read-string))
+(define http-client (make-parameter with-input-from-request))
 
-(define (post-prison post-fn cfg prison-json)
+(define (post-prison cfg prison-json)
   (let* ((api-url (assocdr 'mgmt-api-url cfg))
 	 (api-key (assocdr 'mgmt-api-key cfg))
 	 (req-url (string-append api-url "/prisons")))
-    (post-fn req-url api-key prison-json)))
 
-(define (get-prisons get-fn cfg)
+    ((http-client)
+     (make-request method: 'POST
+                   uri: (uri-reference req-url)
+		   headers: (headers `((x-api-key ,api-key))))
+     prison-json read-string)))
+
+(define (get-prisons cfg)
   (let* ((api-url (assocdr 'mgmt-api-url cfg))
 	 (api-key (assocdr 'mgmt-api-key cfg))
 	 (req-url (string-append api-url "/prisons")))
-    (get-fn req-url api-key)))
+
+    ((http-client)
+     (make-request method: 'GET
+		   uri: (uri-reference req-url)
+		   headers: (headers `((x-api-key ,api-key))))
+     #f read-string)))
 
 (define (post-archive cfg archive-path)
   (let* ((api-url (assocdr 'mgmt-api-url cfg))
 	 (api-key (assocdr 'mgmt-api-key cfg))
 	 (req-url (string-append api-url "/prisons")))
 
-    (with-input-from-request
+    ((http-client)
      (make-request method: 'POST
                    uri: (uri-reference req-url)
 		   headers: (headers `((x-api-key ,api-key))))
-     `((image file: ,archive-path filename: "desmo_archive.txz"))
+     `((image file: ,archive-path
+	      filename: "desmo_archive.txz"))
      read-string)))
 
 (inline-tests
  (test-group "API adapter"
-   (test-group "get-prisons"
-     (test "should create correct query" '("http://example.com/prisons" "bar")
-	   (get-prisons mock-get-fn
-			'((mgmt-api-url . "http://example.com") (mgmt-api-key . "bar")))))
+   (parameterize ((http-client id))
+     (test-assert "get-prisons should construct query successfully"
+       (get-prisons '((mgmt-api-url . "http://example.com") (mgmt-api-key . "bar"))))
+
+     (test-assert "post-prison should construct query successfully"
+       (post-prison '((mgmt-api-url . "http://example.com") (mgmt-api-key . "bar"))
+		    "{\"a\":\"b\"}"))
 
-   (test-group "post-prison"
-     (test "should create correct query" '("http://example.com/prisons" "bar" "{\"a\":\"b\"}")
-	   (post-prison mock-post-fn
-			'((mgmt-api-url . "http://example.com") (mgmt-api-key . "bar"))
-			"{\"a\":\"b\"}")))))
+     (test-assert "post-archive should construct query successfully"
+       (post-prison '((mgmt-api-url . "http://example.com") (mgmt-api-key . "bar"))
+		    "desmo_archive.txz")))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Parse & eval "apply" subcommand ;;
diff --git a/todo.txt b/todo.txt
index 2bc74c2..a7f30da 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,6 @@
 2024-01-31 Fix OpenSSL static compilation bug
 2024-01-31 Implement log subcommand
-2024-01-31 Implement push subcommand
+x 2024-02-04 2024-01-31 Implement push subcommand
 x 2024-02-04 2024-01-31 Add "make test" that runs all tests and returns exit code 0 or 1
 x 2024-02-04 2024-01-31 Add CI/CD for building and releasing tagged commits
-2024-02-04 Refactor API procs to use parameterized http client
+x 2024-02-04 2024-02-04 Refactor API procs to use parameterized http client