testhelper: Convert `GenerateTestCerts()` to use `t.Cleanup()`

Convert `GenerateTestCerts()` to use `t.Cleanup()` instead of returning
a cleanup functions. While at it, rename the function to
`GenerateCerts()` -- it's clear it's about testing given that it's part
of the `testhelper` package anyway.

4 files changed, 12 insertions, 14 deletions

diff --git a/internal/gitaly/server/server_factory_test.go b/internal/gitaly/server/server_factory_test.go
index a6ed061fd..78ef98747 100644
--- a/internal/gitaly/server/server_factory_test.go
+++ b/internal/gitaly/server/server_factory_test.go
@@ -91,8 +91,7 @@ func TestGitalyServerFactory(t *testing.T) {
 	})
 
 	t.Run("secure", func(t *testing.T) {
-		certFile, keyFile, remove := testhelper.GenerateTestCerts(t)
-		t.Cleanup(remove)
+		certFile, keyFile := testhelper.GenerateCerts(t)
 
 		cfg := testcfg.Build(t, testcfg.WithBase(config.Cfg{TLS: config.TLS{
 			CertPath: certFile,
diff --git a/internal/gitaly/service/repository/fork_test.go b/internal/gitaly/service/repository/fork_test.go
index 039857f86..558a157a8 100644
--- a/internal/gitaly/service/repository/fork_test.go
+++ b/internal/gitaly/service/repository/fork_test.go
@@ -170,7 +170,7 @@ func TestFailedCreateForkRequestDueToExistingTarget(t *testing.T) {
 }
 
 func injectCustomCATestCerts(t *testing.T) (*x509.CertPool, testhelper.Cleanup) {
-	certFile, keyFile, removeCerts := testhelper.GenerateTestCerts(t)
+	certFile, keyFile := testhelper.GenerateCerts(t)
 
 	oldTLSConfig := config.Config.TLS
 
@@ -181,7 +181,6 @@ func injectCustomCATestCerts(t *testing.T) (*x509.CertPool, testhelper.Cleanup)
 	cleanup := func() {
 		config.Config.TLS = oldTLSConfig
 		revertEnv()
-		removeCerts()
 	}
 
 	caPEMBytes, err := ioutil.ReadFile(certFile)
diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go
index e28561f08..40cc7d741 100644
--- a/internal/praefect/server_factory_test.go
+++ b/internal/praefect/server_factory_test.go
@@ -67,8 +67,7 @@ func TestServerFactory(t *testing.T) {
 	gitalyAddr, err := starter.ComposeEndpoint(gitalyListener.Addr().Network(), gitalyListener.Addr().String())
 	require.NoError(t, err)
 
-	certFile, keyFile, remove := testhelper.GenerateTestCerts(t)
-	defer remove()
+	certFile, keyFile := testhelper.GenerateCerts(t)
 
 	conf := config.Config{
 		TLS: gconfig.TLS{
diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go
index cb576d678..83ae16d0c 100644
--- a/internal/testhelper/testhelper.go
+++ b/internal/testhelper/testhelper.go
@@ -331,9 +331,9 @@ func ModifyEnvironment(t testing.TB, key string, value string) func() {
 	}
 }
 
-// GenerateTestCerts creates a certificate that can be used to establish TLS protected TCP connection.
+// GenerateCerts creates a certificate that can be used to establish TLS protected TCP connection.
 // It returns paths to the file with the certificate and its private key.
-func GenerateTestCerts(t *testing.T) (string, string, Cleanup) {
+func GenerateCerts(t *testing.T) (string, string) {
 	t.Helper()
 
 	rootCA := &x509.Certificate{
@@ -366,6 +366,9 @@ func GenerateTestCerts(t *testing.T) (string, string, Cleanup) {
 	certFile, err := ioutil.TempFile(testDirectory, "")
 	require.NoError(t, err)
 	defer MustClose(t, certFile)
+	t.Cleanup(func() {
+		require.NoError(t, os.Remove(certFile.Name()))
+	})
 
 	// create chained PEM file with CA and entity cert
 	for _, cert := range [][]byte{entityCert, caCert} {
@@ -380,6 +383,9 @@ func GenerateTestCerts(t *testing.T) (string, string, Cleanup) {
 	keyFile, err := ioutil.TempFile(testDirectory, "")
 	require.NoError(t, err)
 	defer MustClose(t, keyFile)
+	t.Cleanup(func() {
+		require.NoError(t, os.Remove(keyFile.Name()))
+	})
 
 	entityKeyBytes, err := x509.MarshalECPrivateKey(entityKey)
 	require.NoError(t, err)
@@ -391,10 +397,5 @@ func GenerateTestCerts(t *testing.T) (string, string, Cleanup) {
 		}),
 	)
 
-	cleanup := func() {
-		require.NoError(t, os.Remove(certFile.Name()))
-		require.NoError(t, os.Remove(keyFile.Name()))
-	}
-
-	return certFile.Name(), keyFile.Name(), cleanup
+	return certFile.Name(), keyFile.Name()
 }