Use latest plugin SDK API, Go version

.github/workflows/pull-request-image.yml

@@ -27,6 +27,8 @@ jobs:
 
       - name: Install Go environment
         uses: actions/setup-go@v4
+        with:
+          go-version: 'stable'
 
       - name: Install yarn dependencies
         run: yarn install

.github/workflows/run-backend-tests.yml

@@ -18,10 +18,6 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        go:
-          # version pinned until https://github.com/testcontainers/testcontainers-go/issues/1359
-          # is resolved
-          - '1.20.5'
         clickhouse:
           - 22.3
           - 22.8
@@ -33,10 +29,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Go ${{ matrix.go }}
+      - name: Install Go
         uses: actions/[email protected]
         with:
-          go-version: ${{ matrix.go }}
+          go-version: 'stable'
 
       - name: Build
         run: go build -v ./...

.github/workflows/run-frontend-tests.yml

@@ -17,9 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
-      matrix:
-        go:
-          - '1.20.x'
 
     steps:
       - uses: actions/checkout@v4
@@ -35,10 +32,10 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Install Go ${{ matrix.go }}
+      - name: Install Go
         uses: actions/[email protected]
         with:
-          go-version: ${{ matrix.go }}
+          go-version: 'stable'
 
       - name: Install yarn dependencies
         run: yarn install

.github/workflows/run-k6e2e-tests.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Go 1.20.5
+      - name: Install Go
         uses: actions/[email protected]
         with:
-          go-version: 1.20.5
+          go-version: 'stable'
 
       - name: Install Dagger CLI
         run: cd /usr/local && { curl -L https://dl.dagger.io/dagger/install.sh | sh; cd -; }

go.mod

@@ -1,6 +1,8 @@
 module github.com/grafana/clickhouse-datasource
 
-go 1.20
+go 1.21
+
+toolchain go1.21.4
 
 require (
 	dagger.io/dagger v0.8.4

pkg/plugin/driver.go

@@ -144,8 +144,8 @@ func (h *Clickhouse) Connect(config backend.DataSourceInstanceSettings, message
 		ClientInfo: clickhouse.ClientInfo{
 			Products: getClientInfoProducts(),
 		},
-		TLS:  tlsConfig,
-		Addr: []string{fmt.Sprintf("%s:%d", settings.Server, settings.Port)},
+		TLS:         tlsConfig,
+		Addr:        []string{fmt.Sprintf("%s:%d", settings.Server, settings.Port)},
 		HttpUrlPath: settings.Path,
 		Auth: clickhouse.Auth{
 			Username: settings.Username,
@@ -161,8 +161,10 @@ func (h *Clickhouse) Connect(config backend.DataSourceInstanceSettings, message
 		Settings:    customSettings,
 	}
 
-	if sdkproxy.Cli.SecureSocksProxyEnabled(settings.ProxyOptions) {
-		dialer, err := sdkproxy.Cli.NewSecureSocksProxyContextDialer(settings.ProxyOptions)
+	p := sdkproxy.New(settings.ProxyOptions)
+
+	if p.SecureSocksProxyEnabled() {
+		dialer, err := p.NewSecureSocksProxyContextDialer()
 		if err != nil {
 			return nil, err
 		}

pkg/plugin/settings.go

@@ -171,7 +171,10 @@ func LoadSettings(config backend.DataSourceInstanceSettings) (settings Settings,
 		settings.TlsClientKey = tlsClientKey
 	}
 
-	proxyOpts, err := config.ProxyOptions()
+	// proxy options are only able to be loaded via environment variables
+	// currently, so we pass `nil` here so they are loaded with defaults
+	proxyOpts, err := config.ProxyOptions(nil)
+
 	if err == nil && proxyOpts != nil {
 		// the sdk expects the timeout to not be a string
 		timeout, err := strconv.ParseFloat(settings.Timeout, 64)