Skip to content
This repository has been archived by the owner on Oct 14, 2020. It is now read-only.

Sync upstream #6

Merged
merged 198 commits into from
Nov 2, 2018
Merged

Sync upstream #6

merged 198 commits into from
Nov 2, 2018

Conversation

mliudev
Copy link

@mliudev mliudev commented Nov 2, 2018

This PR merges in the latest upstream changes and also removes the boto and botocore pins to earlier versions of these apps. These pins prevent user from using the request level mocking decorators since the latest botocore no longer uses requests. However, we plan on using the deprecated decorators which mock at the socket level which is unaffected by the latest boto and botocore. Once getmoto#1907 is merged we can remove our fork of moto completely.

Stephan Huber and others added 30 commits June 13, 2018 16:14
The EC2 endpoint status was overflowing and creating a scroll bar on my screen. It was bugging me so I fixed it via the GitHub web interface. Will test to ensure it builds correctly when I get home from work.
add empty string handle, fix(getmoto#1744)
* start of get_account_authorization_details for iam

* add get_account_authorization_details dynamic template

* remove old commented out template

* Fix flake8 problems and add unit test
* bumping to version 1.3.4

* updating changelog

* fixing generation of implementation coverage
spulec and others added 27 commits October 15, 2018 00:05
…e-strings

Filter event log ids should be strings
Fixes getmoto#1857 Ensures a UserPool Id starts like {region}_
…MultipartUpload

Add support for NoncurrentVersionTransition, NoncurrentVersionExpiration, and AbortIncompleteMultipartUpload actions to S3 lifecycle rules
…n_token_payload

Add extra attributes in token payload
Updated index.rst to fix overflow
…to-list

Don't compare a dict_keys object to a list, since it is always False
Be able to change `enabled` status for cognito-idp users
apigateway is able to filter the result set, returning only usage plans
with the given keyId.

This commit supports filtering the usage plans returned to the user by
filtering the list of usage plans by checking for usage plan keys
A missing user in a cognito user pool has raises a UserNotFoundException,
not a ResourceNotFoundException. This commit corrects the behaviour so
that the correct exception is raised
…tails-test-fix

remove the marker since this is truncated
…_error

Missing users now raise a UserNotFoundException
…_get_usage_plans

Adds keyId support to apigateway get_usage_plans
This is meant to prevent use of moto with the latest botocore since
botocore no longer uses requests for making calls. This change means
that moto can't intercept boto calls and thus tests will call out to the
actual AWS endpoint. However, we are overriding this since we'll use the
deprecated decorators which patch at the socket level and should still
work for testing.

Once moto merges the PR to fix the above issue then we can remove our
fork of moto entirely and just use the latest version.
The latest version upstream is 1.3.6, thus we should specify this
version as the latest upstream version plus our local version
identifier. Previously we used a higher minor version which would
prevent us from pulling in future releases of moto until it reached our
higher version number.
@mliudev
Copy link
Author

mliudev commented Nov 2, 2018

@mliudev mliudev merged commit 15db9cb into master Nov 2, 2018
@mliudev mliudev deleted the sync-upstream branch November 2, 2018 19:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.