Add support for bearer token auth, additional arbitrary HTTP headers

README.md

@@ -40,11 +40,13 @@ resource "kafka-connect_connector" "sqlite-sink" {
 
 ## Provider Properties
 
-| Property              | Type   | Example                 | Alternative environment variable name |
-|-----------------------|--------|-------------------------|---------------------------------------|
-| `url`                 | URL    | "http://localhost:8083" | `KAFKA_CONNECT_URL`                   |
-| `basic_auth_username` | String | "user"                  | `KAFKA_CONNECT_BASIC_AUTH_USERNAME`   |
-| `basic_auth_password` | String | "password"              | `KAFKA_CONNECT_BASIC_AUTH_PASSWORD`   |
+| Property              | Type              | Example                 | Alternative environment variable name |
+|-----------------------|-------------------|-------------------------|---------------------------------------|
+| `url`                 | URL               | "http://localhost:8083" | `KAFKA_CONNECT_URL`                   |
+| `basic_auth_username` | String            | "user"                  | `KAFKA_CONNECT_BASIC_AUTH_USERNAME`   |
+| `basic_auth_password` | String            | "password"              | `KAFKA_CONNECT_BASIC_AUTH_PASSWORD`   |
+| `bearer_token`        | String            | "27A43420FCFF497498B3"  | `KAFKA_CONNECT_BEARER_TOKEN`          |
+| `extra_headers`       | Map[String]String | {foo = "bar"}           | N/A                                   |
 
 ## Resource Properties
 

connect/provider.go

@@ -1,10 +1,14 @@
 package connect
 
 import (
+	"context"
+	"fmt"
 	"log"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	kc "github.com/ricardo-ch/go-kafka-connect/lib/connectors"
+
+	kc "github.com/ricardo-ch/go-kafka-connect/v3/lib/connectors"
 )
 
 func Provider() *schema.Provider {
@@ -26,8 +30,22 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("KAFKA_CONNECT_BASIC_AUTH_PASSWORD", ""),
 			},
+			"bearer_token": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("KAFKA_CONNECT_BEARER_TOKEN", ""),
+			},
+			"extra_headers": {
+				Type:        schema.TypeMap,
+				Elem:        &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional:    true,
+				// No DefaultFunc here to read from the env on account of this issue:
+				// https://github.com/hashicorp/terraform-plugin-sdk/issues/142
+			},
 		},
-		ConfigureFunc: providerConfigure,
+		ConfigureContextFunc: providerConfigure,
 		ResourcesMap: map[string]*schema.Resource{
 			"kafka-connect_connector": kafkaConnectorResource(),
 		},
@@ -36,7 +54,7 @@ func Provider() *schema.Provider {
 	return &provider
 }
 
-func providerConfigure(d *schema.ResourceData) (interface{}, error) {
+func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 	log.Printf("[INFO] Initializing KafkaConnect client")
 	addr := d.Get("url").(string)
 	c := kc.NewClient(addr)
@@ -45,5 +63,17 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	if user != "" && pass != "" {
 		c.SetBasicAuth(user, pass)
 	}
+
+	if token := d.Get("bearer_token").(string); token != "" {
+		c.SetHeader("Authorization", fmt.Sprintf("Bearer %s", token))
+	}
+
+	extraHeaders := d.Get("extra_headers").(map[string]interface{})
+	if extraHeaders != nil {
+		for k, v := range extraHeaders {
+			c.SetHeader(k, v.(string))
+		}
+	}
+
 	return c, nil
 }

connect/resource_kafka_connector.go

@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	kc "github.com/ricardo-ch/go-kafka-connect/lib/connectors"
+	kc "github.com/ricardo-ch/go-kafka-connect/v3/lib/connectors"
 )
 
 func kafkaConnectorResource() *schema.Resource {

connect/resource_kafka_connector_test.go

@@ -6,7 +6,7 @@ import (
 
 	r "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
-	kc "github.com/ricardo-ch/go-kafka-connect/lib/connectors"
+	kc "github.com/ricardo-ch/go-kafka-connect/v3/lib/connectors"
 )
 
 func TestAccConnectorConfigUpdate(t *testing.T) {

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	bou.ke/monkey v1.0.2 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
-	github.com/ricardo-ch/go-kafka-connect v0.0.0-20200928094249-af7817721cb5
+	github.com/ricardo-ch/go-kafka-connect/v3 v3.0.0-20220613085032-a69a6c33b847
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999