Skip to content
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

Adding support for AWS Secrets Manager #947

Merged
merged 28 commits into from
Jan 8, 2020

Conversation

Emi14
Copy link
Contributor

@Emi14 Emi14 commented Dec 20, 2019

Quorum documentation PR - Consensys/quorum#919

chris-j-h and others added 26 commits October 24, 2019 10:08
…gerDone

AWS Secrets Manager implementation for KeyVault added
…o feature/AWSSecretManager

� Conflicts:
�	cli/cli-api/src/test/java/com/quorum/tessera/cli/keypassresolver/CliKeyPasswordResolverTest.java
�	cli/config-cli/src/main/java/com/quorum/tessera/config/cli/parsers/KeyGenerationParser.java
�	cli/config-cli/src/test/java/com/quorum/tessera/config/cli/OverrideUtilTest.java
�	cli/config-cli/src/test/java/com/quorum/tessera/config/cli/parsers/KeyGenerationParserTest.java
�	config-migration/src/test/java/com/quorum/tessera/config/migration/test/FixtureUtil.java
�	config/src/main/java/com/quorum/tessera/config/JaxbConfigFactory.java
�	config/src/main/java/com/quorum/tessera/config/KeyConfiguration.java
�	config/src/main/java/com/quorum/tessera/config/adapters/KeyDataAdapter.java
�	config/src/test/java/com/quorum/tessera/config/adapters/KeyDataAdapterTest.java
�	key-generation/src/main/java/com/quorum/tessera/key/generation/DefaultKeyGeneratorFactory.java
�	key-generation/src/test/java/com/quorum/tessera/key/generation/KeyGeneratorFactoryTest.java
…Pair.java

Co-Authored-By: chris-j-h <39617426+chris-j-h@users.noreply.github.com>
…Pair.java

Co-Authored-By: chris-j-h <39617426+chris-j-h@users.noreply.github.com>
…hub.com/vgeorgescu/tessera into feature/AWSSecretManager

� Conflicts:
�	tessera-grpc/grpc-service/pom.xml
Krish1979
Krish1979 previously approved these changes Dec 23, 2019
@stale
Copy link

stale bot commented Dec 30, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@melowe
Copy link
Contributor

melowe commented Dec 30, 2019

I've made some changes to the key vault config to facilitate the addition of new implementations by having simple properties associated with the value impl. I'll try and the changes required for AWS support following this.

@stale stale bot removed the status:inactive label Dec 30, 2019
@stale
Copy link

stale bot commented Jan 6, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@chris-j-h
Copy link
Collaborator

Resolving the merge conflicts and making the necessary changes to work with our updated master branch have been made and raised as a separate PR.

Thanks for making this change, this PR will be closed in favour of #955.

@chris-j-h chris-j-h closed this Jan 7, 2020
# Conflicts:
#	cli/config-cli/src/main/java/com/quorum/tessera/config/cli/KeyGenCommand.java
#	cli/config-cli/src/test/java/com/quorum/tessera/config/cli/KeyGenCommandTest.java
#	config/src/main/java/com/quorum/tessera/config/DefaultKeyVaultConfig.java
#	config/src/main/java/com/quorum/tessera/config/KeyConfiguration.java
#	config/src/main/java/com/quorum/tessera/config/KeyVaultConfigConverter.java
#	config/src/main/java/com/quorum/tessera/config/constraints/KeyVaultConfigValidator.java
#	config/src/main/java/com/quorum/tessera/config/constraints/ValidKeyVaultConfig.java
#	config/src/test/java/com/quorum/tessera/config/KeyConfigurationTest.java
#	config/src/test/java/com/quorum/tessera/config/KeyVaultConfigConverterTest.java
#	config/src/test/java/com/quorum/tessera/config/constraints/KeyVaultConfigValidatorTest.java
#	pom.xml
@codecov-io
Copy link

codecov-io commented Jan 8, 2020

Codecov Report

Merging #947 into master will decrease coverage by 0.01%.
The diff coverage is 98.92%.

Impacted file tree graph

@@             Coverage Diff             @@
##             master    #947      +/-   ##
===========================================
- Coverage     99.31%   99.3%   -0.02%     
- Complexity     2088    2146      +58     
===========================================
  Files           320     328       +8     
  Lines          5709    5871     +162     
  Branches        328     345      +17     
===========================================
+ Hits           5670    5830     +160     
  Misses            5       5              
- Partials         34      36       +2
Impacted Files Coverage Δ Complexity Δ
...va/com/quorum/tessera/config/KeyConfiguration.java 100% <ø> (ø) 19 <0> (ø) ⬇️
...m/quorum/tessera/config/DefaultKeyVaultConfig.java 100% <ø> (ø) 6 <0> (ø) ⬇️
...quorum/tessera/config/KeyVaultConfigConverter.java 100% <100%> (ø) 4 <2> (ø) ⬇️
...onfig/constraints/UnsupportedKeyPairValidator.java 97.14% <100%> (+0.47%) 18 <8> (+2) ⬆️
...sera/key/vault/aws/AWSSecretsManagerException.java 100% <100%> (ø) 1 <1> (?)
...a/key/generation/AWSSecretManagerKeyGenerator.java 100% <100%> (ø) 6 <6> (?)
...n/java/com/quorum/tessera/config/KeyVaultType.java 100% <100%> (ø) 1 <0> (ø) ⬇️
...c/main/java/com/quorum/tessera/config/KeyData.java 100% <100%> (ø) 34 <5> (+4) ⬆️
...ra/config/constraints/KeyVaultConfigValidator.java 100% <100%> (ø) 14 <0> (+3) ⬆️
...com/quorum/tessera/config/keypairs/AWSKeyPair.java 100% <100%> (ø) 7 <7> (?)
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1cfd647...82a312c. Read the comment docs.

@Krish1979 Krish1979 merged commit b19411d into Consensys:master Jan 8, 2020
@Krish1979 Krish1979 added enhancement Non-user code enhancements feature User features labels Jan 8, 2020
@Krish1979 Krish1979 added the 0.10.3 0.10.3 label Feb 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.10.3 0.10.3 enhancement Non-user code enhancements feature User features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants