Skip to content

Commit da98272

Browse files
committed
Support global parameters shared by all endpoints
1 parent c431a67 commit da98272

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/compute/gcp/impl/request.clj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
(select-keys parameter-kvs query-header-form-data-params))))
8989

9090
(defn build-request-map
91-
[endpoint op-info op-map]
91+
[endpoint global-params op-info op-map]
9292
(let [{:keys [request timeout as]} op-map
9393
base-req (cond-> {:method (::descriptor/http-method op-info)
9494
:uri (str (::descriptor/url endpoint)
@@ -98,7 +98,8 @@
9898
as (assoc :as as))]
9999
(with-request-parameters
100100
base-req
101-
(::descriptor/parameters op-info)
101+
(merge global-params
102+
(::descriptor/parameters op-info))
102103
(::descriptor/request op-info)
103104
request)))
104105

@@ -123,11 +124,14 @@
123124
(defn op-request-map
124125
[cinfo op-map]
125126
(if-let [op-descriptor (get-op-descriptor cinfo (:op op-map))]
126-
(let [request (try
127+
(let [endpoint (get-in cinfo [:compute.gcp.api/api-descriptor ::descriptor/endpoint])
128+
global-params (get-in cinfo [:compute.gcp.api/api-descriptor ::descriptor/parameters])
129+
request (try
127130
(build-request-map
128-
(get-in cinfo [:compute.gcp.api/api-descriptor ::descriptor/endpoint])
129-
op-descriptor
130-
op-map)
131+
endpoint
132+
global-params
133+
op-descriptor
134+
op-map)
131135
(catch Exception ex
132136
{::anom/category ::anom/fault
133137
::anom/message (str "Exception while creating the HTTP request map. " (.getMessage ex))

0 commit comments

Comments
 (0)