@@ -181,13 +181,13 @@ class ProviderConfigClient:
181181 def __init__ (self , http_client , project_id , tenant_id = None , url_override = None ):
182182 self .http_client = http_client
183183 url_prefix = url_override or self .PROVIDER_CONFIG_URL
184- self .base_url = '{0 }/projects/{1}' . format ( url_prefix , project_id )
184+ self .base_url = f' { url_prefix } /projects/{ project_id } '
185185 if tenant_id :
186- self .base_url += '/tenants/{0}' . format ( tenant_id )
186+ self .base_url += f '/tenants/{ tenant_id } '
187187
188188 def get_oidc_provider_config (self , provider_id ):
189189 _validate_oidc_provider_id (provider_id )
190- body = self ._make_request ('get' , '/oauthIdpConfigs/{0}' . format ( provider_id ) )
190+ body = self ._make_request ('get' , f '/oauthIdpConfigs/{ provider_id } ' )
191191 return OIDCProviderConfig (body )
192192
193193 def create_oidc_provider_config (
@@ -218,7 +218,7 @@ def create_oidc_provider_config(
218218 if response_type :
219219 req ['responseType' ] = response_type
220220
221- params = 'oauthIdpConfigId={0}' . format ( provider_id )
221+ params = f 'oauthIdpConfigId={ provider_id } '
222222 body = self ._make_request ('post' , '/oauthIdpConfigs' , json = req , params = params )
223223 return OIDCProviderConfig (body )
224224
@@ -259,14 +259,14 @@ def update_oidc_provider_config(
259259 raise ValueError ('At least one parameter must be specified for update.' )
260260
261261 update_mask = _auth_utils .build_update_mask (req )
262- params = 'updateMask={0}' . format ( ',' .join (update_mask ))
263- url = '/oauthIdpConfigs/{0}' . format ( provider_id )
262+ params = f 'updateMask={ "," .join (update_mask )} '
263+ url = f '/oauthIdpConfigs/{ provider_id } '
264264 body = self ._make_request ('patch' , url , json = req , params = params )
265265 return OIDCProviderConfig (body )
266266
267267 def delete_oidc_provider_config (self , provider_id ):
268268 _validate_oidc_provider_id (provider_id )
269- self ._make_request ('delete' , '/oauthIdpConfigs/{0}' . format ( provider_id ) )
269+ self ._make_request ('delete' , f '/oauthIdpConfigs/{ provider_id } ' )
270270
271271 def list_oidc_provider_configs (self , page_token = None , max_results = MAX_LIST_CONFIGS_RESULTS ):
272272 return _ListOIDCProviderConfigsPage (
@@ -277,7 +277,7 @@ def _fetch_oidc_provider_configs(self, page_token=None, max_results=MAX_LIST_CON
277277
278278 def get_saml_provider_config (self , provider_id ):
279279 _validate_saml_provider_id (provider_id )
280- body = self ._make_request ('get' , '/inboundSamlConfigs/{0}' . format ( provider_id ) )
280+ body = self ._make_request ('get' , f '/inboundSamlConfigs/{ provider_id } ' )
281281 return SAMLProviderConfig (body )
282282
283283 def create_saml_provider_config (
@@ -301,7 +301,7 @@ def create_saml_provider_config(
301301 if enabled is not None :
302302 req ['enabled' ] = _auth_utils .validate_boolean (enabled , 'enabled' )
303303
304- params = 'inboundSamlConfigId={0}' . format ( provider_id )
304+ params = f 'inboundSamlConfigId={ provider_id } '
305305 body = self ._make_request ('post' , '/inboundSamlConfigs' , json = req , params = params )
306306 return SAMLProviderConfig (body )
307307
@@ -341,14 +341,14 @@ def update_saml_provider_config(
341341 raise ValueError ('At least one parameter must be specified for update.' )
342342
343343 update_mask = _auth_utils .build_update_mask (req )
344- params = 'updateMask={0}' . format ( ',' .join (update_mask ))
345- url = '/inboundSamlConfigs/{0}' . format ( provider_id )
344+ params = f 'updateMask={ "," .join (update_mask )} '
345+ url = f '/inboundSamlConfigs/{ provider_id } '
346346 body = self ._make_request ('patch' , url , json = req , params = params )
347347 return SAMLProviderConfig (body )
348348
349349 def delete_saml_provider_config (self , provider_id ):
350350 _validate_saml_provider_id (provider_id )
351- self ._make_request ('delete' , '/inboundSamlConfigs/{0}' . format ( provider_id ) )
351+ self ._make_request ('delete' , f '/inboundSamlConfigs/{ provider_id } ' )
352352
353353 def list_saml_provider_configs (self , page_token = None , max_results = MAX_LIST_CONFIGS_RESULTS ):
354354 return _ListSAMLProviderConfigsPage (
@@ -367,15 +367,15 @@ def _fetch_provider_configs(self, path, page_token=None, max_results=MAX_LIST_CO
367367 if max_results < 1 or max_results > MAX_LIST_CONFIGS_RESULTS :
368368 raise ValueError (
369369 'Max results must be a positive integer less than or equal to '
370- '{0 }.'. format ( MAX_LIST_CONFIGS_RESULTS ) )
370+ f' { MAX_LIST_CONFIGS_RESULTS } .' )
371371
372- params = 'pageSize={0}' . format ( max_results )
372+ params = f 'pageSize={ max_results } '
373373 if page_token :
374- params += '&pageToken={0}' . format ( page_token )
374+ params += f '&pageToken={ page_token } '
375375 return self ._make_request ('get' , path , params = params )
376376
377377 def _make_request (self , method , path , ** kwargs ):
378- url = '{0}{1}' . format ( self .base_url , path )
378+ url = f' { self .base_url } { path } '
379379 try :
380380 return self .http_client .body (method , url , ** kwargs )
381381 except requests .exceptions .RequestException as error :
@@ -385,45 +385,42 @@ def _make_request(self, method, path, **kwargs):
385385def _validate_oidc_provider_id (provider_id ):
386386 if not isinstance (provider_id , str ):
387387 raise ValueError (
388- 'Invalid OIDC provider ID: {0}. Provider ID must be a non-empty string.' .format (
389- provider_id ))
388+ f'Invalid OIDC provider ID: { provider_id } . Provider ID must be a non-empty string.' )
390389 if not provider_id .startswith ('oidc.' ):
391- raise ValueError ('Invalid OIDC provider ID: {0 }.' . format ( provider_id ) )
390+ raise ValueError (f 'Invalid OIDC provider ID: { provider_id } .' )
392391 return provider_id
393392
394393
395394def _validate_saml_provider_id (provider_id ):
396395 if not isinstance (provider_id , str ):
397396 raise ValueError (
398- 'Invalid SAML provider ID: {0}. Provider ID must be a non-empty string.' .format (
399- provider_id ))
397+ f'Invalid SAML provider ID: { provider_id } . Provider ID must be a non-empty string.' )
400398 if not provider_id .startswith ('saml.' ):
401- raise ValueError ('Invalid SAML provider ID: {0 }.' . format ( provider_id ) )
399+ raise ValueError (f 'Invalid SAML provider ID: { provider_id } .' )
402400 return provider_id
403401
404402
405403def _validate_non_empty_string (value , label ):
406404 """Validates that the given value is a non-empty string."""
407405 if not isinstance (value , str ):
408- raise ValueError ('Invalid type for {0 }: {1 }.' . format ( label , value ) )
406+ raise ValueError (f 'Invalid type for { label } : { value } .' )
409407 if not value :
410- raise ValueError ('{0 } must not be empty.'. format ( label ) )
408+ raise ValueError (f' { label } must not be empty.' )
411409 return value
412410
413411
414412def _validate_url (url , label ):
415413 """Validates that the given value is a well-formed URL string."""
416414 if not isinstance (url , str ) or not url :
417415 raise ValueError (
418- 'Invalid photo URL: "{0}". {1} must be a non-empty '
419- 'string.' .format (url , label ))
416+ f'Invalid photo URL: "{ url } ". { label } must be a non-empty string.' )
420417 try :
421418 parsed = parse .urlparse (url )
422419 if not parsed .netloc :
423- raise ValueError ('Malformed {0 }: "{1 }".' . format ( label , url ) )
420+ raise ValueError (f 'Malformed { label } : "{ url } ".' )
424421 return url
425422 except Exception as exception :
426- raise ValueError ('Malformed {0 }: "{1 }".' . format ( label , url ) ) from exception
423+ raise ValueError (f 'Malformed { label } : "{ url } ".' ) from exception
427424
428425
429426def _validate_x509_certificates (x509_certificates ):
0 commit comments