Merge pull request #47 from IvanOfThings/feat/change-clickhouse-driver

BREAKING CHANGE: change the used clickhouse driver to the official one

Author: givorra-ls

.github/workflows/test.yml

@@ -71,8 +71,8 @@ jobs:
           CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
         ports:
           - 8123:8123
-          - 9090:9000
-          - 9099:9009   
+          - 9000:9000
+          - 9009:9009
         # Set health checks to wait until redis has started
         options: >-
           --health-cmd "clickhouse-client --database=system --query='select * from databases'"
@@ -121,7 +121,7 @@ jobs:
         TF_CLICKHOUSE_HOST: "127.0.0.1"
         TF_CLICKHOUSE_USERNAME: "default"
         TF_CLICKHOUSE_PASSWORD: ""
-        TF_CLICKHOUSE_PORT: "8123"
+        TF_CLICKHOUSE_PORT: "9000"
 
         # Set whatever additional acceptance test env vars here. You can
         # optionally use data from your repository secrets using the

GNUmakefile

@@ -11,7 +11,7 @@ default: testacc
 # Run acceptance tests
 .PHONY: testacc
 testacc:
-	TF_ACC=1 TF_CLICKHOUSE_HOST="127.0.0.1" TF_CLICKHOUSE_USERNAME="default" TF_CLICKHOUSE_PASSWORD="" TF_CLICKHOUSE_PORT=8923 go test -tags testing ./... -v $(TESTARGS) -timeout 120m
+	TF_ACC=1 TF_CLICKHOUSE_HOST="127.0.0.1" TF_CLICKHOUSE_USERNAME="default" TF_CLICKHOUSE_PASSWORD="" TF_CLICKHOUSE_PORT=9000 go test -tags testing ./... -v $(TESTARGS) -timeout 120m
 
 build:
 	go build -o ${BINARY}

README.md

@@ -40,11 +40,11 @@ Then commit the changes to `go.mod` and `go.sum`.
 ## Using the provider
 
 
-Definining provider
+Definining provider. The port should be the Clickhouse native protocol port (9000 by default, and 9440 for Clickhouse Cloud)
 
 ```hcl
 provider "clickhouse" {
-  port           = 8123
+  port           = 9000           # Clickhouse native protocol port
   host           = "127.0.0.1"
   username       = "default"
   password       = ""
@@ -57,7 +57,7 @@ In order to definte url, username and password in a safety way it is possible to
 TF_CLICKHOUSE_USERNAME=default
 TF_CLICKHOUSE_PASSWORD=""
 TF_CLICKHOUSE_HOST="127.0.0.1"
-TF_CLICKHOUSE_PORT=8123
+TF_CLICKHOUSE_PORT=9000
 ```
 
 ```hcl
@@ -73,7 +73,7 @@ Configuring provider
 
 ```hcl
 provider "clickhouse" {
-  port           = 8923
+  port           = 9000
   host           = "127.0.0.1"
   username       = "default"
   password       = ""
@@ -97,7 +97,7 @@ I is possible to use macros defined for cluster, databases, installation names i
 
 ```hcl
 provider "clickhouse" {
-  port           = 8123
+  port           = 9000
   host           = "127.0.0.1"
   username       = "default"
   password       = ""

docs/index.md

@@ -39,5 +39,6 @@ provider "clickhouse" {
 - `default_cluster` (String) Default cluster, if provided will be used when no cluster is provided
 - `host` (String, Sensitive) Clickhouse server url
 - `password` (String, Sensitive) Clickhouse user password with admin privileges
-- `port` (Number) Clickhouse server port
+- `port` (Number) Clickhouse server native protocol port (TCP)
+- `secure` (Boolean) Clickhouse secure connection
 - `username` (String) Clickhouse username with admin privileges

go.mod

@@ -5,30 +5,34 @@ go 1.19
 replace github.com/hashicorp/terraform-provider-scaffolding => github.com/IvanOfThings/terraform-provider-clickhouse v0.1.0
 
 require (
+	github.com/ClickHouse/clickhouse-go/v2 v2.15.0
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-docs v0.13.0
 	github.com/hashicorp/terraform-plugin-log v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.23.0
 	github.com/joho/godotenv v1.4.0
-	github.com/leprosus/golang-clickhouse v1.0.0
 )
 
 require (
+	github.com/ClickHouse/ch-go v0.58.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
+	github.com/go-faster/city v1.0.1 // indirect
+	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -48,8 +52,8 @@ require (
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/leprosus/golang-composer v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mitchellh/cli v1.1.4 // indirect
@@ -59,20 +63,27 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
+	github.com/paulmach/orb v0.10.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.18 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/russross/blackfriday v1.6.0 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/zclconf/go-cty v1.11.0 // indirect
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
-	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/appengine v1.6.6 // indirect
-	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
-	google.golang.org/grpc v1.48.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
+	google.golang.org/grpc v1.57.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )