Merge branch 'main' into avoid-wildcard-table

whites11 · web-flow · commit b61c2b908d34 · 2025-04-30T14:23:45.000+02:00
diff --git a/.github/actions/list-examples/action.yaml b/.github/actions/list-examples/action.yaml
@@ -1,6 +1,10 @@
 name: "List examples to be used by e2e tests"
 description: "Return JSON array with a list of examples defined"
-inputs: {}
+inputs:
+  ignore:
+    required: false
+    description: "Regex to match against example names. Matched examples won't be returned. Empty regex does nothing."
+    default: "tde"
 
 outputs:
   examples:
@@ -12,11 +16,17 @@ runs:
   steps:
     - shell: bash
       id: list
+      env:
+        ignoreRegex: "${{ inputs.ignore }}"
       run: |
         examples="$(echo '[]' | jq .)"
         pushd examples/full
         for candidate in $(ls -1 .)
         do
+          if [[ ! -z "$ignoreRegex" ]] && [[ "$candidate" =~ "$ignoreRegex" ]]; then
+            echo "skipping $candidate..."
+            continue
+          fi
           if [ -d $candidate ]
           then
             cloud_providers=()
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -45,7 +45,7 @@ on:
         default: false
         description: "If checked, additionally create service using latest stable version, then upgrade to the current version"
   schedule:
-    - cron: "0 3 * * *"
+    - cron: "0 7 * * *"
 
 defaults:
   run:
diff --git a/docs/index.md b/docs/index.md
@@ -63,7 +63,7 @@ then a manual process is required after the upgrade. Please visit [https://githu
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/externally_managed_table/provider.tf b/examples/clickpipe/externally_managed_table/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_azure_eventhub/provider.tf b/examples/clickpipe/kafka_azure_eventhub/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_confluent/provider.tf b/examples/clickpipe/kafka_confluent/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_msk_iam_role/provider.tf b/examples/clickpipe/kafka_msk_iam_role/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_msk_iam_user/provider.tf b/examples/clickpipe/kafka_msk_iam_user/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_offset_strategy/provider.tf b/examples/clickpipe/kafka_offset_strategy/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_redpanda_scram/provider.tf b/examples/clickpipe/kafka_redpanda_scram/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/kafka_schema_registry/provider.tf b/examples/clickpipe/kafka_schema_registry/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/multiple_pipes_example/provider.tf b/examples/clickpipe/multiple_pipes_example/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/object_storage_iam_role/provider.tf b/examples/clickpipe/object_storage_iam_role/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/object_storage_iam_user/provider.tf b/examples/clickpipe/object_storage_iam_user/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/reverse_private_endpoint_msk/provider.tf b/examples/clickpipe/reverse_private_endpoint_msk/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/reverse_private_endpoint_msk_pipe/provider.tf b/examples/clickpipe/reverse_private_endpoint_msk_pipe/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/reverse_private_endpoint_vpc_resource/provider.tf b/examples/clickpipe/reverse_private_endpoint_vpc_resource/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/reverse_private_endpoint_vpce_service/provider.tf b/examples/clickpipe/reverse_private_endpoint_vpce_service/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/clickpipe/service_and_clickpipe/provider.tf b/examples/clickpipe/service_and_clickpipe/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/database/provider.tf b/examples/database/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/basic/aws/provider.tf b/examples/full/basic/aws/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/basic/azure/provider.tf b/examples/full/basic/azure/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/basic/gcp/provider.tf b/examples/full/basic/gcp/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/private_endpoint/aws/provider.tf b/examples/full/private_endpoint/aws/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/tde/aws/provider.tf b/examples/full/tde/aws/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/tde/gcp/provider.tf b/examples/full/tde/gcp/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/full/warehouse/aws/main.tf b/examples/full/warehouse/aws/main.tf
@@ -45,6 +45,9 @@ resource "clickhouse_service" "primary" {
   }
 }
 
+data "clickhouse_api_key_id" "self" {
+}
+
 resource "clickhouse_service" "secondary" {
   warehouse_id              = clickhouse_service.primary.warehouse_id
   readonly                  = true
@@ -61,6 +64,15 @@ resource "clickhouse_service" "secondary" {
     }
   ]
 
+  query_api_endpoints = {
+    api_key_ids = [
+      data.clickhouse_api_key_id.self.id
+    ]
+    roles = [
+      "sql_console_admin"
+    ]
+  }
+
   min_replica_memory_gb = 8
   max_replica_memory_gb = 120
 }
diff --git a/examples/full/warehouse/aws/provider.tf b/examples/full/warehouse/aws/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.1.0"
+      version = "3.1.1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/examples/rbac/provider.tf b/examples/rbac/provider.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     clickhouse = {
-      version = "3.0.0-alpha2"
+      version = "3.1.1-alpha1"
       source  = "ClickHouse/clickhouse"
     }
   }
diff --git a/pkg/resource/service.go b/pkg/resource/service.go
diff --git a/tests/import/service/provider.tf b/tests/import/service/provider.tf

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ then a manual process is required after the upgrade. Please visit [https://githu`
`63`	`63`	`terraform {`
`64`	`64`	`required_providers {`
`65`	`65`	`clickhouse = {`
`66`		`- version = "3.1.0"`
	`66`	`+ version = "3.1.1"`
`67`	`67`	`source = "ClickHouse/clickhouse"`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`clickhouse = {`
`5`		`- version = "3.0.0-alpha2"`
	`5`	`+ version = "3.1.1-alpha1"`
`6`	`6`	`source = "ClickHouse/clickhouse"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@ resource "clickhouse_service" "primary" {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+data "clickhouse_api_key_id" "self" {`
	`49`	`+}`
	`50`	`+`
`48`	`51`	`resource "clickhouse_service" "secondary" {`
`49`	`52`	`warehouse_id = clickhouse_service.primary.warehouse_id`
`50`	`53`	`readonly = true`
`@@ -61,6 +64,15 @@ resource "clickhouse_service" "secondary" {`
`61`	`64`	`}`
`62`	`65`	`]`
`63`	`66`
	`67`	`+ query_api_endpoints = {`
	`68`	`+ api_key_ids = [`
	`69`	`+ data.clickhouse_api_key_id.self.id`
	`70`	`+ ]`
	`71`	`+ roles = [`
	`72`	`+ "sql_console_admin"`
	`73`	`+ ]`
	`74`	`+ }`
	`75`	`+`
`64`	`76`	`min_replica_memory_gb = 8`
`65`	`77`	`max_replica_memory_gb = 120`
`66`	`78`	`}`