Skip to content

Commit 41095c0

Browse files
OsamaRab3OsamaRab3
committed
fix lint error
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent a921b44 commit 41095c0

11 files changed

+189
-300
lines changed

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2585,6 +2585,7 @@ chaincodePackageCCaaS() {
25852585
local CONTAINER_NAME=$7
25862586
local TLS_ENABLED=$8
25872587
local CHANNEL_NAME=$9
2588+
local ORG_DOMAIN=\${10}
25882589
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25892590
25902591
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2596,6 +2597,7 @@ chaincodePackageCCaaS() {
25962597
inputLog "TLS_ENABLED: $TLS_ENABLED"
25972598
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
25982599
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2600+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
25992601
26002602
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
26012603
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2608,7 +2610,7 @@ chaincodePackageCCaaS() {
26082610
26092611
if [ "$TLS_ENABLED" = true ]; then
26102612
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2611-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
2613+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
26122614
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
26132615
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
26142616
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,7 @@ installChannels() {
17931793
17941794
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
17951795
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
1796+
17961797
}
17971798
17981799
installChaincodes() {
@@ -2644,6 +2645,7 @@ chaincodePackageCCaaS() {
26442645
local CONTAINER_NAME=$7
26452646
local TLS_ENABLED=$8
26462647
local CHANNEL_NAME=$9
2648+
local ORG_DOMAIN=\${10}
26472649
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26482650
26492651
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2655,6 +2657,7 @@ chaincodePackageCCaaS() {
26552657
inputLog "TLS_ENABLED: $TLS_ENABLED"
26562658
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
26572659
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2660+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
26582661
26592662
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
26602663
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2667,7 +2670,7 @@ chaincodePackageCCaaS() {
26672670
26682671
if [ "$TLS_ENABLED" = true ]; then
26692672
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2670-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
2673+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
26712674
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
26722675
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
26732676
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,12 +1678,21 @@ chaincodeInvoke() {
16781678
peer_certs="$1"
16791679
peer_certs="\${peer_certs//peer0.org1.example.com/crypto/peers/peer0.org1.example.com/tls/ca.crt}"
16801680
1681+
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
1682+
local ca_cert=""
1683+
16811684
if [ "$2" = "my-channel1" ]; then
16821685
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
16831686
fi
16841687
if [ "$2" = "my-channel2" ]; then
16851688
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
16861689
fi
1690+
1691+
if [ -z "$ca_cert" ]; then
1692+
echo "Error: Channel '$2' not found or is not associated with an orderer group."
1693+
exit 1
1694+
fi
1695+
16871696
peerChaincodeInvokeTls "$cli" "$peer_addresses" "$2" "$3" "$4" "$5" "$peer_certs" "$ca_cert"
16881697
}
16891698
@@ -1725,14 +1734,20 @@ chaincodeQuery() {
17251734
exit 1
17261735
fi
17271736
1728-
if [ "$channel_name" = "my-channel1" ]; then
1737+
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
1738+
local ca_cert=""
1739+
1740+
if [ "$2" = "my-channel1" ]; then
17291741
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
17301742
fi
1731-
1732-
if [ "$channel_name" = "my-channel2" ]; then
1743+
if [ "$2" = "my-channel2" ]; then
17331744
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
17341745
fi
17351746
1747+
if [ -z "$ca_cert" ]; then
1748+
echo "Error: Channel '$2' not found or is not associated with an orderer group."
1749+
exit 1
1750+
fi
17361751
peerChaincodeQueryTls "$cli" "$peer_address" "$channel_name" "$chaincode_name" "$command" "$transient" "$peer_cert" "$ca_cert"
17371752
17381753
}
@@ -1877,7 +1892,7 @@ installChaincodes() {
18771892
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
18781893
local version="0.0.1"
18791894
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1880-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1"
1895+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1" "org1.example.com"
18811896
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
18821897
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
18831898
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel1_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1"
@@ -1891,7 +1906,7 @@ installChaincodes() {
18911906
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
18921907
local version="0.0.1"
18931908
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1894-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2"
1909+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2" "org1.example.com"
18951910
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
18961911
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
18971912
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel2_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1"
@@ -1921,7 +1936,7 @@ installChaincode() {
19211936
if [ "$chaincodeName" = "chaincode1" ]; then
19221937
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19231938
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1924-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1"
1939+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1" "org1.example.com"
19251940
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19261941
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19271942
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel1_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1"
@@ -1937,7 +1952,7 @@ installChaincode() {
19371952
if [ "$chaincodeName" = "chaincode1" ]; then
19381953
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19391954
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1940-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2"
1955+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2" "org1.example.com"
19411956
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19421957
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19431958
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel2_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1"
@@ -1973,7 +1988,7 @@ upgradeChaincode() {
19731988
if [ "$chaincodeName" = "chaincode1" ]; then
19741989
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19751990
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1976-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1"
1991+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1" "org1.example.com"
19771992
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19781993
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19791994
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel1_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1"
@@ -1989,7 +2004,7 @@ upgradeChaincode() {
19892004
if [ "$chaincodeName" = "chaincode1" ]; then
19902005
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19912006
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1992-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2"
2007+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2" "org1.example.com"
19932008
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19942009
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19952010
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel2_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1"
@@ -2814,6 +2829,7 @@ chaincodePackageCCaaS() {
28142829
local CONTAINER_NAME=$7
28152830
local TLS_ENABLED=$8
28162831
local CHANNEL_NAME=$9
2832+
local ORG_DOMAIN=\${10}
28172833
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
28182834
28192835
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2825,6 +2841,7 @@ chaincodePackageCCaaS() {
28252841
inputLog "TLS_ENABLED: $TLS_ENABLED"
28262842
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
28272843
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2844+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
28282845
28292846
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
28302847
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2837,7 +2854,7 @@ chaincodePackageCCaaS() {
28372854
28382855
if [ "$TLS_ENABLED" = true ]; then
28392856
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2840-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
2857+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
28412858
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
28422859
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
28432860
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2533,6 +2533,7 @@ installChannels() {
25332533
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
25342534
printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
25352535
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
2536+
25362537
}
25372538
25382539
installChaincodes() {
@@ -3599,6 +3600,7 @@ chaincodePackageCCaaS() {
35993600
local CONTAINER_NAME=$7
36003601
local TLS_ENABLED=$8
36013602
local CHANNEL_NAME=$9
3603+
local ORG_DOMAIN=\${10}
36023604
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
36033605
36043606
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -3610,6 +3612,7 @@ chaincodePackageCCaaS() {
36103612
inputLog "TLS_ENABLED: $TLS_ENABLED"
36113613
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
36123614
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
3615+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
36133616
36143617
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
36153618
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -3622,7 +3625,7 @@ chaincodePackageCCaaS() {
36223625
36233626
if [ "$TLS_ENABLED" = true ]; then
36243627
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
3625-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
3628+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
36263629
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
36273630
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
36283631
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ hooks:
8383
# changes MaxMessageCount to 1
8484
postGenerate: "perl -i -pe 's/MaxMessageCount: 10/MaxMessageCount: 1/g' \\"./fablo-target/fabric-config/configtx.yaml\\""
8585
postStart: "echo 'Network started' && docker ps --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}' > ./fablo-target/container-list-$(date +%Y%m%d_%H%M%S).log 2>&1 && echo 'Container list saved into fablo-target directory'"
86-
8786
"
8887
`;
8988

@@ -3689,15 +3688,24 @@ chaincodeInvoke() {
36893688
peer_certs="\${peer_certs//peer0.org2.example.com/crypto/peers/peer0.org2.example.com/tls/ca.crt}"
36903689
peer_certs="\${peer_certs//peer1.org2.example.com/crypto/peers/peer1.org2.example.com/tls/ca.crt}"
36913690
3691+
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
3692+
local ca_cert=""
3693+
36923694
if [ "$2" = "my-channel1" ]; then
36933695
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
36943696
fi
36953697
if [ "$2" = "my-channel2" ]; then
36963698
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
36973699
fi
36983700
if [ "$2" = "my-channel3" ]; then
3699-
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
3701+
ca_cert="crypto-orderer/tlsca.orderer2.com-cert.pem"
37003702
fi
3703+
3704+
if [ -z "$ca_cert" ]; then
3705+
echo "Error: Channel '$2' not found or is not associated with an orderer group."
3706+
exit 1
3707+
fi
3708+
37013709
peerChaincodeInvokeTls "$cli" "$peer_addresses" "$2" "$3" "$4" "$5" "$peer_certs" "$ca_cert"
37023710
}
37033711
@@ -3760,18 +3768,23 @@ chaincodeQuery() {
37603768
exit 1
37613769
fi
37623770
3763-
if [ "$channel_name" = "my-channel1" ]; then
3764-
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
3765-
fi
3771+
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
3772+
local ca_cert=""
37663773
3767-
if [ "$channel_name" = "my-channel2" ]; then
3774+
if [ "$2" = "my-channel1" ]; then
37683775
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
37693776
fi
3770-
3771-
if [ "$channel_name" = "my-channel3" ]; then
3777+
if [ "$2" = "my-channel2" ]; then
37723778
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
37733779
fi
3780+
if [ "$2" = "my-channel3" ]; then
3781+
ca_cert="crypto-orderer/tlsca.orderer2.com-cert.pem"
3782+
fi
37743783
3784+
if [ -z "$ca_cert" ]; then
3785+
echo "Error: Channel '$2' not found or is not associated with an orderer group."
3786+
exit 1
3787+
fi
37753788
peerChaincodeQueryTls "$cli" "$peer_address" "$channel_name" "$chaincode_name" "$command" "$transient" "$peer_cert" "$ca_cert"
37763789
37773790
}
@@ -4125,6 +4138,9 @@ installChannels() {
41254138
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7081' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
41264139
printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
41274140
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7082' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
4141+
4142+
echo "Restarting global Explorer: explorer.example.com"
4143+
docker restart explorer.example.com || true
41284144
}
41294145
41304146
installChaincodes() {
@@ -5541,6 +5557,7 @@ chaincodePackageCCaaS() {
55415557
local CONTAINER_NAME=$7
55425558
local TLS_ENABLED=$8
55435559
local CHANNEL_NAME=$9
5560+
local ORG_DOMAIN=\${10}
55445561
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
55455562
55465563
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -5552,6 +5569,7 @@ chaincodePackageCCaaS() {
55525569
inputLog "TLS_ENABLED: $TLS_ENABLED"
55535570
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
55545571
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
5572+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
55555573
55565574
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
55575575
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -5564,7 +5582,7 @@ chaincodePackageCCaaS() {
55645582
55655583
if [ "$TLS_ENABLED" = true ]; then
55665584
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
5567-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
5585+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
55685586
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
55695587
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
55705588
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

0 commit comments

Comments
 (0)