sql: remove unused code (#82527)

.github/CODEOWNERS

@@ -145,7 +145,6 @@
 /pkg/tsdb/legacydata/ @grafana/backend-platform
 /pkg/tsdb/opentsdb/ @grafana/backend-platform
 /pkg/tsdb/sqleng/ @grafana/partner-datasources @grafana/oss-big-tent
-/pkg/tsdb/sqleng/proxyutil @grafana/hosted-grafana-team
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform
 

pkg/tsdb/sqleng/proxyutil/proxy_test_util.go

@@ -1,111 +0,0 @@
-package proxyutil
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"math/big"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/stretchr/testify/require"
-)
-
-func SetupTestSecureSocksProxySettings(t *testing.T) *sdkproxy.ClientCfg {
-	t.Helper()
-	proxyAddress := "localhost:3000"
-	serverName := "localhost"
-	tempDir := t.TempDir()
-
-	// generate test rootCA
-	ca := &x509.Certificate{
-		SerialNumber: big.NewInt(2019),
-		Subject: pkix.Name{
-			Organization: []string{"Grafana Labs"},
-			CommonName:   "Grafana",
-		},
-		NotBefore:             time.Now(),
-		NotAfter:              time.Now().AddDate(10, 0, 0),
-		IsCA:                  true,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-		BasicConstraintsValid: true,
-	}
-	caPrivKey, err := rsa.GenerateKey(rand.Reader, 4096)
-	require.NoError(t, err)
-	caBytes, err := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey)
-	require.NoError(t, err)
-	rootCACert := filepath.Join(tempDir, "ca.cert")
-	// nolint:gosec
-	// The gosec G304 warning can be ignored because all values come from the test
-	caCertFile, err := os.Create(rootCACert)
-	require.NoError(t, err)
-	err = pem.Encode(caCertFile, &pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: caBytes,
-	})
-	require.NoError(t, err)
-
-	err = caCertFile.Close()
-	require.NoError(t, err)
-
-	// generate test client cert & key
-	cert := &x509.Certificate{
-		SerialNumber: big.NewInt(2019),
-		Subject: pkix.Name{
-			Organization: []string{"Grafana Labs"},
-			CommonName:   "Grafana",
-		},
-		NotBefore:    time.Now(),
-		NotAfter:     time.Now().AddDate(10, 0, 0),
-		SubjectKeyId: []byte{1, 2, 3, 4, 6},
-		ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
-		KeyUsage:     x509.KeyUsageDigitalSignature,
-	}
-	certPrivKey, err := rsa.GenerateKey(rand.Reader, 4096)
-	require.NoError(t, err)
-	certBytes, err := x509.CreateCertificate(rand.Reader, cert, ca, &certPrivKey.PublicKey, caPrivKey)
-	require.NoError(t, err)
-	clientCert := filepath.Join(tempDir, "client.cert")
-	// nolint:gosec
-	// The gosec G304 warning can be ignored because all values come from the test
-	certFile, err := os.Create(clientCert)
-	require.NoError(t, err)
-	err = pem.Encode(certFile, &pem.Block{
-		Type:  "CERTIFICATE",
-		Bytes: certBytes,
-	})
-	require.NoError(t, err)
-
-	err = certFile.Close()
-	require.NoError(t, err)
-
-	clientKey := filepath.Join(tempDir, "client.key")
-	// nolint:gosec
-	// The gosec G304 warning can be ignored because all values come from the test
-	keyFile, err := os.Create(clientKey)
-	require.NoError(t, err)
-	err = pem.Encode(keyFile, &pem.Block{
-		Type:  "RSA PRIVATE KEY",
-		Bytes: x509.MarshalPKCS1PrivateKey(certPrivKey),
-	})
-	require.NoError(t, err)
-
-	err = keyFile.Close()
-	require.NoError(t, err)
-
-	settings := &sdkproxy.ClientCfg{
-		ClientCert:   clientCert,
-		ClientKey:    clientKey,
-		RootCA:       rootCACert,
-		ServerName:   serverName,
-		ProxyAddress: proxyAddress,
-	}
-
-	return settings
-}

pkg/tsdb/sqleng/proxyutil/proxy_util.go

@@ -1,30 +0,0 @@
-package proxyutil
-
-import (
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
-)
-
-func GetSQLProxyOptions(cfg setting.SecureSocksDSProxySettings, dsInfo sqleng.DataSourceInfo, datasource, datasourceType string) *sdkproxy.Options {
-	opts := &sdkproxy.Options{
-		Enabled:        dsInfo.JsonData.SecureDSProxy && cfg.Enabled,
-		DatasourceName: datasource,
-		DatasourceType: datasourceType,
-		Auth: &sdkproxy.AuthOptions{
-			Username: dsInfo.UID,
-		},
-		ClientCfg: &sdkproxy.ClientCfg{
-			ClientCert:    cfg.ClientCert,
-			ClientKey:     cfg.ClientKey,
-			ServerName:    cfg.ServerName,
-			RootCA:        cfg.RootCA,
-			ProxyAddress:  cfg.ProxyAddress,
-			AllowInsecure: cfg.AllowInsecure,
-		},
-	}
-	if dsInfo.JsonData.SecureDSProxyUsername != "" {
-		opts.Auth.Username = dsInfo.JsonData.SecureDSProxyUsername
-	}
-	return opts
-}