fix: download JRE for keytool dependency and allow generation of pfx keys #152

leninmehedy · 2024-03-11T04:52:59Z

Description

This pull request changes the following:

feat: allow fetching keytool dependency automatically for pfx keys
feat: allow node keys to generate pfx keys
doc: refresh README with latest console output
use semver package for version parsing instead of "reinventing the wheel".
Added more test coverage

It installs JRE at ~/.solo/bin/jre and keytool will be available at: ~/.solo/bin/jre/bin/keytool

Related Issues

Closes Download JRE if user needs to generate PFX keys #114

TODO

Install JRE only when user wants to create pfx keys
Translate the bash script into javascript code so that keytool is invoked using ShellRunner.run(...)

github-actions · 2024-03-11T04:57:36Z

Unit Test Results

1 files ± 0 16 suites +2 1m 7s ⏱️ +42s
109 tests +18 109 ✅ +18 0 💤 ±0 0 ❌ ±0
134 runs +36 134 ✅ +36 0 💤 ±0 0 ❌ ±0

Results for commit 9234e60. ± Comparison against base commit 54efab3.

This pull request removes 9 and adds 27 tests. Note that renamed tests count towards both.

Helpers compareVersion should fail with major version lower than target ‑ Helpers compareVersion should fail with major version lower than target
Helpers compareVersion should fail with minor version lower than target ‑ Helpers compareVersion should fail with minor version lower than target
Helpers compareVersion should succeed with a later version ‑ Helpers compareVersion should succeed with a later version
Helpers compareVersion should succeed with major version higher than target ‑ Helpers compareVersion should succeed with major version higher than target
Helpers compareVersion should succeed with minor version higher than target ‑ Helpers compareVersion should succeed with minor version higher than target
Helpers compareVersion should succeed with patch higher than target ‑ Helpers compareVersion should succeed with patch higher than target
Helpers compareVersion should succeed with same version ‑ Helpers compareVersion should succeed with same version
Helpers should parse release tag into major, minor and patch numbers ‑ Helpers should parse release tag into major, minor and patch numbers
Helpers should throw error in parsing release tag ‑ Helpers should throw error in parsing release tag

HelmDependencyManager should return helm version ‑ HelmDependencyManager should return helm version
Helpers should be able to clone array ‑ Helpers should be able to clone array
Helpers should be able to determine root-image based on Hedera platform version ‑ Helpers should be able to determine root-image based on Hedera platform version
Helpers should be able to load version from package json ‑ Helpers should be able to load version from package json
Helpers should be able to parse node ID ‑ Helpers should be able to parse node ID
KeyManager should generate pfx keys ‑ KeyManager should generate pfx keys
Keytool should run keytool -certreq [darwin] ‑ Keytool should run keytool -certreq [darwin]
Keytool should run keytool -certreq [linux] ‑ Keytool should run keytool -certreq [linux]
Keytool should run keytool -certreq [windows] ‑ Keytool should run keytool -certreq [windows]
Keytool should run keytool -exportcert [darwin] ‑ Keytool should run keytool -exportcert [darwin]
…

♻️ This comment has been updated with latest results.

github-actions · 2024-03-11T06:44:53Z

E2E Test Results

53 tests +6 53 ✅ +6 6m 2s ⏱️ + 1m 35s
7 suites ±0 0 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit 9234e60. ± Comparison against base commit 54efab3.

This pull request removes 10 and adds 16 tests. Note that renamed tests count towards both.

AccountCommand Bootstrap network for test should cleanup previous deployment ‑ AccountCommand Bootstrap network for test should cleanup previous deployment
AccountCommand Bootstrap network for test should succeed with network deploy ‑ AccountCommand Bootstrap network for test should succeed with network deploy
AccountCommand Bootstrap network for test should succeed with node setup command ‑ AccountCommand Bootstrap network for test should succeed with node setup command
AccountCommand Bootstrap network for test should succeed with node start command ‑ AccountCommand Bootstrap network for test should succeed with node start command
NodeCommand Bootstrap network for test should cleanup previous deployment ‑ NodeCommand Bootstrap network for test should cleanup previous deployment
NodeCommand Bootstrap network for test should succeed with network deploy ‑ NodeCommand Bootstrap network for test should succeed with network deploy
NodeCommand Bootstrap network for test should succeed with node setup command ‑ NodeCommand Bootstrap network for test should succeed with node setup command
NodeCommand Bootstrap network for test should succeed with node start command ‑ NodeCommand Bootstrap network for test should succeed with node start command
NodeCommand Node should start successfully [release v0.47.0-alpha.0, keyFormat: pem] Account creation should succeed ‑ NodeCommand Node should start successfully [release v0.47.0-alpha.0, keyFormat: pem] Account creation should succeed
NodeCommand Node should start successfully [release v0.47.0-alpha.0, keyFormat: pem] Balance query should succeed ‑ NodeCommand Node should start successfully [release v0.47.0-alpha.0, keyFormat: pem] Balance query should succeed

AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should cleanup previous deployment ‑ AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should cleanup previous deployment
AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with network deploy ‑ AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with network deploy
AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node setup command ‑ AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node setup command
AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node start command ‑ AccountCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node start command
NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should cleanup previous deployment ‑ NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should cleanup previous deployment
NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with network deploy ‑ NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with network deploy
NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node setup command ‑ NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node setup command
NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node start command ‑ NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pem] should succeed with node start command
NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pfx] should cleanup previous deployment ‑ NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pfx] should cleanup previous deployment
NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pfx] should succeed with network deploy ‑ NodeCommand Bootstrap network for test [release v0.47.0-alpha.0, keyFormat: pfx] should succeed with network deploy
…

♻️ This comment has been updated with latest results.

codecov · 2024-03-11T19:57:31Z

Codecov Report

Attention: Patch coverage is 89.79592% with 35 lines in your changes are missing coverage. Please review.

Project coverage is 69.13%. Comparing base (54efab3) to head (9234e60).

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #152      +/-   ##
==========================================
+ Coverage   65.88%   69.13%   +3.24%     
==========================================
  Files          30       32       +2     
  Lines        2864     3068     +204     
  Branches      488      473      -15     
==========================================
+ Hits         1887     2121     +234     
+ Misses        977      947      -30

Files	Coverage Δ
src/core/constants.mjs	`93.24% <100.00%> (+0.48%)`	⬆️
src/core/helm.mjs	`90.90% <100.00%> (+0.43%)`	⬆️
src/core/helpers.mjs	`97.29% <100.00%> (+7.71%)`	⬆️
src/core/keytool.mjs	`100.00% <100.00%> (ø)`
src/core/templates.mjs	`77.94% <100.00%> (+1.01%)`	⬆️
test/test_util.js	`87.14% <100.00%> (+0.18%)`	⬆️
version.mjs	`100.00% <100.00%> (ø)`
...re/dependency_managers/helm_dependency_manager.mjs	`91.52% <92.30%> (+0.45%)`	⬆️
src/core/key_manager.mjs	`90.95% <97.77%> (+1.84%)`	⬆️
src/core/package_downloader.mjs	`92.30% <86.66%> (-0.47%)`	⬇️
... and 2 more

codacy-production · 2024-03-11T19:57:32Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
✅ +3.44% (target: -1.00%)	✅ 90.04%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`54efab3`)	2406	1594	66.25%
Head commit (`9234e60`)	2567 (+161)	1789 (+195)	69.69% (+3.44%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#152)	281	253	90.04%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

_{You may notice some variations in coverage metrics with the latest Coverage engine update. For more details, visit the documentation}

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> # Conflicts: # package-lock.json # package.json # src/commands/node.mjs # src/core/constants.mjs # src/core/helm.mjs # test/e2e/commands/01_node.test.mjs

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

## [0.22.1](v0.22.0...v0.22.1) (2024-03-22) ### Bug Fixes * download JRE for keytool dependency and allow generation of pfx keys ([#152](#152)) ([1d3dcf4](1d3dcf4)) * refactor account initialization and mirror node setup from node command ([#159](#159)) ([b1d1e2d](b1d1e2d)) * solo should use a fixed FST chart version ([#139](#139)) ([b0d5f8b](b0d5f8b)) * update HAProxy UP check to use HAProxy Data Plane API ([#173](#173)) ([a27d1d2](a27d1d2)) * use FST chart version v0.23.0 ([#170](#170)) ([54efab3](54efab3))

swirlds-automation · 2024-03-22T15:09:17Z

🎉 This PR is included in version 0.22.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

leninmehedy requested review from a team as code owners March 11, 2024 04:52

leninmehedy requested review from JeffreyDallas and jeromy-cannon March 11, 2024 04:53

leninmehedy changed the title ~~feat: download JRE for keytool dependency and generate pfx keys~~ feat: download JRE for keytool dependency and allow generation of pfx keys Mar 11, 2024

leninmehedy force-pushed the 114-install-jre branch from 7cc1640 to 137fac5 Compare March 11, 2024 06:28

jeromy-cannon previously approved these changes Mar 11, 2024

View reviewed changes

leninmehedy dismissed jeromy-cannon’s stale review via 0fbff75 March 11, 2024 19:40

leninmehedy force-pushed the 114-install-jre branch from 9493ead to 7ec3ccb Compare March 11, 2024 22:27

leninmehedy requested review from jeromy-cannon and nathanklick March 11, 2024 23:26

JeffreyDallas previously approved these changes Mar 12, 2024

View reviewed changes

leninmehedy changed the title ~~feat: download JRE for keytool dependency and allow generation of pfx keys~~ fix: download JRE for keytool dependency and allow generation of pfx keys Mar 12, 2024

leninmehedy mentioned this pull request Mar 13, 2024

fix: refactor account initialization and mirror node setup from node command #159

Merged

leninmehedy marked this pull request as draft March 15, 2024 10:43

leninmehedy added 11 commits March 16, 2024 05:47

fix: use semver package to for semver parsing and comparison

9cc47e7

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

feat: install JRE for keytool dependency

0ea3478

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix: allow node keys to generate pfx keys

d033707

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

feat: allow generating pfx keys

b9e2b56

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix: uninstallation of jre

e672a1a

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

docs: update README

ee1dda7

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

test: fix test errors

f4e8191

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix: remove logs before node start

0a5cfb2

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

test: improve test coverage

cc62591

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix: add windows support for helm and keytool shell runner

75bcf46

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix: generate pfx files

2afa12c

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix: update node command to install keytool before generating pfx files

5b45feb

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

leninmehedy dismissed JeffreyDallas’s stale review via cc62591 March 17, 2024 22:22

leninmehedy force-pushed the 114-install-jre branch from 7ec3ccb to cc62591 Compare March 17, 2024 22:22

leninmehedy added 6 commits March 18, 2024 09:25

move script to old location

2416cbe

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

cleanup and add test

4020527

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

no need to check for keytool on init

a4eec80

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix uninstallation of keytool

fdb5e6c

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix codacy errors

603d069

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

fix:split private and public pfx key file generation

e078eef

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

jeromy-cannon previously approved these changes Mar 18, 2024

View reviewed changes

jeromy-cannon assigned leninmehedy Mar 18, 2024

Merge branch 'main' into 114-install-jre

b099529

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> # Conflicts: # package-lock.json # package.json # src/commands/node.mjs # src/core/constants.mjs # src/core/helm.mjs # test/e2e/commands/01_node.test.mjs

leninmehedy dismissed jeromy-cannon’s stale review via b099529 March 19, 2024 21:10

test: run node cmd test for different version and keyformat

587b88d

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

leninmehedy force-pushed the 114-install-jre branch from 48fdad0 to 587b88d Compare March 19, 2024 22:24

leninmehedy marked this pull request as ready for review March 19, 2024 22:26

leninmehedy force-pushed the 114-install-jre branch from 237cbc9 to eed3849 Compare March 20, 2024 08:17

leninmehedy mentioned this pull request Mar 20, 2024

Remove helm and java from CI pipeline setup #161

Closed

leninmehedy force-pushed the 114-install-jre branch from eed3849 to 29b06ed Compare March 20, 2024 20:53

test: store sample keys in test data folder instead of generating

9234e60

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>

leninmehedy force-pushed the 114-install-jre branch from 29b06ed to 9234e60 Compare March 20, 2024 21:00

leninmehedy requested a review from jeromy-cannon March 20, 2024 21:10

jeromy-cannon approved these changes Mar 20, 2024

View reviewed changes

leninmehedy merged commit 1d3dcf4 into main Mar 20, 2024
19 checks passed

leninmehedy deleted the 114-install-jre branch March 20, 2024 23:12

swirlds-automation added the released label Mar 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: download JRE for keytool dependency and allow generation of pfx keys #152

fix: download JRE for keytool dependency and allow generation of pfx keys #152

leninmehedy commented Mar 11, 2024 •

edited

Loading

github-actions bot commented Mar 11, 2024 •

edited

Loading

github-actions bot commented Mar 11, 2024 •

edited

Loading

codecov bot commented Mar 11, 2024 •

edited

Loading

codacy-production bot commented Mar 11, 2024 •

edited

Loading

swirlds-automation commented Mar 22, 2024

fix: download JRE for keytool dependency and allow generation of pfx keys #152

fix: download JRE for keytool dependency and allow generation of pfx keys #152

Conversation

leninmehedy commented Mar 11, 2024 • edited Loading

Description

Related Issues

TODO

github-actions bot commented Mar 11, 2024 • edited Loading

Unit Test Results

github-actions bot commented Mar 11, 2024 • edited Loading

E2E Test Results

codecov bot commented Mar 11, 2024 • edited Loading

Codecov Report

codacy-production bot commented Mar 11, 2024 • edited Loading

Coverage summary from Codacy

See diff coverage on Codacy

See your quality gate settings Change summary preferences

swirlds-automation commented Mar 22, 2024

leninmehedy commented Mar 11, 2024 •

edited

Loading

github-actions bot commented Mar 11, 2024 •

edited

Loading

github-actions bot commented Mar 11, 2024 •

edited

Loading

codecov bot commented Mar 11, 2024 •

edited

Loading

codacy-production bot commented Mar 11, 2024 •

edited

Loading