Merge "[FAB-16310] Vendor Go dependencies in all samples"

hyperledger · Aug 15, 2019 · 72ecf45 · 72ecf45
2 parents 82d886b + ce154e0
commit 72ecf45
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 2 deletions.
diff --git a/first-network/byfn.sh b/first-network/byfn.sh
@@ -182,6 +182,14 @@ function networkUp() {
     sleep 14
   fi
 
+  if [ "${NO_CHAINCODE}" != "true" ]; then
+    echo Vendoring Go dependencies ...
+    pushd ../chaincode/abstore/go
+    GO111MODULE=on go mod vendor
+    popd
+    echo Finished vendoring Go dependencies
+  fi
+
   # now run the end to end script
   docker exec cli scripts/script.sh $CHANNEL_NAME $CLI_DELAY $CC_SRC_LANGUAGE $CLI_TIMEOUT $VERBOSE $NO_CHAINCODE
   if [ $? -ne 0 ]; then

diff --git a/high-throughput/README.md b/high-throughput/README.md
@@ -120,6 +120,11 @@ and run some invocations are provided below.
 4. Open a new terminal window and enter the CLI container using `docker exec -it cli bash`, all operations on the network will happen within
    this container from now on.
 
+### Vendor the chaincode dependencies
+1. Outside of the CLI container, change into the chaincode directory, e.g. `cd ~/fabric-samples/high-throughput/chaincode`
+2. Vendor the Go dependencies by running the following command: `GO111MODULE=on go mod vendor`
+3. The chaincode directory will now contain a `vendor` directory.
+
 ### Install and define the chaincode
 1. Once you're in the CLI container run `cd scripts` to enter the `scripts` folder
 2. Set-up the environment variables by running `source setclienv.sh`

diff --git a/interest_rate_swaps/chaincode/go.mod b/interest_rate_swaps/chaincode/go.mod
@@ -0,0 +1,18 @@
+module github.com/hyperledger/fabric-samples/interest_rate_swaps/chaincode
+
+go 1.12
+
+require (
+	github.com/Knetic/govaluate v3.0.0+incompatible // indirect
+	github.com/Shopify/sarama v1.22.1 // indirect
+	github.com/hashicorp/go-version v1.2.0 // indirect
+	github.com/hyperledger/fabric v2.0.0-alpha.0.20190624224950-f2b8fef8859c+incompatible
+	github.com/hyperledger/fabric-amcl v0.0.0-20181230093703-5ccba6eab8d6 // indirect
+	github.com/miekg/pkcs11 v1.0.2 // indirect
+	github.com/onsi/ginkgo v1.8.0 // indirect
+	github.com/onsi/gomega v1.5.0 // indirect
+	github.com/spf13/viper v1.4.0 // indirect
+	github.com/sykesm/zap-logfmt v0.0.2 // indirect
+	golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect
+	google.golang.org/grpc v1.21.1 // indirect
+)
diff --git a/interest_rate_swaps/chaincode/go.sum b/interest_rate_swaps/chaincode/go.sum
diff --git a/interest_rate_swaps/network/.gitignore b/interest_rate_swaps/network/.gitignore
@@ -0,0 +1,2 @@
+channel-artifacts/
+crypto-config/
diff --git a/interest_rate_swaps/network/network.sh b/interest_rate_swaps/network/network.sh
@@ -113,6 +113,11 @@ function networkUp() {
     echo "ERROR !!!! Unable to start network"
     exit 1
   fi
+  echo Vendoring Go dependencies ...
+  pushd ../chaincode
+  GO111MODULE=on go mod vendor
+  popd
+  echo Finished vendoring Go dependencies
   # now run the end to end script
   docker exec cli scripts/script.sh
   if [ $? -ne 0 ]; then

diff --git a/off_chain_data/startFabric.sh b/off_chain_data/startFabric.sh
@@ -11,10 +11,14 @@ set -e pipefail
 # don't rewrite paths for Windows Git Bash users
 export MSYS_NO_PATHCONV=1
 starttime=$(date +%s)
-CC_SRC_LANGUAGE=${1:-"golang"}
-CC_SRC_LANGUAGE=`echo "$CC_SRC_LANGUAGE" | tr [:upper:] [:lower:]`
+CC_SRC_LANGUAGE=golang
 CC_RUNTIME_LANGUAGE=golang
 CC_SRC_PATH=github.com/hyperledger/fabric-samples/chaincode/marbles02/go
+echo Vendoring Go dependencies ...
+pushd ../chaincode/marbles02/go
+GO111MODULE=on go mod vendor
+popd
+echo Finished vendoring Go dependencies
 
 # clean the keystore
 rm -rf ./hfc-key-store