Skip to content

Commit b841751

Browse files
dpereoweidpereowei
authored
Fix: Hardcoded CCaaS cert (#621)
1 parent be5e462 commit b841751

11 files changed

+36
-16
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2645,6 +2645,7 @@ chaincodePackageCCaaS() {
26452645
local CONTAINER_NAME=$7
26462646
local TLS_ENABLED=$8
26472647
local CHANNEL_NAME=$9
2648+
local ORG_DOMAIN=\${10}
26482649
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26492650
26502651
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2656,6 +2657,7 @@ chaincodePackageCCaaS() {
26562657
inputLog "TLS_ENABLED: $TLS_ENABLED"
26572658
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
26582659
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2660+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
26592661
26602662
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
26612663
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2668,7 +2670,7 @@ chaincodePackageCCaaS() {
26682670
26692671
if [ "$TLS_ENABLED" = true ]; then
26702672
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2671-
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"
26722674
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
26732675
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
26742676
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: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,7 +1892,7 @@ installChaincodes() {
18921892
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
18931893
local version="0.0.1"
18941894
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
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"
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"
18961896
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
18971897
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
18981898
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"
@@ -1906,7 +1906,7 @@ installChaincodes() {
19061906
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19071907
local version="0.0.1"
19081908
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
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"
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"
19101910
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19111911
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19121912
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"
@@ -1936,7 +1936,7 @@ installChaincode() {
19361936
if [ "$chaincodeName" = "chaincode1" ]; then
19371937
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19381938
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
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"
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"
19401940
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19411941
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19421942
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"
@@ -1952,7 +1952,7 @@ installChaincode() {
19521952
if [ "$chaincodeName" = "chaincode1" ]; then
19531953
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19541954
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
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"
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"
19561956
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19571957
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19581958
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"
@@ -1988,7 +1988,7 @@ upgradeChaincode() {
19881988
if [ "$chaincodeName" = "chaincode1" ]; then
19891989
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19901990
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
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"
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"
19921992
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19931993
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19941994
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"
@@ -2004,7 +2004,7 @@ upgradeChaincode() {
20042004
if [ "$chaincodeName" = "chaincode1" ]; then
20052005
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
20062006
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
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"
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"
20082008
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
20092009
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
20102010
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"
@@ -2829,6 +2829,7 @@ chaincodePackageCCaaS() {
28292829
local CONTAINER_NAME=$7
28302830
local TLS_ENABLED=$8
28312831
local CHANNEL_NAME=$9
2832+
local ORG_DOMAIN=\${10}
28322833
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
28332834
28342835
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2840,6 +2841,7 @@ chaincodePackageCCaaS() {
28402841
inputLog "TLS_ENABLED: $TLS_ENABLED"
28412842
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
28422843
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2844+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
28432845
28442846
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
28452847
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2852,7 +2854,7 @@ chaincodePackageCCaaS() {
28522854
28532855
if [ "$TLS_ENABLED" = true ]; then
28542856
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2855-
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"
28562858
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
28572859
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
28582860
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3600,6 +3600,7 @@ chaincodePackageCCaaS() {
36003600
local CONTAINER_NAME=$7
36013601
local TLS_ENABLED=$8
36023602
local CHANNEL_NAME=$9
3603+
local ORG_DOMAIN=\${10}
36033604
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
36043605
36053606
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -3611,6 +3612,7 @@ chaincodePackageCCaaS() {
36113612
inputLog "TLS_ENABLED: $TLS_ENABLED"
36123613
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
36133614
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
3615+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
36143616
36153617
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
36163618
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -3623,7 +3625,7 @@ chaincodePackageCCaaS() {
36233625
36243626
if [ "$TLS_ENABLED" = true ]; then
36253627
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
3626-
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"
36273629
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
36283630
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
36293631
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5556,6 +5556,7 @@ chaincodePackageCCaaS() {
55565556
local CONTAINER_NAME=$7
55575557
local TLS_ENABLED=$8
55585558
local CHANNEL_NAME=$9
5559+
local ORG_DOMAIN=\${10}
55595560
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
55605561
55615562
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -5567,6 +5568,7 @@ chaincodePackageCCaaS() {
55675568
inputLog "TLS_ENABLED: $TLS_ENABLED"
55685569
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
55695570
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
5571+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
55705572
55715573
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
55725574
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -5579,7 +5581,7 @@ chaincodePackageCCaaS() {
55795581
55805582
if [ "$TLS_ENABLED" = true ]; then
55815583
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
5582-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
5584+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
55835585
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
55845586
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
55855587
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6151,6 +6151,7 @@ chaincodePackageCCaaS() {
61516151
local CONTAINER_NAME=$7
61526152
local TLS_ENABLED=$8
61536153
local CHANNEL_NAME=$9
6154+
local ORG_DOMAIN=\${10}
61546155
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
61556156
61566157
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -6162,6 +6163,7 @@ chaincodePackageCCaaS() {
61626163
inputLog "TLS_ENABLED: $TLS_ENABLED"
61636164
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
61646165
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
6166+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
61656167
61666168
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
61676169
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -6174,7 +6176,7 @@ chaincodePackageCCaaS() {
61746176
61756177
if [ "$TLS_ENABLED" = true ]; then
61766178
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
6177-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
6179+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
61786180
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
61796181
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
61806182
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3039,6 +3039,7 @@ chaincodePackageCCaaS() {
30393039
local CONTAINER_NAME=$7
30403040
local TLS_ENABLED=$8
30413041
local CHANNEL_NAME=$9
3042+
local ORG_DOMAIN=\${10}
30423043
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
30433044
30443045
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -3050,6 +3051,7 @@ chaincodePackageCCaaS() {
30503051
inputLog "TLS_ENABLED: $TLS_ENABLED"
30513052
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
30523053
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
3054+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
30533055
30543056
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
30553057
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -3062,7 +3064,7 @@ chaincodePackageCCaaS() {
30623064
30633065
if [ "$TLS_ENABLED" = true ]; then
30643066
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
3065-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
3067+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
30663068
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
30673069
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
30683070
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3064,6 +3064,7 @@ chaincodePackageCCaaS() {
30643064
local CONTAINER_NAME=$7
30653065
local TLS_ENABLED=$8
30663066
local CHANNEL_NAME=$9
3067+
local ORG_DOMAIN=\${10}
30673068
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
30683069
30693070
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -3075,6 +3076,7 @@ chaincodePackageCCaaS() {
30753076
inputLog "TLS_ENABLED: $TLS_ENABLED"
30763077
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
30773078
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
3079+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
30783080
30793081
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
30803082
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -3087,7 +3089,7 @@ chaincodePackageCCaaS() {
30873089
30883090
if [ "$TLS_ENABLED" = true ]; then
30893091
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
3090-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
3092+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
30913093
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
30923094
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
30933095
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎src/setup-docker/templates/fabric-docker/commands-generated/chaincode-install-v2.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ printHeadline "Packaging chaincode '<%= chaincode.name %>'" "U1F60E"
1919
"<%= instance.port %>" <% -%>
2020
"<%= instance.containerName %>" <% -%>
2121
"<%= global.tls %>" <% -%>
22-
"<%= chaincode.channel.name %>"
22+
"<%= chaincode.channel.name %>" <% -%>
23+
"<%= instance.orgDomain %>"
2324
<% }) -%>
2425
<% } else { -%>
2526
chaincodeBuild <% -%>

‎src/setup-docker/templates/fabric-docker/scripts/chaincode-functions-v2.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ chaincodePackageCCaaS() {
112112
local CONTAINER_NAME=$7
113113
local TLS_ENABLED=$8
114114
local CHANNEL_NAME=$9
115+
local ORG_DOMAIN=${10}
115116
local CHAINCODE_LABEL="${CHANNEL_NAME}_${CHAINCODE_NAME}_$CHAINCODE_VERSION"
116117

117118
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -123,6 +124,7 @@ chaincodePackageCCaaS() {
123124
inputLog "TLS_ENABLED: $TLS_ENABLED"
124125
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
125126
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
127+
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
126128

127129

128130
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
@@ -136,7 +138,7 @@ chaincodePackageCCaaS() {
136138

137139
if [ "$TLS_ENABLED" = true ]; then
138140
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
139-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
141+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
140142
local ROOT_CERT=$(awk '{printf "%s\\n", $0}' "$PEER_TLS_PATH/ca.crt")
141143
local SERVER_CERT=$(awk '{printf "%s\\n", $0}' "$PEER_TLS_PATH/server.crt")
142144
local SERVER_KEY=$(awk '{printf "%s\\n", $0}' "$PEER_TLS_PATH/server.key")

0 commit comments

Comments
 (0)