Add default value to gateway virtual_cluster attribute

conduktor · Nov 13, 2024 · a7285be · a7285be
1 parent d249fc6
commit a7285be
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/docs/resources/kafka_cluster_v2.md b/docs/resources/kafka_cluster_v2.md
@@ -164,7 +164,7 @@ resource "conduktor_kafka_cluster_v2" "gateway" {
   }
   spec {
     display_name      = "Gateway Cluster"
-    bootstrap_servers = "gateway:9092"
+    bootstrap_servers = "gateway:6969"
     properties = {
       "sasl.jaas.config"  = "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin-secret';"
       "security.protocol" = "SASL_SSL"
@@ -174,10 +174,10 @@ resource "conduktor_kafka_cluster_v2" "gateway" {
     ignore_untrusted_certificate = true
     kafka_flavor = {
       type                         = "Gateway"
-      url                          = "http://gateway:8088"
+      url                          = "http://gateway:8888"
       user                         = "admin"
       password                     = "admin"
-      virtual_cluster              = "vc1"
+      virtual_cluster              = "passthrough"
       ignore_untrusted_certificate = true
     }
     schema_registry = {
@@ -242,7 +242,7 @@ Optional:
 - `service_name` (String) Aiven service name. Required if type is `Aiven`
 - `url` (String) Conduktor Gateway Admin API URL. Required if type is `Gateway`
 - `user` (String) Conduktor Gateway Admin user. Required if type is `Gateway`
-- `virtual_cluster` (String) Conduktor Gateway Virtual cluster name. Only used if type is `Gateway`
+- `virtual_cluster` (String) Conduktor Gateway Virtual cluster name (default `passthrough`). Only used if type is `Gateway`
 
 
 <a id="nestedatt--spec--schema_registry"></a>

diff --git a/examples/resources/conduktor_kafka_cluster_v2/gateway.tf b/examples/resources/conduktor_kafka_cluster_v2/gateway.tf
@@ -5,7 +5,7 @@ resource "conduktor_kafka_cluster_v2" "gateway" {
   }
   spec {
     display_name      = "Gateway Cluster"
-    bootstrap_servers = "gateway:9092"
+    bootstrap_servers = "gateway:6969"
     properties = {
       "sasl.jaas.config"  = "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin-secret';"
       "security.protocol" = "SASL_SSL"
@@ -15,10 +15,10 @@ resource "conduktor_kafka_cluster_v2" "gateway" {
     ignore_untrusted_certificate = true
     kafka_flavor = {
       type                         = "Gateway"
-      url                          = "http://gateway:8088"
+      url                          = "http://gateway:8888"
       user                         = "admin"
       password                     = "admin"
-      virtual_cluster              = "vc1"
+      virtual_cluster              = "passthrough"
       ignore_untrusted_certificate = true
     }
     schema_registry = {

diff --git a/internal/provider/kafka_cluster_v2_resource_test.go b/internal/provider/kafka_cluster_v2_resource_test.go
@@ -138,14 +138,14 @@ func TestAccKafkaClusterV2ExampleResource(t *testing.T) {
 					resource.TestCheckResourceAttr(gatewayResourceRef, "name", "gateway-cluster"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "labels.%", "1"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.display_name", "Gateway Cluster"),
-					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.bootstrap_servers", "gateway:9092"),
+					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.bootstrap_servers", "gateway:6969"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.properties.%", "3"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.ignore_untrusted_certificate", "true"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.type", "Gateway"),
-					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.url", "http://gateway:8088"),
+					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.url", "http://gateway:8888"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.user", "admin"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.password", "admin"),
-					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.virtual_cluster", "vc1"),
+					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.virtual_cluster", "passthrough"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.kafka_flavor.ignore_untrusted_certificate", "true"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.schema_registry.type", "ConfluentLike"),
 					resource.TestCheckResourceAttr(gatewayResourceRef, "spec.schema_registry.url", "http://localhost:8081"),

diff --git a/internal/schema/resource_kafka_cluster_v2/kafka_cluster_v2_resource_gen.go b/internal/schema/resource_kafka_cluster_v2/kafka_cluster_v2_resource_gen.go
diff --git a/provider_code_spec.json b/provider_code_spec.json
@@ -1032,8 +1032,18 @@
                       {
                         "name": "virtual_cluster",
                         "string": {
-                          "description": "Conduktor Gateway Virtual cluster name. Only used if type is `Gateway`",
-                          "computed_optional_required": "optional"
+                          "description": "Conduktor Gateway Virtual cluster name (default `passthrough`). Only used if type is `Gateway`",
+                          "computed_optional_required": "computed_optional",
+                          "default": {
+                            "custom": {
+                              "imports": [
+                                {
+                                  "path": "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
+                                }
+                              ],
+                              "schema_definition": "stringdefault.StaticString(\"passthrough\")"
+                            }
+                          }
                         }
                       },
                       {