Merge pull request #173 from rawmind0/dind

Added dind support, acceptance tests and RKE log config

Author: rawmind0

.drone.yml

@@ -4,15 +4,13 @@ name: default
 
 steps:
 - name: build
-  image: golang:1.12.3
+  image: rancher/dapper:1.11.2
   commands:
-  - apt-get update
-  - apt-get install -y xz-utils zip rsync jq curl ca-certificates
-  - mkdir -p /go/src/github.com/rancher
-  - ln -s /drone/src /go/src/github.com/rancher/terraform-provider-rke
-  - cd /go/src/github.com/rancher/terraform-provider-rke
-  - make build-rancher
-  - make test
+  - dapper ci
+  privileged: true
+  volumes:
+  - name: socket
+    path: /var/run/docker.sock
 
 - name: build-all-binaries
   image: golang:1.12.3
@@ -60,3 +58,7 @@ steps:
     ref:
       exclude: [ refs/tags/*rc* ]
 
+volumes:
+- name: socket
+  host:
+    path: /var/run/docker.sock

CHANGELOG.md

@@ -1,4 +1,5 @@
-## 1.0.0-rc3 (Unreleased)
+## 1.0.0-rc4 (Unreleased)
+## 1.0.0-rc3 (February 28, 2020)
 
 FEATURES:
 
@@ -12,6 +13,9 @@ ENHANCEMENTS:
   * Added `CustomizeDiff` to control changes
   * Saving state on any execution
 * Added `kube_api.audit_log.Configuration.policy` argument to `services` argument
+* Added `dind` support
+* Added acceptance tests
+* Added `debug` and `log_file` provider configuration
 
 
 BUG FIXES:

Dockerfile.dapper

@@ -0,0 +1,33 @@
+FROM ubuntu:16.04
+# FROM arm=armhf/ubuntu:16.04
+
+ARG DAPPER_HOST_ARCH
+ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
+
+RUN apt-get update && \
+    apt-get install -y gcc make ca-certificates git wget curl vim less file kmod iptables xz-utils zip && \
+    rm -f /bin/sh && ln -s /bin/bash /bin/sh
+
+ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
+    GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
+
+RUN wget -O - https://storage.googleapis.com/golang/go1.12.15.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local
+
+ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
+    DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \
+    DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 \
+    DOCKER_URL=DOCKER_URL_${ARCH}
+
+RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker
+
+ENV DAPPER_SOURCE /go/src/github.com/rancher/terraform-provider-rke/
+ENV DAPPER_RUN_ARGS --privileged -v /var/lib/docker
+ENV DAPPER_OUTPUT ./bin ./dist ./build/bin
+ENV DAPPER_DOCKER_SOCKET true
+ENV DAPPER_ENV TAG REPO GOOS CROSS DRONE_TAG
+ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
+ENV HOME ${DAPPER_SOURCE}
+WORKDIR ${DAPPER_SOURCE}
+
+ENTRYPOINT ["./scripts/entry"]
+CMD ["ci"]

GNUmakefile

@@ -1,5 +1,5 @@
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
-GO111MODULE=on
+GO111MODULE=off
 WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=rke
 TEST?="./${PKG_NAME}"
@@ -10,6 +10,15 @@ default: build
 build: fmtcheck
 	go install
 
+dapper-build: .dapper
+	./.dapper build
+
+dapper-ci: .dapper
+	./.dapper ci
+
+dapper-testacc: .dapper
+	./.dapper gotestacc.sh
+
 build-rancher: validate-rancher
 	@sh -c "'$(CURDIR)/scripts/gobuild.sh'"
 
@@ -26,6 +35,13 @@ test: fmtcheck
 testacc: 
 	@sh -c "'$(CURDIR)/scripts/gotestacc.sh'"
 
+.dapper:
+	@echo Downloading dapper
+	@curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m` > .dapper.tmp
+	@@chmod +x .dapper.tmp
+	@./.dapper.tmp -v
+	@mv .dapper.tmp .dapper
+
 vet:
 	@echo "==> Checking that code complies with go vet requirements..."
 	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
@@ -86,6 +102,6 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-.PHONY: bin build test testacc vet fmt fmtcheck errcheck vendor-status test-compile vendor website website-test
+.PHONY: bin build test testacc vet fmt fmtcheck errcheck vendor-status test-compile vendor website website-test build-dapper
 
 

rke/config.go

@@ -1,4 +1,61 @@
 package rke
 
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+
+	//rkelog "github.com/rancher/rke/log"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	rkeErrorTemplate = `
+============= RKE outputs ==============
+%s
+%s
+========================================
+`
+)
+
 // Config type of RKE Config
-type Config struct{}
+type Config struct {
+	Debug     bool
+	LogBuffer *bytes.Buffer
+	LogFile   string
+}
+
+func (c *Config) initLogger() {
+	if c.LogBuffer == nil {
+		c.LogBuffer = &bytes.Buffer{}
+	}
+
+	if c.Debug {
+		log.SetLevel(log.DebugLevel)
+	}
+
+	var writer io.Writer = c.LogBuffer
+	//writer := io.MultiWriter(os.Stderr, c.LogBuffer)
+
+	log.SetOutput(writer)
+}
+
+func (c *Config) saveRKEOutput(err error) error {
+	if len(c.LogFile) > 0 {
+		f, errFile := os.OpenFile(c.LogFile, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
+		if errFile != nil {
+			return fmt.Errorf("Opening logfile %s err:%v", c.LogFile, errFile)
+		}
+		defer f.Close()
+		if _, errFile := f.Write(c.LogBuffer.Bytes()); errFile != nil {
+			return fmt.Errorf("Writing logfile %s err:%v", c.LogFile, errFile)
+		}
+	}
+
+	if err != nil {
+		return fmt.Errorf(rkeErrorTemplate, c.LogBuffer.String(), err)
+	}
+
+	return nil
+}

rke/provider.go

@@ -1,37 +1,23 @@
 package rke
 
 import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-	"github.com/sirupsen/logrus"
-)
-
-const (
-	rkeErrorTemplate = `
-%s
-
-============= RKE outputs ==============
-
-%s
-========================================
-`
 )
 
-var rkeLogBuf = &bytes.Buffer{}
-
 // Provider returns a terraform.ResourceProvider.
 func Provider() terraform.ResourceProvider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
-			"log": {
+			"debug": {
 				Type:        schema.TypeBool,
 				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("RKE_LOG", false),
+				DefaultFunc: schema.EnvDefaultFunc("RKE_DEBUG", false),
+			},
+			"log_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("RKE_LOG_FILE", ""),
 			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
@@ -43,38 +29,11 @@ func Provider() terraform.ResourceProvider {
 }
 
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
-	initLogger(d)
-
-	config := Config{}
-	return config, nil
-}
-
-func initLogger(d *schema.ResourceData) {
-	var writer io.Writer = rkeLogBuf
-	if v, ok := d.GetOk("log"); ok {
-		if v.(bool) {
-			writer = io.MultiWriter(os.Stderr, rkeLogBuf)
-		}
-	}
-
-	logrus.SetOutput(writer)
-	logrus.SetFormatter(&logFormatter{})
-}
-
-type logFormatter struct{}
-
-func (l *logFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	return []byte(fmt.Sprintf("[%s] %s\n", entry.Level, entry.Message)), nil
-}
-
-func wrapErrWithRKEOutputs(err error) error {
-	if err == nil {
-		return nil
+	config := &Config{
+		Debug:   d.Get("debug").(bool),
+		LogFile: d.Get("log_file").(string),
 	}
 
-	rkeLogLines := rkeLogBuf.String()
-	if rkeLogLines == "" {
-		return err
-	}
-	return fmt.Errorf(rkeErrorTemplate, err, rkeLogLines)
+	config.initLogger()
+	return config, nil
 }

rke/provider_test.go

@@ -1,8 +1,6 @@
 package rke
 
 import (
-	"fmt"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -29,34 +27,3 @@ func TestProvider(t *testing.T) {
 func TestProvider_impl(t *testing.T) {
 	var _ terraform.ResourceProvider = Provider()
 }
-
-func hasEnvValue(envKey string) bool {
-	if v := os.Getenv(envKey); v == "" {
-		return false
-	}
-	return true
-}
-
-func testAccPreCheckEnvs(t *testing.T, keys ...string) {
-	for _, env := range keys {
-		if !hasEnvValue(env) {
-			t.Fatal(fmt.Sprintf("%s must be set for acceptance tests", env))
-		}
-	}
-}
-
-func testAccPreCheck(t *testing.T) {
-	testAccPreCheckEnvs(t, envRKENodeAddr, envRKENodeUser, envRKENodeSSHKey)
-	rkeLogBuf.Reset()
-}
-
-func testAccPreCheckForMultiNodes(t *testing.T) {
-	var envKeys []string
-	baseKeys := []string{envRKENodeAddr, envRKENodeUser, envRKENodeSSHKey}
-	for i := 0; i < 2; i++ {
-		for _, key := range baseKeys {
-			envKeys = append(envKeys, fmt.Sprintf("%s_%d", key, i))
-		}
-	}
-	testAccPreCheckEnvs(t, envKeys...)
-}