Skip to content

Commit

Permalink
Merge pull request #288 from cloudify-cosmo/CY-2176-add-to-authentiat…
Browse files Browse the repository at this point in the history
…ion-exception-message

CY-2176 added information to Client exception.NTP clock resync.
  • Loading branch information
EarthmanT authored Mar 19, 2020
2 parents a783cc8 + db58b79 commit 9f8fbf4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
10 changes: 9 additions & 1 deletion cloudify_aws/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class AWSResourceBase(object):
'''
AWS base interface
'''

def __init__(self, client, resource_id=None, logger=None):
self.logger = logger or init_cloudify_logger(NullHandler(),
'AWSResourceBase')
Expand Down Expand Up @@ -91,8 +92,15 @@ def make_client_call(self,
res = client_method_args()
except fatal_handled_exceptions as error:
_, _, tb = sys.exc_info()
message = error.message
if isinstance(error, ClientError):
message = error.message + ". If you are positive that you " \
"are using the correct" \
"credentials, verify that your" \
"system clock is in sync with its " \
"NTP server."
raise NonRecoverableError(
str(error.message),
str(message),
causes=[exception_to_error_cause(error, tb)])
else:
if log_response:
Expand Down
4 changes: 2 additions & 2 deletions plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ plugins:

aws:
executor: central_deployment_agent
source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.3.1.zip
source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.3.2.zip
package_name: cloudify-aws-plugin
package_version: '2.3.1'
package_version: '2.3.2'

data_types:

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

setup(
name='cloudify-aws-plugin',
version='2.3.1',
version='2.3.2',
author='Cloudify Platform Ltd.',
author_email='[email protected]',
license='LICENSE',
Expand Down

0 comments on commit 9f8fbf4

Please sign in to comment.