Merge pull request #3 from Mongey/cm-ci

Prune Deps, Run acceptance tests in CI, update to go 1.10

Author: Mongey

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: /go/src/github.com/Mongey/terraform-provider-kafka-connect
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10
         environment:
           TEST_RESULTS: /tmp/test-results
       - image: confluentinc/cp-zookeeper:latest
@@ -16,6 +16,23 @@ jobs:
           KAFKA_ZOOKEEPER_CONNECT: localhost:2181
           KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
           KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      - image: confluentinc/cp-kafka-connect:4.0.0-2
+        environment:
+          CONNECT_BOOTSTRAP_SERVERS: PLAINTEXT://localhost:9092
+          CONNECT_GROUP_ID: connect
+          CONNECT_REST_PORT: 8083
+          CONNECT_CONFIG_STORAGE_TOPIC: "quickstart-config"
+          CONNECT_OFFSET_STORAGE_TOPIC: "quickstart-offsets"
+          CONNECT_STATUS_STORAGE_TOPIC: "quickstart-status"
+          CONNECT_KEY_CONVERTER: "org.apache.kafka.connect.json.JsonConverter"
+          CONNECT_VALUE_CONVERTER: "org.apache.kafka.connect.json.JsonConverter"
+          CONNECT_INTERNAL_KEY_CONVERTER: "org.apache.kafka.connect.json.JsonConverter"
+          CONNECT_INTERNAL_VALUE_CONVERTER: "org.apache.kafka.connect.json.JsonConverter"
+          CONNECT_REST_ADVERTISED_HOST_NAME: "localhost"
+          CONNECT_PLUGIN_PATH: /usr/share/java
+          CONNECT_CONFIG_STORAGE_REPLICATION_FACTOR: 1
+          CONNECT_OFFSET_STORAGE_REPLICATION_FACTOR: 1
+          CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1
     steps:
       - checkout
       - run: go build
@@ -24,6 +41,13 @@ jobs:
           destination: terraform-provider-kafka
       - run: go get github.com/jstemmer/go-junit-report
       - run: mkdir -p $TEST_RESULTS
+      - run:
+          name: Wait for connect
+          command: |
+            until $(curl --output /dev/null --silent --head --fail http://localhost:8083); do
+              printf '.'
+              sleep 5
+            done
       - run:
           name: Run Tests
           command: |

GNUmakefile

@@ -12,6 +12,6 @@ test:
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 testacc:
-	KAFKA_BROKER=localhost:9092 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
+	KAFKA_CONNECT_URL=http://localhost:8083 TF_LOG=debug TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
 
 .PHONY: build test testacc

Gopkg.lock

@@ -1,29 +1,12 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
 [[constraint]]
   name = "github.com/hashicorp/terraform"
   version = "0.11.3"
 
 [[constraint]]
   branch = "master"
   name = "github.com/ricardo-ch/go-kafka-connect"
+
+[prune]
+  go-tests = true
+  non-go = true
+  unused-packages = true

Gopkg.toml

@@ -11,6 +11,7 @@ your [terraform plugin directory][third-party-plugins] (typically `~/.terraform.
 
 ## Example
 
+Configure the provider directly, or set the Env variable `KAFKA_CONNECT_URL`
 ```hcl
 provider "kafka-connect" {
   url = "http://localhost:8083"

README.md

@@ -1,20 +1,23 @@
 package connect
 
 import (
+	"log"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	kc "github.com/ricardo-ch/go-kafka-connect/lib/connectors"
 )
 
 func Provider() terraform.ResourceProvider {
+	log.Printf("[INFO] Creating Provider")
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"url": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("KAFKA_CONNECT_URL", ""),
 			},
 		},
-
 		ConfigureFunc: providerConfigure,
 		ResourcesMap: map[string]*schema.Resource{
 			"kafka-connect_connector": kafkaConnectorResource(),
@@ -23,7 +26,9 @@ func Provider() terraform.ResourceProvider {
 }
 
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
-	c := kc.NewClient(d.Get("url").(string))
+	log.Printf("[INFO] Initializing KafkaConnect client")
+	addr := d.Get("url").(string)
+	c := kc.NewClient(addr)
 
 	return c, nil
 }

connect/provider.go

@@ -1,6 +1,7 @@
 package connect
 
 import (
+	"log"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/schema"
@@ -10,18 +11,23 @@ import (
 var testProvider *schema.Provider
 var testProviders map[string]terraform.ResourceProvider
 
+func init() {
+	testProvider = Provider().(*schema.Provider)
+	testProviders = map[string]terraform.ResourceProvider{
+		"kafka-connect": testProvider,
+	}
+}
+
 func TestProvider(t *testing.T) {
 	if err := Provider().(*schema.Provider).InternalValidate(); err != nil {
 		t.Fatalf("err: %s", err)
 	}
 }
 
 func testAccPreCheck(t *testing.T) {
-}
-
-func accProvider() map[string]terraform.ResourceProvider {
-	provider := Provider().(*schema.Provider)
-	return map[string]terraform.ResourceProvider{
-		"kafka-connect": provider,
+	client := testProvider.Meta()
+	log.Printf("[INFO] Checking KafkaConnect client")
+	if client == nil {
+		//t.Fatal("No client")
 	}
 }

connect/provider_test.go

@@ -1,6 +1,7 @@
 package connect
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
@@ -35,26 +36,17 @@ func kafkaConnectorResource() *schema.Resource {
 
 func connectorCreate(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(kc.Client)
-	name := d.Get("name").(string)
-
-	cfg := d.Get("config").(map[string]interface{})
-	config := make(map[string]string)
-
-	for k, v := range cfg {
-		switch v := v.(type) {
-		case string:
-			config[k] = v
-		}
-	}
-
+	name := nameFromRD(d)
+	config := configFromRD(d)
 	req := kc.CreateConnectorRequest{
 		ConnectorRequest: kc.ConnectorRequest{
 			Name: name,
 		},
 		Config: config,
 	}
 
-	_, err := c.CreateConnector(req, true)
+	connectorResponse, err := c.CreateConnector(req, true)
+	fmt.Printf("[INFO] Created the connector %v\n", connectorResponse)
 
 	if err == nil {
 		d.SetId(name)
@@ -63,14 +55,21 @@ func connectorCreate(d *schema.ResourceData, meta interface{}) error {
 	return err
 }
 
+func nameFromRD(d *schema.ResourceData) string {
+	return d.Get("name").(string)
+}
+
 func connectorDelete(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(kc.Client)
 
+	name := nameFromRD(d)
 	req := kc.ConnectorRequest{
-		Name: d.Get("name").(string),
+		Name: name,
 	}
-	_, err := c.DeleteConnector(req, true)
 
+	fmt.Printf("[INFO] Deleing the connector %s\n", name)
+
+	_, err := c.DeleteConnector(req, true)
 	if err == nil {
 		d.SetId("")
 	}
@@ -81,16 +80,8 @@ func connectorDelete(d *schema.ResourceData, meta interface{}) error {
 func connectorUpdate(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(kc.Client)
 
-	name := d.Get("name").(string)
-	cfg := d.Get("config").(map[string]interface{})
-	config := make(map[string]string)
-
-	for k, v := range cfg {
-		switch v := v.(type) {
-		case string:
-			config[k] = v
-		}
-	}
+	name := nameFromRD(d)
+	config := configFromRD(d)
 
 	req := kc.CreateConnectorRequest{
 		ConnectorRequest: kc.ConnectorRequest{
@@ -103,12 +94,13 @@ func connectorUpdate(d *schema.ResourceData, meta interface{}) error {
 	conn, err := c.UpdateConnector(req, true)
 
 	if err == nil {
-		log.Printf("[INFO] this the shit %v", conn.Config)
+		log.Printf("[INFO] Config updated %v", conn.Config)
 		d.Set("config", conn.Config)
 	}
 
 	return err
 }
+
 func connectorRead(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(kc.Client)
 
@@ -120,9 +112,23 @@ func connectorRead(d *schema.ResourceData, meta interface{}) error {
 	conn, err := c.GetConnector(req)
 
 	if err == nil {
-		log.Printf("[INFO] this the shit %v", conn.Config)
+		log.Printf("[INFO] found the config %v", conn.Config)
 		d.Set("config", conn.Config)
 	}
 
 	return err
 }
+
+func configFromRD(d *schema.ResourceData) map[string]string {
+	cfg := d.Get("config").(map[string]interface{})
+	config := make(map[string]string)
+
+	for k, v := range cfg {
+		switch v := v.(type) {
+		case string:
+			config[k] = v
+		}
+	}
+
+	return config
+}