fix(dast): ccp, sshconfig missing #3705
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -85,7 +84,7 @@ jobs: | |||
| run: jq '.plugins += [{ "packageName":"@hyperledger/cactus-plugin-keychain-memory","type":"org.hyperledger.cactus.plugin_import_type.LOCAL","action":"org.hyperledger.cactus.plugin_import_action.INSTALL","options":{"packageSrc":"/home/runner/work/cacti/cacti/packages/cactus-plugin-keychain-memory/","instanceId":"0daacd05-d1cd-4eab-9332-4ad1aff4b909","keychainId":"d29d728e-eaa0-4e2d-b187-d132242b0d9a"}}]' .config.json > .config2.json && mv .config2.json .config.json | |||
|
|
|||
| - name: Install Fabric connector into the API server | |||
| run: jq '.plugins += [{ "packageName":"@hyperledger/cactus-plugin-ledger-connector-fabric", "type":"org.hyperledger.cactus.plugin_import_type.LOCAL", "action":"org.hyperledger.cactus.plugin_import_action.INSTALL", "options":{ "packageSrc":"/home/runner/work/cacti/cacti/packages/cactus-plugin-ledger-connector-fabric/", "instanceId":"some-unique-fabric-connector-instance-id", "peerBinary":"/fabric-samples/bin/peer", "connectionProfile":"{}", "dockerBinary":"usr/local/bin/docker","cliContainerEnv":{"CORE_PEER_LOCALMSPID":"Org1MSP","CORE_PEER_ADDRESS":"peer0.org1.example.com:7051","CORE_PEER_MSPCONFIGPATH":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp","CORE_PEER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt","ORDERER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem"},"discoveryOptions":{"enabled":true,"asLocalhost":true}}}] ' .config.json > .config2.json && mv .config2.json .config.json | |||
| run: jq '.plugins += [{ "packageName":"@hyperledger/cactus-plugin-ledger-connector-fabric", "type":"org.hyperledger.cactus.plugin_import_type.LOCAL", "action":"org.hyperledger.cactus.plugin_import_action.INSTALL", "options":{ "packageSrc":"/home/runner/work/cacti/cacti/packages/cactus-plugin-ledger-connector-fabric/", "instanceId":"some-unique-fabric-connector-instance-id", "peerBinary":"/fabric-samples/bin/peer", "connectionProfile":"{}", "connectionProfile":"{}", "dockerBinary":"usr/local/bin/docker","cliContainerEnv":{"CORE_PEER_LOCALMSPID":"Org1MSP","CORE_PEER_ADDRESS":"peer0.org1.example.com:7051","CORE_PEER_MSPCONFIGPATH":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp","CORE_PEER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt","ORDERER_TLS_ROOTCERT_FILE":"/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem"},"discoveryOptions":{"enabled":true,"asLocalhost":true}}}] ' .config.json > .config2.json && mv .config2.json .config.json | |||
There was a problem hiding this comment.
Again, there should be NO changes to this piece of code (That is the objective of the task)
raynatopedrajeta
force-pushed
the
raynatopedrajeta/issue3671
branch
3 times, most recently
from
85013e4 to
4048f3e
Compare
raynatopedrajeta
force-pushed
the
raynatopedrajeta/issue3671
branch
26 times, most recently
from
3bee9e8 to
9de9c66
Compare
raynatopedrajeta
force-pushed
the
raynatopedrajeta/issue3671
branch
8 times, most recently
from
956d7f7 to
5ba0d22
Compare
raynatopedrajeta
requested review from
petermetz,
takeutak,
izuru0,
VRamakrishna,
sandeepnRES and
outSH
as code owners
jagpreetsinghsasan
requested changes
Jan 13, 2025
| echo "Private Key:" | ||
| cat private_key.pem | ||
|
|
||
| - run: jq '.expressJwtOptions.secret = "-----BEGIN PUBLIC KEY-----\n$(cat public_key.pem)\n-----END PUBLIC KEY-----" | |
There was a problem hiding this comment.
The public key is generated with those tags by default, please double check
| } | ||
| if (this.sshDebugOn) { | ||
| this.sshConfig = this.enableSshDebugLogs(this.sshConfig); | ||
| // throw new Error("Cannot instantiate Fabric connector without SSH config"); |
There was a problem hiding this comment.
Before this comment please add this
TODO: Temporarily commenting this code so that we do not have breaking changes, will be fixed by ISSUE_NUM
| this.sshConfig = this.enableSshDebugLogs(this.sshConfig); | ||
| // throw new Error("Cannot instantiate Fabric connector without SSH config"); | ||
| this.sshConfig = {}; | ||
| console.log("The check for sshConfig has been temporarily removed"); |
There was a problem hiding this comment.
Please remove this
| on: | ||
| push: | ||
| branches: [main, dev] | ||
|
|
||
There was a problem hiding this comment.
Please remove these new lines
There was a problem hiding this comment.
Hello @jagpreetsinghsasan ,
I've compared this per line and no changes on my end. Not sure why these empty lines are tagged as changes.
Any suggestions for this?
Thank you!
Rayn
Primary Changes ---------------- 1. Fix the issue on plugin-ledger-connector-fabric that throws an error when there is no sshConfig available. Fixes hyperledger-cacti#3671 Signed-off-by: raynato.c.pedrajeta <raynato.c.pedrajeta@accenture.com>
raynatopedrajeta
force-pushed
the
raynatopedrajeta/issue3671
branch
from
5ba0d22 to
612559d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Primary Changes
throws an error when there is no sshConfig available.
Fixes #3671
Pull Request Requirements
upstream/mainbranch and squashed into single commit to help maintainers review it more efficient and to avoid spaghetti git commit graphs that obfuscate which commit did exactly what change, when and, why.-sflag when usinggit commitcommand. You may refer to this link for more information.Character Limit
A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.