Skip to content

Keyring reorg #198

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 5 commits into from
Oct 7, 2019
Merged

Keyring reorg #198

merged 5 commits into from
Oct 7, 2019

Conversation

mattsb42-aws
Copy link
Member

Description of changes:

This change reorganizes the keyring namespace and test structure.

The namespace structure changes from:

keyring
|-
    base
    multi_keyring
    raw_keyring

to:

keyrings
|-
    base
    multi
    raw

This was both to match the grammar of the existing namespaces (key_providers, materials_managers, caches, etc) and to reduce repetition in the namespace path (ex: aws_encryption_sdk.keyring.raw_keyring.RawAesKeyring becomes aws_encryption_sdk.keyrings.raw.RawAesKeyring).

The test reorg is in the spirit of #100, which I actually will have a follow-up PR to implement, to make working with the tests more intuitive.

There are also some minor changes to work around pylint getting upset about each keyring module needing to import the same things.

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.

Because we provide multiple implementations of certain types of things (keyrings, etc),
this was triggering pylint due to them all needing to import the same types in order to function.
@mattsb42-aws mattsb42-aws requested review from lavaleri and a team October 4, 2019 17:20
Copy link
Contributor

@lavaleri lavaleri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mattsb42-aws mattsb42-aws merged commit 2d4b2c4 into aws:keyring Oct 7, 2019
@mattsb42-aws mattsb42-aws deleted the keyring-reorg branch October 7, 2019 21:35
@mattsb42-aws mattsb42-aws added this to the keyrings milestone Feb 21, 2020
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.

2 participants