From 78e2714496ba32206dad1a0584d38591514e2faa Mon Sep 17 00:00:00 2001 From: gruebel Date: Fri, 1 Nov 2019 07:14:03 +0100 Subject: [PATCH] black format --- IMPLEMENTATION_COVERAGE.md | 10 +++- moto/iam/exceptions.py | 6 +-- moto/iam/models.py | 99 +++++++++++++++++++++++++------------- moto/iam/responses.py | 37 +++++++++----- tests/test_iam/test_iam.py | 83 ++++++++++++++++---------------- 5 files changed, 143 insertions(+), 92 deletions(-) diff --git a/IMPLEMENTATION_COVERAGE.md b/IMPLEMENTATION_COVERAGE.md index 1b9896661..2e5f055b9 100644 --- a/IMPLEMENTATION_COVERAGE.md +++ b/IMPLEMENTATION_COVERAGE.md @@ -2362,7 +2362,7 @@ - [ ] send_ssh_public_key ## ecr -30% implemented +27% implemented - [ ] batch_check_layer_availability - [X] batch_delete_image - [X] batch_get_image @@ -2371,6 +2371,7 @@ - [ ] delete_lifecycle_policy - [X] delete_repository - [ ] delete_repository_policy +- [ ] describe_image_scan_findings - [X] describe_images - [X] describe_repositories - [ ] get_authorization_token @@ -2382,9 +2383,11 @@ - [X] list_images - [ ] list_tags_for_resource - [X] put_image +- [ ] put_image_scanning_configuration - [ ] put_image_tag_mutability - [ ] put_lifecycle_policy - [ ] set_repository_policy +- [ ] start_image_scan - [ ] start_lifecycle_policy_preview - [ ] tag_resource - [ ] untag_resource @@ -2475,6 +2478,7 @@ - [ ] authorize_cache_security_group_ingress - [ ] batch_apply_update_action - [ ] batch_stop_update_action +- [ ] complete_migration - [ ] copy_snapshot - [ ] create_cache_cluster - [ ] create_cache_parameter_group @@ -2516,6 +2520,7 @@ - [ ] remove_tags_from_resource - [ ] reset_cache_parameter_group - [ ] revoke_cache_security_group_ingress +- [ ] start_migration - [ ] test_failover ## elasticbeanstalk @@ -3262,7 +3267,8 @@ - [ ] describe_events ## iam -61% implemented- [ ] add_client_id_to_open_id_connect_provider +62% implemented +- [ ] add_client_id_to_open_id_connect_provider - [X] add_role_to_instance_profile - [X] add_user_to_group - [X] attach_group_policy diff --git a/moto/iam/exceptions.py b/moto/iam/exceptions.py index 3fc084152..1d0f3ca01 100644 --- a/moto/iam/exceptions.py +++ b/moto/iam/exceptions.py @@ -127,13 +127,11 @@ class InvalidInput(RESTError): code = 400 def __init__(self, message): - super(InvalidInput, self).__init__( - 'InvalidInput', message) + super(InvalidInput, self).__init__("InvalidInput", message) class NoSuchEntity(RESTError): code = 404 def __init__(self, message): - super(NoSuchEntity, self).__init__( - 'NoSuchEntity', message) + super(NoSuchEntity, self).__init__("NoSuchEntity", message) diff --git a/moto/iam/models.py b/moto/iam/models.py index c032e1e24..2a76e9126 100644 --- a/moto/iam/models.py +++ b/moto/iam/models.py @@ -654,12 +654,22 @@ class User(BaseModel): class AccountPasswordPolicy(BaseModel): - - def __init__(self, allow_change_password, hard_expiry, max_password_age, minimum_password_length, - password_reuse_prevention, require_lowercase_characters, require_numbers, - require_symbols, require_uppercase_characters): + def __init__( + self, + allow_change_password, + hard_expiry, + max_password_age, + minimum_password_length, + password_reuse_prevention, + require_lowercase_characters, + require_numbers, + require_symbols, + require_uppercase_characters, + ): self._errors = [] - self._validate(max_password_age, minimum_password_length, password_reuse_prevention) + self._validate( + max_password_age, minimum_password_length, password_reuse_prevention + ) self.allow_users_to_change_password = allow_change_password self.hard_expiry = hard_expiry @@ -675,35 +685,41 @@ class AccountPasswordPolicy(BaseModel): def expire_passwords(self): return True if self.max_password_age and self.max_password_age > 0 else False - def _validate(self, max_password_age, minimum_password_length, password_reuse_prevention): + def _validate( + self, max_password_age, minimum_password_length, password_reuse_prevention + ): if minimum_password_length > 128: - self._errors.append(self._format_error( - key='minimumPasswordLength', - value=minimum_password_length, - constraint='Member must have value less than or equal to 128' - )) + self._errors.append( + self._format_error( + key="minimumPasswordLength", + value=minimum_password_length, + constraint="Member must have value less than or equal to 128", + ) + ) if password_reuse_prevention and password_reuse_prevention > 24: - self._errors.append(self._format_error( - key='passwordReusePrevention', - value=password_reuse_prevention, - constraint='Member must have value less than or equal to 24' - )) + self._errors.append( + self._format_error( + key="passwordReusePrevention", + value=password_reuse_prevention, + constraint="Member must have value less than or equal to 24", + ) + ) if max_password_age and max_password_age > 1095: - self._errors.append(self._format_error( - key='maxPasswordAge', - value=max_password_age, - constraint='Member must have value less than or equal to 1095' - )) + self._errors.append( + self._format_error( + key="maxPasswordAge", + value=max_password_age, + constraint="Member must have value less than or equal to 1095", + ) + ) self._raise_errors() def _format_error(self, key, value, constraint): return 'Value "{value}" at "{key}" failed to satisfy constraint: {constraint}'.format( - constraint=constraint, - key=key, - value=value, + constraint=constraint, key=key, value=value, ) def _raise_errors(self): @@ -713,9 +729,11 @@ class AccountPasswordPolicy(BaseModel): errors = "; ".join(self._errors) self._errors = [] # reset collected errors - raise ValidationError('{count} validation error{plural} detected: {errors}'.format( - count=count, plural=plural, errors=errors, - )) + raise ValidationError( + "{count} validation error{plural} detected: {errors}".format( + count=count, plural=plural, errors=errors, + ) + ) class IAMBackend(BaseBackend): @@ -1657,9 +1675,18 @@ class IAMBackend(BaseBackend): def list_open_id_connect_providers(self): return list(self.open_id_providers.keys()) - def update_account_password_policy(self, allow_change_password, hard_expiry, max_password_age, minimum_password_length, - password_reuse_prevention, require_lowercase_characters, require_numbers, - require_symbols, require_uppercase_characters): + def update_account_password_policy( + self, + allow_change_password, + hard_expiry, + max_password_age, + minimum_password_length, + password_reuse_prevention, + require_lowercase_characters, + require_numbers, + require_symbols, + require_uppercase_characters, + ): self.account_password_policy = AccountPasswordPolicy( allow_change_password, hard_expiry, @@ -1669,18 +1696,24 @@ class IAMBackend(BaseBackend): require_lowercase_characters, require_numbers, require_symbols, - require_uppercase_characters + require_uppercase_characters, ) def get_account_password_policy(self): if not self.account_password_policy: - raise NoSuchEntity('The Password Policy with domain name {} cannot be found.'.format(ACCOUNT_ID)) + raise NoSuchEntity( + "The Password Policy with domain name {} cannot be found.".format( + ACCOUNT_ID + ) + ) return self.account_password_policy def delete_account_password_policy(self): if not self.account_password_policy: - raise NoSuchEntity('The account policy with name PasswordPolicy cannot be found.') + raise NoSuchEntity( + "The account policy with name PasswordPolicy cannot be found." + ) self.account_password_policy = None diff --git a/moto/iam/responses.py b/moto/iam/responses.py index 27fbea990..08fe13dc5 100644 --- a/moto/iam/responses.py +++ b/moto/iam/responses.py @@ -839,20 +839,33 @@ class IamResponse(BaseResponse): return template.render(open_id_provider_arns=open_id_provider_arns) def update_account_password_policy(self): - allow_change_password = self._get_bool_param('AllowUsersToChangePassword', False) - hard_expiry = self._get_bool_param('HardExpiry') - max_password_age = self._get_int_param('MaxPasswordAge') - minimum_password_length = self._get_int_param('MinimumPasswordLength', 6) - password_reuse_prevention = self._get_int_param('PasswordReusePrevention') - require_lowercase_characters = self._get_bool_param('RequireLowercaseCharacters', False) - require_numbers = self._get_bool_param('RequireNumbers', False) - require_symbols = self._get_bool_param('RequireSymbols', False) - require_uppercase_characters = self._get_bool_param('RequireUppercaseCharacters', False) + allow_change_password = self._get_bool_param( + "AllowUsersToChangePassword", False + ) + hard_expiry = self._get_bool_param("HardExpiry") + max_password_age = self._get_int_param("MaxPasswordAge") + minimum_password_length = self._get_int_param("MinimumPasswordLength", 6) + password_reuse_prevention = self._get_int_param("PasswordReusePrevention") + require_lowercase_characters = self._get_bool_param( + "RequireLowercaseCharacters", False + ) + require_numbers = self._get_bool_param("RequireNumbers", False) + require_symbols = self._get_bool_param("RequireSymbols", False) + require_uppercase_characters = self._get_bool_param( + "RequireUppercaseCharacters", False + ) iam_backend.update_account_password_policy( - allow_change_password, hard_expiry, max_password_age, minimum_password_length, - password_reuse_prevention, require_lowercase_characters, require_numbers, - require_symbols, require_uppercase_characters) + allow_change_password, + hard_expiry, + max_password_age, + minimum_password_length, + password_reuse_prevention, + require_lowercase_characters, + require_numbers, + require_symbols, + require_uppercase_characters, + ) template = self.response_template(UPDATE_ACCOUNT_PASSWORD_POLICY_TEMPLATE) return template.render() diff --git a/tests/test_iam/test_iam.py b/tests/test_iam/test_iam.py index a05ec8624..e0d8fdb82 100644 --- a/tests/test_iam/test_iam.py +++ b/tests/test_iam/test_iam.py @@ -2199,45 +2199,45 @@ def test_list_open_id_connect_providers(): @mock_iam def test_update_account_password_policy(): - client = boto3.client('iam', region_name='us-east-1') + client = boto3.client("iam", region_name="us-east-1") client.update_account_password_policy() response = client.get_account_password_policy() - response['PasswordPolicy'].should.equal({ - 'AllowUsersToChangePassword': False, - 'ExpirePasswords': False, - 'MinimumPasswordLength': 6, - 'RequireLowercaseCharacters': False, - 'RequireNumbers': False, - 'RequireSymbols': False, - 'RequireUppercaseCharacters': False - }) + response["PasswordPolicy"].should.equal( + { + "AllowUsersToChangePassword": False, + "ExpirePasswords": False, + "MinimumPasswordLength": 6, + "RequireLowercaseCharacters": False, + "RequireNumbers": False, + "RequireSymbols": False, + "RequireUppercaseCharacters": False, + } + ) @mock_iam def test_update_account_password_policy_errors(): - client = boto3.client('iam', region_name='us-east-1') + client = boto3.client("iam", region_name="us-east-1") client.update_account_password_policy.when.called_with( - MaxPasswordAge=1096, - MinimumPasswordLength=129, - PasswordReusePrevention=25 + MaxPasswordAge=1096, MinimumPasswordLength=129, PasswordReusePrevention=25 ).should.throw( ClientError, - '3 validation errors detected: ' + "3 validation errors detected: " 'Value "129" at "minimumPasswordLength" failed to satisfy constraint: ' - 'Member must have value less than or equal to 128; ' + "Member must have value less than or equal to 128; " 'Value "25" at "passwordReusePrevention" failed to satisfy constraint: ' - 'Member must have value less than or equal to 24; ' + "Member must have value less than or equal to 24; " 'Value "1096" at "maxPasswordAge" failed to satisfy constraint: ' - 'Member must have value less than or equal to 1095' + "Member must have value less than or equal to 1095", ) @mock_iam def test_get_account_password_policy(): - client = boto3.client('iam', region_name='us-east-1') + client = boto3.client("iam", region_name="us-east-1") client.update_account_password_policy( AllowUsersToChangePassword=True, HardExpiry=True, @@ -2247,57 +2247,58 @@ def test_get_account_password_policy(): RequireLowercaseCharacters=True, RequireNumbers=True, RequireSymbols=True, - RequireUppercaseCharacters=True + RequireUppercaseCharacters=True, ) response = client.get_account_password_policy() - - response['PasswordPolicy'].should.equal({ - 'AllowUsersToChangePassword': True, - 'ExpirePasswords': True, - 'HardExpiry': True, - 'MaxPasswordAge': 60, - 'MinimumPasswordLength': 10, - 'PasswordReusePrevention': 3, - 'RequireLowercaseCharacters': True, - 'RequireNumbers': True, - 'RequireSymbols': True, - 'RequireUppercaseCharacters': True - }) + + response["PasswordPolicy"].should.equal( + { + "AllowUsersToChangePassword": True, + "ExpirePasswords": True, + "HardExpiry": True, + "MaxPasswordAge": 60, + "MinimumPasswordLength": 10, + "PasswordReusePrevention": 3, + "RequireLowercaseCharacters": True, + "RequireNumbers": True, + "RequireSymbols": True, + "RequireUppercaseCharacters": True, + } + ) @mock_iam def test_get_account_password_policy_errors(): - client = boto3.client('iam', region_name='us-east-1') + client = boto3.client("iam", region_name="us-east-1") client.get_account_password_policy.when.called_with().should.throw( ClientError, - 'The Password Policy with domain name 123456789012 cannot be found.' + "The Password Policy with domain name 123456789012 cannot be found.", ) @mock_iam def test_delete_account_password_policy(): - client = boto3.client('iam', region_name='us-east-1') + client = boto3.client("iam", region_name="us-east-1") client.update_account_password_policy() response = client.get_account_password_policy() - response.should.have.key('PasswordPolicy').which.should.be.a(dict) + response.should.have.key("PasswordPolicy").which.should.be.a(dict) client.delete_account_password_policy() client.get_account_password_policy.when.called_with().should.throw( ClientError, - 'The Password Policy with domain name 123456789012 cannot be found.' + "The Password Policy with domain name 123456789012 cannot be found.", ) @mock_iam def test_delete_account_password_policy_errors(): - client = boto3.client('iam', region_name='us-east-1') + client = boto3.client("iam", region_name="us-east-1") client.delete_account_password_policy.when.called_with().should.throw( - ClientError, - 'The account policy with name PasswordPolicy cannot be found.' + ClientError, "The account policy with name PasswordPolicy cannot be found." )