Skip to content

Merge head of master into keyring #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Oct 4, 2019
Merged

Merge head of master into keyring #195

merged 21 commits into from
Oct 4, 2019

Conversation

mattsb42-aws
Copy link
Member

Description of changes:
Merge head of master into keyring

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Check any applicable:

  • Were any files moved? Moving files changes their URL, which breaks all hyperlinks to the files.

johnwalker and others added 18 commits July 15, 2019 11:08
* Added a check for max_age being greater than 0

* Fixed flake8 by adding missing pydocstyle dependency

* Added the dependency to decrypt_oracle as well

* Added test for max_age<=0 ValueError

* Updated test for max_age<=0.0 ValueError

* Added negative test case
…ured (#179)

* Fixed KMS master key provider tests for users who have their default AWS region configured

* created fixture for botocore session with no region set

* add auto-used fixture in KMS master key provider unit tests to test against both with and without default region
Example for using one KMS CMK with an unsigned algorithm
* [issue-190] Creation of regional clients modifies default botocore session's region
@mattsb42-aws mattsb42-aws requested review from lavaleri and a team October 3, 2019 18:48
@mattsb42-aws
Copy link
Member Author

I'm blocking this on #196; I want to get those changes into master first, then I'll merge the updated master into this.

* pylint max-attributes appears to be ratcheted down recently

* remove unnecessary comprehensions

* whitelist some pylint use-constant-test false-positives

* reorganize backwards compatibility test requirements definitions
attrs==19.2.0 removed a deprecated feature that aws-encryption-sdk==1.3.3 depended on.
This reorganization lets us define specific requirements bounds for old versions of aws-encryption-sdk
that will probably continue to be necessary as these old versions age.

* remove unnecessary comprehensions

* add newlines to the end of all requirements files
@mattsb42-aws mattsb42-aws merged commit 998575c into aws:keyring Oct 4, 2019
@mattsb42-aws mattsb42-aws deleted the master-keyring-merge branch October 4, 2019 01:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants