alihan/rqlite-distributed-sql
1
0
Fork 0
mirror of https://github.com/rqlite/rqlite.git synced 2022-10-30 02:37:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support directory path for temp test x509 files

Browse Source
This commit is contained in:
Philip O'Toole
2020-09-24 20:29:15 -04:00
parent d9227fd5c5
commit 406dbbbf4b
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tcp/transport_test.go
View File

@@ -41,9 +41,9 @@ func Test_TransportDial(t *testing.T) {
}
func Test_NewTLSTransport(t *testing.T) {
c := x509.CertFile()
c := x509.CertFile("")
defer os.Remove(c)
k := x509.KeyFile()
k := x509.KeyFile("")
defer os.Remove(k)
if NewTLSTransport(c, k, true) == nil {
@@ -52,9 +52,9 @@ func Test_NewTLSTransport(t *testing.T) {
}
func Test_TLSTransportOpenClose(t *testing.T) {
c := x509.CertFile()
c := x509.CertFile("")
defer os.Remove(c)
k := x509.KeyFile()
k := x509.KeyFile("")
defer os.Remove(k)
tn := NewTLSTransport(c, k, true)

31
testdata/x509/resources.go vendored
View File

@@ -4,32 +4,35 @@ import (
"io/ioutil"
)
// CertFile returns the path to a temporary file containing a cert.
// It is up to the caller to remove the file when finished.
func CertFile() string {
return mustWriteToFile(cert)
// CertFile returns the path to a temporary file, in directory dir, containing a cert.
// It is up to the caller to remove the file when finished. If dir is the empty string
// then the default directory for temporary files is used.
func CertFile(dir string) string {
return mustWriteToFile(dir, cert)
}
// KeyFile returns the path to a temporary file containing a key.
// It is up to the caller to remove the file when finished.
func KeyFile() string {
return mustWriteToFile(key)
// KeyFile returns the path to a temporary file, in directory dir, containing a key.
// It is up to the caller to remove the file when finished.If dir is the empty string
// then the default directory for temporary files is used.
func KeyFile(dir string) string {
return mustWriteToFile(dir, key)
}
func mustWriteToFile(content string) string {
func mustWriteToFile(dir, content string) string {
b := []byte(content)
path := mustTempFile()
path := mustTempFile(dir)
if err := ioutil.WriteFile(path, b, 0600); err != nil {
panic(err.Error())
}
return path
}
// mustTempFile returns a path to a temporary file. It is up to the
// caller to remove the file once it is no longer needed.
func mustTempFile() string {
tmpfile, err := ioutil.TempFile("", "rqlite-tls-test")
// mustTempFile returns a path to a temporary file in directory dir. It is up to the
// caller to remove the file once it is no longer needed. If dir is the empty
// string, then the default directory for temporary files is used.
func mustTempFile(dir string) string {
tmpfile, err := ioutil.TempFile(dir, "rqlite-tls-test")
if err != nil {
panic(err.Error())
}