@@ -201,7 +201,6 @@ pub(crate) struct GenevaConfigClient {
201
201
precomputed_url_prefix : String ,
202
202
agent_identity : String ,
203
203
agent_version : String ,
204
- static_headers : HeaderMap ,
205
204
}
206
205
207
206
impl fmt:: Debug for GenevaConfigClient {
@@ -211,7 +210,6 @@ impl fmt::Debug for GenevaConfigClient {
211
210
. field ( "precomputed_url_prefix" , & self . precomputed_url_prefix )
212
211
. field ( "agent_identity" , & self . agent_identity )
213
212
. field ( "agent_version" , & self . agent_version )
214
- . field ( "static_headers" , & self . static_headers )
215
213
. finish ( )
216
214
}
217
215
}
@@ -234,9 +232,13 @@ impl GenevaConfigClient {
234
232
/// * `GenevaConfigClientError::AuthMethodNotImplemented` - If the specified authentication method is not yet supported
235
233
#[ allow( dead_code) ]
236
234
pub ( crate ) fn new ( config : GenevaConfigClientConfig ) -> Result < Self > {
235
+ let agent_identity = "GenevaUploader" ;
236
+ let agent_version = "0.1" ;
237
+
237
238
let mut client_builder = Client :: builder ( )
238
239
. http1_only ( )
239
- . timeout ( Duration :: from_secs ( 30 ) ) ; //TODO - make this configurable
240
+ . timeout ( Duration :: from_secs ( 30 ) ) //TODO - make this configurable
241
+ . default_headers ( Self :: build_static_headers ( agent_identity, agent_version) ) ;
240
242
241
243
match & config. auth_method {
242
244
// TODO: Certificate auth would be removed in favor of managed identity.,
@@ -268,10 +270,6 @@ impl GenevaConfigClient {
268
270
}
269
271
}
270
272
271
- let agent_identity = "GenevaUploader" ;
272
- let agent_version = "0.1" ;
273
- let static_headers = Self :: build_static_headers ( agent_identity, agent_version) ;
274
-
275
273
let identity = format ! ( "Tenant=Default/Role=GcsClient/RoleInstance={agent_identity}" ) ;
276
274
277
275
let encoded_identity = general_purpose:: STANDARD . encode ( & identity) ;
@@ -313,7 +311,6 @@ impl GenevaConfigClient {
313
311
precomputed_url_prefix : pre_url,
314
312
agent_identity : agent_identity. to_string ( ) , // TODO make this configurable
315
313
agent_version : "1.0" . to_string ( ) , // TODO make this configurable
316
- static_headers,
317
314
} )
318
315
}
319
316
@@ -517,10 +514,7 @@ impl GenevaConfigClient {
517
514
518
515
let req_id = Uuid :: new_v4 ( ) . to_string ( ) ;
519
516
520
- let mut request = self
521
- . http_client
522
- . get ( & url)
523
- . headers ( self . static_headers . clone ( ) ) ; // Clone only cheap references
517
+ let mut request = self . http_client . get ( & url) ;
524
518
525
519
request = request. header ( "x-ms-client-request-id" , req_id) ;
526
520
0 commit comments