@@ -181,13 +181,13 @@ class ProviderConfigClient:
181
181
def __init__ (self , http_client , project_id , tenant_id = None , url_override = None ):
182
182
self .http_client = http_client
183
183
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 } '
185
185
if tenant_id :
186
- self .base_url += '/tenants/{0}' . format ( tenant_id )
186
+ self .base_url += f '/tenants/{ tenant_id } '
187
187
188
188
def get_oidc_provider_config (self , provider_id ):
189
189
_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 } ' )
191
191
return OIDCProviderConfig (body )
192
192
193
193
def create_oidc_provider_config (
@@ -218,7 +218,7 @@ def create_oidc_provider_config(
218
218
if response_type :
219
219
req ['responseType' ] = response_type
220
220
221
- params = 'oauthIdpConfigId={0}' . format ( provider_id )
221
+ params = f 'oauthIdpConfigId={ provider_id } '
222
222
body = self ._make_request ('post' , '/oauthIdpConfigs' , json = req , params = params )
223
223
return OIDCProviderConfig (body )
224
224
@@ -259,14 +259,14 @@ def update_oidc_provider_config(
259
259
raise ValueError ('At least one parameter must be specified for update.' )
260
260
261
261
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 } '
264
264
body = self ._make_request ('patch' , url , json = req , params = params )
265
265
return OIDCProviderConfig (body )
266
266
267
267
def delete_oidc_provider_config (self , provider_id ):
268
268
_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 } ' )
270
270
271
271
def list_oidc_provider_configs (self , page_token = None , max_results = MAX_LIST_CONFIGS_RESULTS ):
272
272
return _ListOIDCProviderConfigsPage (
@@ -277,7 +277,7 @@ def _fetch_oidc_provider_configs(self, page_token=None, max_results=MAX_LIST_CON
277
277
278
278
def get_saml_provider_config (self , provider_id ):
279
279
_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 } ' )
281
281
return SAMLProviderConfig (body )
282
282
283
283
def create_saml_provider_config (
@@ -301,7 +301,7 @@ def create_saml_provider_config(
301
301
if enabled is not None :
302
302
req ['enabled' ] = _auth_utils .validate_boolean (enabled , 'enabled' )
303
303
304
- params = 'inboundSamlConfigId={0}' . format ( provider_id )
304
+ params = f 'inboundSamlConfigId={ provider_id } '
305
305
body = self ._make_request ('post' , '/inboundSamlConfigs' , json = req , params = params )
306
306
return SAMLProviderConfig (body )
307
307
@@ -341,14 +341,14 @@ def update_saml_provider_config(
341
341
raise ValueError ('At least one parameter must be specified for update.' )
342
342
343
343
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 } '
346
346
body = self ._make_request ('patch' , url , json = req , params = params )
347
347
return SAMLProviderConfig (body )
348
348
349
349
def delete_saml_provider_config (self , provider_id ):
350
350
_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 } ' )
352
352
353
353
def list_saml_provider_configs (self , page_token = None , max_results = MAX_LIST_CONFIGS_RESULTS ):
354
354
return _ListSAMLProviderConfigsPage (
@@ -367,15 +367,15 @@ def _fetch_provider_configs(self, path, page_token=None, max_results=MAX_LIST_CO
367
367
if max_results < 1 or max_results > MAX_LIST_CONFIGS_RESULTS :
368
368
raise ValueError (
369
369
'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 } .' )
371
371
372
- params = 'pageSize={0}' . format ( max_results )
372
+ params = f 'pageSize={ max_results } '
373
373
if page_token :
374
- params += '&pageToken={0}' . format ( page_token )
374
+ params += f '&pageToken={ page_token } '
375
375
return self ._make_request ('get' , path , params = params )
376
376
377
377
def _make_request (self , method , path , ** kwargs ):
378
- url = '{0}{1}' . format ( self .base_url , path )
378
+ url = f' { self .base_url } { path } '
379
379
try :
380
380
return self .http_client .body (method , url , ** kwargs )
381
381
except requests .exceptions .RequestException as error :
@@ -385,45 +385,42 @@ def _make_request(self, method, path, **kwargs):
385
385
def _validate_oidc_provider_id (provider_id ):
386
386
if not isinstance (provider_id , str ):
387
387
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.' )
390
389
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 } .' )
392
391
return provider_id
393
392
394
393
395
394
def _validate_saml_provider_id (provider_id ):
396
395
if not isinstance (provider_id , str ):
397
396
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.' )
400
398
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 } .' )
402
400
return provider_id
403
401
404
402
405
403
def _validate_non_empty_string (value , label ):
406
404
"""Validates that the given value is a non-empty string."""
407
405
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 } .' )
409
407
if not value :
410
- raise ValueError ('{0 } must not be empty.'. format ( label ) )
408
+ raise ValueError (f' { label } must not be empty.' )
411
409
return value
412
410
413
411
414
412
def _validate_url (url , label ):
415
413
"""Validates that the given value is a well-formed URL string."""
416
414
if not isinstance (url , str ) or not url :
417
415
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.' )
420
417
try :
421
418
parsed = parse .urlparse (url )
422
419
if not parsed .netloc :
423
- raise ValueError ('Malformed {0 }: "{1 }".' . format ( label , url ) )
420
+ raise ValueError (f 'Malformed { label } : "{ url } ".' )
424
421
return url
425
422
except Exception as exception :
426
- raise ValueError ('Malformed {0 }: "{1 }".' . format ( label , url ) ) from exception
423
+ raise ValueError (f 'Malformed { label } : "{ url } ".' ) from exception
427
424
428
425
429
426
def _validate_x509_certificates (x509_certificates ):
0 commit comments