sfc-gh-tbowen commented on code in PR #1060:
URL: https://github.com/apache/polaris/pull/1060#discussion_r1972809693
##########
regtests/t_pyspark/src/test_spark_sql_s3_with_privileges.py:
##########
@@ -1005,34 +1012,28 @@ def test_spark_credentials_s3_direct_without_read(
def create_principal(polaris_url, polaris_catalog_url, api, principal_name):
principal = Principal(name=principal_name, type="SERVICE")
- try:
- principal_result =
api.create_principal(CreatePrincipalRequest(principal=principal))
+ principal_result =
api.create_principal(CreatePrincipalRequest(principal=principal))
- token_client =
CatalogApiClient(Configuration(username=principal_result.principal.client_id,
+ token_client =
CatalogApiClient(Configuration(username=principal_result.principal.client_id,
password=principal_result.credentials.client_secret,
host=polaris_catalog_url))
- oauth_api = IcebergOAuth2API(token_client)
- token = oauth_api.get_token(scope='PRINCIPAL_ROLE:ALL',
client_id=principal_result.principal.client_id,
+ oauth_api = IcebergOAuth2API(token_client)
+ token = oauth_api.get_token(scope='PRINCIPAL_ROLE:ALL',
client_id=principal_result.principal.client_id,
client_secret=principal_result.credentials.client_secret,
grant_type='client_credentials',
_headers={'realm': 'POLARIS'})
- rotate_client =
ManagementApiClient(Configuration(access_token=token.access_token,
+ rotate_client =
ManagementApiClient(Configuration(access_token=token.access_token,
host=polaris_url))
- rotate_api = PolarisDefaultApi(rotate_client)
+ rotate_api = PolarisDefaultApi(rotate_client)
- rotate_credentials =
rotate_api.rotate_credentials(principal_name=principal_name)
- return rotate_credentials
- except ApiException as e:
- if e.status == 409:
- return rotate_api.rotate_credentials(principal_name=principal_name)
Review Comment:
try catch is removed since the rotate_api is set in the try block anyways -
so if it does end up in this case, it will fail as rotate_api is not set yet.
##########
regtests/t_pyspark/src/test_spark_sql_s3_with_privileges.py:
##########
@@ -1005,34 +1012,28 @@ def test_spark_credentials_s3_direct_without_read(
def create_principal(polaris_url, polaris_catalog_url, api, principal_name):
principal = Principal(name=principal_name, type="SERVICE")
- try:
- principal_result =
api.create_principal(CreatePrincipalRequest(principal=principal))
+ principal_result =
api.create_principal(CreatePrincipalRequest(principal=principal))
- token_client =
CatalogApiClient(Configuration(username=principal_result.principal.client_id,
+ token_client =
CatalogApiClient(Configuration(username=principal_result.principal.client_id,
password=principal_result.credentials.client_secret,
host=polaris_catalog_url))
- oauth_api = IcebergOAuth2API(token_client)
- token = oauth_api.get_token(scope='PRINCIPAL_ROLE:ALL',
client_id=principal_result.principal.client_id,
+ oauth_api = IcebergOAuth2API(token_client)
+ token = oauth_api.get_token(scope='PRINCIPAL_ROLE:ALL',
client_id=principal_result.principal.client_id,
client_secret=principal_result.credentials.client_secret,
grant_type='client_credentials',
_headers={'realm': 'POLARIS'})
- rotate_client =
ManagementApiClient(Configuration(access_token=token.access_token,
+ rotate_client =
ManagementApiClient(Configuration(access_token=token.access_token,
host=polaris_url))
- rotate_api = PolarisDefaultApi(rotate_client)
+ rotate_api = PolarisDefaultApi(rotate_client)
- rotate_credentials =
rotate_api.rotate_credentials(principal_name=principal_name)
- return rotate_credentials
- except ApiException as e:
- if e.status == 409:
- return rotate_api.rotate_credentials(principal_name=principal_name)
Review Comment:
try catch is removed since the rotate_api is set in the try block anyways -
so if it does end up in this case, it will fail as rotate_api is not set yet.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]