Improve certificates loading

Kelvin-M · Kelvin-M · commit 0fb957fe7fc7 · 2020-11-06T11:59:23.000+01:00
diff --git a/chaincode/main.go b/chaincode/main.go
@@ -234,17 +234,17 @@ func main() {
 	logger.SetLevel(logrus.DebugLevel)
 	logger.Infof("Load TLS certificates")
 
-	key, err := ioutil.ReadFile("/var/hyperledger/tls/client/pair/tls.key")
+	key, err := ioutil.ReadFile(os.Getenv("TLS_KEY_FILE"))
 	if err != nil {
 		logger.Errorf("Cannot read key file: %s", err)
 	}
 
-	cert, err := ioutil.ReadFile("/var/hyperledger/tls/client/pair/tls.crt")
+	cert, err := ioutil.ReadFile(os.Getenv("TLS_CERT_FILE"))
 	if err != nil {
 		logger.Errorf("Cannot read cert file: %s", err)
 	}
 
-	ca, err := ioutil.ReadFile("/var/hyperledger/tls/client/cert/cacert.pem")
+	ca, err := ioutil.ReadFile(os.Getenv("TLS_ROOTCERT_FILE"))
 	if err != nil {
 		logger.Errorf("Cannot read ca cert file: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -234,17 +234,17 @@ func main() {`
`234`	`234`	`logger.SetLevel(logrus.DebugLevel)`
`235`	`235`	`logger.Infof("Load TLS certificates")`
`236`	`236`
`237`		`- key, err := ioutil.ReadFile("/var/hyperledger/tls/client/pair/tls.key")`
	`237`	`+ key, err := ioutil.ReadFile(os.Getenv("TLS_KEY_FILE"))`
`238`	`238`	`if err != nil {`
`239`	`239`	`logger.Errorf("Cannot read key file: %s", err)`
`240`	`240`	`}`
`241`	`241`
`242`		`- cert, err := ioutil.ReadFile("/var/hyperledger/tls/client/pair/tls.crt")`
	`242`	`+ cert, err := ioutil.ReadFile(os.Getenv("TLS_CERT_FILE"))`
`243`	`243`	`if err != nil {`
`244`	`244`	`logger.Errorf("Cannot read cert file: %s", err)`
`245`	`245`	`}`
`246`	`246`
`247`		`- ca, err := ioutil.ReadFile("/var/hyperledger/tls/client/cert/cacert.pem")`
	`247`	`+ ca, err := ioutil.ReadFile(os.Getenv("TLS_ROOTCERT_FILE"))`
`248`	`248`	`if err != nil {`
`249`	`249`	`logger.Errorf("Cannot read ca cert file: %s", err)`
`250`	`250`	`}`