IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Test: Fix windows test for SQL data sources (#69137)

Browse Source
This commit is contained in:
Zoltán Bedi 2023-06-21 11:14:05 +02:00 committed by GitHub
parent 15a85686c2
commit aedcd651fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/infra/proxy/proxyutil/proxyutil.go
View File

@ -50,6 +50,9 @@ func SetupTestSecureSocksProxySettings(t *testing.T) *setting.SecureSocksDSProxy
}) })
require.NoError(t, err) require.NoError(t, err)
err = caCertFile.Close()
require.NoError(t, err)
// generate test client cert & key // generate test client cert & key
cert := &x509.Certificate{ cert := &x509.Certificate{
SerialNumber: big.NewInt(2019), SerialNumber: big.NewInt(2019),
@ -77,6 +80,10 @@ func SetupTestSecureSocksProxySettings(t *testing.T) *setting.SecureSocksDSProxy
Bytes: certBytes, Bytes: certBytes,
}) })
require.NoError(t, err) require.NoError(t, err)
err = certFile.Close()
require.NoError(t, err)
clientKey := filepath.Join(tempDir, "client.key") clientKey := filepath.Join(tempDir, "client.key")
// nolint:gosec // nolint:gosec
// The gosec G304 warning can be ignored because all values come from the test // The gosec G304 warning can be ignored because all values come from the test
@ -88,6 +95,9 @@ func SetupTestSecureSocksProxySettings(t *testing.T) *setting.SecureSocksDSProxy
}) })
require.NoError(t, err) require.NoError(t, err)
err = keyFile.Close()
require.NoError(t, err)
return &setting.SecureSocksDSProxySettings{ return &setting.SecureSocksDSProxySettings{
ClientCert: clientCert, ClientCert: clientCert,
ClientKey: clientKey, ClientKey: clientKey,