Skip to content

Commit

Permalink
Fix ruff errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@eruvanos
eruvanos committed Aug 24, 2023
1 parent 8f29657 commit a69ef6f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions openbrokerapi/api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ def get_blueprint(

if DISABLE_VERSION_CHECK:
logger.warning(
"Minimum API version is not checked, this can cause illegal contracts between service broker and platform!"
"Minimum API version is not checked, this can cause illegal contracts between service broker and platform!",
stacklevel=0
)
else:
logger.debug("Apply check_version filter for version %s" % str(MIN_VERSION))
Expand All @@ -94,13 +95,13 @@ def get_blueprint(
if authenticator is None and broker_credentials is not None:
# setup BasicAuthenticator with broker_credentials
broker_credentials = ensure_list(broker_credentials)
logger.debug(f"Apply check_auth filter with {broker_credentials} credentials")
logger.debug(f"Apply check_auth filter with {broker_credentials} credentials", stacklevel=0)
# TODO: remove type: ignore
authenticator = BasicBrokerAuthenticator(*broker_credentials) # type: ignore
elif authenticator and broker_credentials:
warnings.warn("Provided authenticator and broker_credential, only the authenticator is used")
warnings.warn("Provided authenticator and broker_credential, only the authenticator is used", stacklevel=0)
elif authenticator is None and broker_credentials is None:
logger.warning("No authentication set, endpoints are not secured!")
logger.warning("No authentication set, endpoints are not secured!", stacklevel=0)
authenticator = NoneBrokerAuthenticator()

logger.debug("Apply authentication filter")
Expand Down Expand Up @@ -169,7 +170,7 @@ def provision(instance_id):
instance_id=instance_id, details=provision_details, async_allowed=accepts_incomplete
)
if result is None:
warnings.warn("Provision has to return ProvisionedServiceSpec")
warnings.warn("Provision has to return ProvisionedServiceSpec", stacklevel=0)
raise errors.ServiceException("Internal broker error")

except errors.ErrInstanceAlreadyExists as e:
Expand Down Expand Up @@ -234,7 +235,7 @@ def update(instance_id):
instance_id=instance_id, details=update_details, async_allowed=accepts_incomplete
)
if result is None:
warnings.warn("Update has to return UpdateServiceSpec")
warnings.warn("Update has to return UpdateServiceSpec", stacklevel=0)
raise errors.ServiceException("Internal broker error")
except errors.ErrInvalidParameters as e:
return (
Expand Down Expand Up @@ -300,7 +301,7 @@ def bind(instance_id, binding_id):
async_allowed=accepts_incomplete,
)
if result is None:
warnings.warn("Bind has to return a Binding")
warnings.warn("Bind has to return a Binding", stacklevel=0)
raise errors.ServiceException("Internal broker error")
except errors.ErrBindingAlreadyExists as e:
logger.exception(e)
Expand Down Expand Up @@ -370,7 +371,7 @@ def unbind(instance_id, binding_id):
instance_id=instance_id, binding_id=binding_id, details=unbind_details, async_allowed=accepts_incomplete
)
if result is None:
warnings.warn("Unbind has to return a UnbindSpec")
warnings.warn("Unbind has to return a UnbindSpec", stacklevel=0)
raise errors.ServiceException("Internal broker error")
except errors.ErrBindingDoesNotExist as e:
logger.exception(e)
Expand Down Expand Up @@ -415,7 +416,7 @@ def deprovision(instance_id):
instance_id=instance_id, details=deprovision_details, async_allowed=accepts_incomplete
)
if result is None:
warnings.warn("Deprovision has to return a DeprovisionServiceSpec")
warnings.warn("Deprovision has to return a DeprovisionServiceSpec", stacklevel=0)
raise errors.ServiceException("Internal broker error")
except errors.ErrInstanceDoesNotExist as e:
logger.exception(e)
Expand Down Expand Up @@ -459,7 +460,7 @@ def last_operation(instance_id):
instance_id=instance_id, operation_data=operation_data, service_id=service_id, plan_id=plan_id
)
if result is None:
warnings.warn("Last Operation has to return a LastOperation")
warnings.warn("Last Operation has to return a LastOperation", stacklevel=0)
raise errors.ServiceException("Internal broker error")
return (
to_json_response(LastOperationResponse(result.state, result.description)),
Expand Down Expand Up @@ -488,7 +489,7 @@ def last_binding_operation(instance_id, binding_id):
plan_id=plan_id,
)
if result is None:
warnings.warn("Last Binding Operation has to return a LastOperation")
warnings.warn("Last Binding Operation has to return a LastOperation", stacklevel=0)
raise errors.ServiceException("Internal broker error")
return (
to_json_response(LastOperationResponse(result.state, result.description)),
Expand All @@ -500,7 +501,7 @@ def get_instance(instance_id):
try:
result = service_broker.get_instance(instance_id=instance_id)
if result is None:
warnings.warn("Get Instance has to return GetInstanceDetailsSpec")
warnings.warn("Get Instance has to return GetInstanceDetailsSpec", stacklevel=0)
raise errors.ServiceException("Internal broker error")

response = GetInstanceResponse(
Expand Down Expand Up @@ -528,7 +529,7 @@ def get_binding(instance_id, binding_id):
try:
result = service_broker.get_binding(instance_id=instance_id, binding_id=binding_id)
if result is None:
warnings.warn("Get Binding has to return a GetBindingSpec")
warnings.warn("Get Binding has to return a GetBindingSpec", stacklevel=0)
raise errors.ServiceException("Internal broker error")

response = GetBindingResponse(
Expand Down
2 changes: 1 addition & 1 deletion openbrokerapi/auth.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ def authenticate(self):
# Backwards compatible
Authenticator = BrokerAuthenticator
BasicAuthenticator = BasicBrokerAuthenticator
NoneAuthenticator = NoneBrokerAuthenticator
NoneAuthenticator = NoneBrokerAuthenticator

0 comments on commit a69ef6f

Please sign in to comment.