hyperledger / fabric-private-chaincode

FPC enables Confidential Chaincode Execution for Hyperledger Fabric using Intel SGX.
Apache License 2.0
159 stars 91 forks source link

Upgrade yq from v3.x to v4.x #719

Closed mbrandenburger closed 11 months ago

mbrandenburger commented 1 year ago

Some example scripts still use an older version of yq. We should upgrade this.

Please see here the upgrade guide https://mikefarah.gitbook.io/yq/upgrading-from-v3

A list of files we need to update:

➜  fabric-private-chaincode git:(main) ✗ rg "yq " .
./README.md
273:* yq v3.x (newer versions, v4.x and higher, are currently *not* supported!)

./samples/deployment/test-network/setup.sh
47:yq m -i -a=append ${CORE_PATH} core_ext.yaml
83:  yq w -i ${DOCKER_COMPOSE_TEST_NET} "services.\"$p\".volumes[+]" "${FPC_PATH_HOST}:/opt/gopath/src/github.com/hyperledger/fabric-private-chaincode"
84:  yq w -i ${DOCKER_COMPOSE_TEST_NET} "services.\"$p\".volumes[+]" "${FABRIC_SAMPLES_HOST}/config/core.yaml:/etc/hyperledger/fabric/core.yaml"

./samples/deployment/fabric-smart-client/the-simple-testing-network/env.sh
35:MSP_ID=$(yq r $GATEWAY_CONFIG organizations.${ORG^}.mspid)
36:PEER_ID=$(yq r $GATEWAY_CONFIG organizations.${ORG^}.peers[0])
37:ADDR=$(yq r $GATEWAY_CONFIG peers.\"${PEER_ID}\".url | sed 's/grpcs:\/\///')

./samples/deployment/test-network/update-connection.sh
50:  yq w -i ${CONNECTIONS_PATH} organizations.${org^}.cryptoPath ${ORG_PATH}/msp
51:  yq w -i ${CONNECTIONS_PATH} organizations.${org^}.users.${user}.cert.path "${CERTS[0]}"
52:  yq w -i ${CONNECTIONS_PATH} organizations.${org^}.users.${user}.key.path "${KEYS[0]}"
55:  yq m -i ${CONNECTIONS_PATH} - <<EOF
78:  yq r --printMode pv "${CONNECTIONS_PATH}" peers >> "${tmp_dir}/peers-${org}.yaml"
82:yq m "${tmp_dir}"/peers-*.yaml >> "${tmp_dir}/peers.yaml"
83:yq v "${tmp_dir}/peers.yaml"
89:  yq m -i "${CONNECTIONS_PATH}" "${tmp_dir}/peers.yaml"
90:  yq v "${CONNECTIONS_PATH}"

./samples/deployment/test-network/fabric-samples/test-network-nano-bash/README.md
38:yq -i 'del(.chaincode.externalBuilders) | .chaincode.externalBuilders[0].name = "ccaas_builder" | .chaincode.externalBuilders[0].path = env(PWD) + "/builders/ccaas" | .chaincode.externalBuilders[0].propagateEnvironment[0] = "CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG"' config/core.yaml

./TODO.md
13:- upgrade yq (our old dep explodes alot)
./README.md
276:  GO111MODULE=on go get github.com/mikefarah/yq/v3

./utils/docker/dev_peer_cc-builder/Dockerfile
185:    go get github.com/mikefarah/yq/v3

./utils/docker/base-dev/Dockerfile
89:  && go install github.com/mikefarah/yq/v3@latest
Deepjyoti-Sarmah commented 1 year ago

I would like work on updating yq from v3.x to v4.x