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

feat: Upgrade to latest ffresty with mTLS #1290

Merged
merged 8 commits into from
May 4, 2023

Conversation

EnriqueL8
Copy link
Contributor

@EnriqueL8 EnriqueL8 commented Apr 24, 2023

Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Copy link
Contributor

@peterbroadhurst peterbroadhurst left a comment

Choose a reason for hiding this comment

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

Changes look great @EnriqueL8

If you wouldn't mind including the corresponding tests for coverage as well before we merge.

Not sure why the code coverage bot didn't run on your branch to help with that 🤔

Toggling code coverage in your vscode for each of the affected packages should help though.

client, err := ffresty.New(ctx, localConfig)

if err != nil {
return nil, err
Copy link
Contributor

Choose a reason for hiding this comment

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

Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
@EnriqueL8
Copy link
Contributor Author

@peterbroadhurst let's hold off on this one until I get the wsclient changes in

Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
@@ -74,6 +74,8 @@ const (
func (e *Ethereum) InitConfig(config config.Section) {
e.ethconnectConf = config.SubSection(EthconnectConfigKey)
wsclient.InitConfig(e.ethconnectConf)
ffresty.InitConfig(e.ethconnectConf)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this now needed @EnriqueL8?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So we hide that underneath the init config from the wsclient since wsClient.InitConfig calls ffresty.InitConfig. So if we ever want to separate the configs for the ws and ffresty we would need to call it here, but since they are the same today I can remove this line

Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
@codecov-commenter
Copy link

codecov-commenter commented May 4, 2023

Codecov Report

Merging #1290 (0a86f5b) into main (0350d38) will decrease coverage by 0.06%.
The diff coverage is 72.72%.

@@             Coverage Diff             @@
##              main    #1290      +/-   ##
===========================================
- Coverage   100.00%   99.94%   -0.06%     
===========================================
  Files          308      308              
  Lines        20692    20721      +29     
===========================================
+ Hits         20692    20709      +17     
- Misses           0        6       +6     
- Partials         0        6       +6     
Impacted Files Coverage Δ
internal/blockchain/ethereum/config.go 100.00% <ø> (ø)
internal/dataexchange/ffdx/ffdx.go 98.31% <50.00%> (-1.69%) ⬇️
internal/events/webhooks/webhooks.go 99.08% <50.00%> (-0.92%) ⬇️
internal/blockchain/ethereum/ethereum.go 99.68% <66.66%> (-0.32%) ⬇️
internal/blockchain/fabric/fabric.go 99.63% <66.66%> (-0.37%) ⬇️
internal/tokens/fftokens/fftokens.go 99.61% <66.66%> (-0.39%) ⬇️
internal/apiserver/server.go 100.00% <100.00%> (ø)
internal/blockchain/ethereum/address_resolver.go 100.00% <100.00%> (ø)
internal/sharedstorage/ipfs/ipfs.go 100.00% <100.00%> (ø)
internal/tokens/fftokens/config.go 100.00% <100.00%> (ø)

Copy link
Contributor

@peterbroadhurst peterbroadhurst left a comment

Choose a reason for hiding this comment

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

Thanks @EnriqueL8

@peterbroadhurst peterbroadhurst merged commit ab53a43 into hyperledger:main May 4, 2023
@peterbroadhurst peterbroadhurst deleted the update_ffresty branch May 4, 2023 15:26
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.

3 participants