[ FAB-8730 ] hyphen breaks fabric-samples

The jq script which performs the config update in scripts/run-fabric.sh fails if the orderer name contains a hyphen. It requires modifying the way in which jq interpolates shell variables. Change-Id: Ie4de9459cb17693465613d6efd78b3d98575bbb2 Signed-off-by: rennman <[email protected]>
hyperledger · Mar 12, 2018 · e4d7760 · e4d7760
1 parent 2bbb0a8
commit e4d7760
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/fabric-ca/scripts/run-fabric.sh b/fabric-ca/scripts/run-fabric.sh
@@ -238,8 +238,8 @@ function createConfigUpdatePayloadWithCRL {
    jq .data.data[0].payload.data.config config_block.json > config.json
 
    # Update crl in the config json
-   crl=$(cat $CORE_PEER_MSPCONFIGPATH/crls/crl*.pem | base64 | tr -d '\n')
-   cat config.json | jq '.channel_group.groups.Application.groups.'"${ORG}"'.values.MSP.value.config.revocation_list = ["'"${crl}"'"]' > updated_config.json
+   CRL=$(cat $CORE_PEER_MSPCONFIGPATH/crls/crl*.pem | base64 | tr -d '\n')
+   cat config.json | jq --arg org "$ORG" --arg crl "$CRL" '.channel_group.groups.Application.groups[$org].values.MSP.value.config.revocation_list = [$crl]' > updated_config.json
 
    # Create the config diff protobuf
    curl -X POST --data-binary @config.json $CTLURL/protolator/encode/common.Config > config.pb
@@ -266,6 +266,7 @@ function finish {
    else
       logr "Tests did not complete successfully; see $RUN_LOGFILE for more details"
       touch /$RUN_FAIL_FILE
+      exit 1
    fi
 }