Release v0.16.0-megalithic.1

Megalithic-LLC · Jun 22, 2020 · a772b96 · a772b96
1 parent cccd334
commit a772b96
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 46 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+### v0.16.0-megalithic.1
+
+Build with Go 1.13 to add support for Go Template variable replacement.
+
 ### v0.16.0
 
 28f72608 Release arm64 binaries

diff --git a/Dockerfile.build.alpine b/Dockerfile.build.alpine
@@ -1,7 +1,7 @@
-FROM golang:1.10.2-alpine
+FROM golang:1.13.8-alpine
 
 RUN apk add --no-cache make git
-RUN mkdir -p /go/src/github.com/kelseyhightower/confd && \
-  ln -s /go/src/github.com/kelseyhightower/confd /app
+RUN mkdir -p /go/src/github.com/Megalithic-LLC/confd && \
+  ln -s /go/src/github.com/Megalithic-LLC/confd /app
 
 WORKDIR /app
diff --git a/backends/client.go b/backends/client.go
@@ -4,18 +4,18 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/kelseyhightower/confd/backends/consul"
-	"github.com/kelseyhightower/confd/backends/dynamodb"
-	"github.com/kelseyhightower/confd/backends/env"
-	"github.com/kelseyhightower/confd/backends/etcd"
-	"github.com/kelseyhightower/confd/backends/etcdv3"
-	"github.com/kelseyhightower/confd/backends/file"
-	"github.com/kelseyhightower/confd/backends/rancher"
-	"github.com/kelseyhightower/confd/backends/redis"
-	"github.com/kelseyhightower/confd/backends/ssm"
-	"github.com/kelseyhightower/confd/backends/vault"
-	"github.com/kelseyhightower/confd/backends/zookeeper"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/backends/consul"
+	"github.com/Megalithic-LLC/confd/backends/dynamodb"
+	"github.com/Megalithic-LLC/confd/backends/env"
+	"github.com/Megalithic-LLC/confd/backends/etcd"
+	"github.com/Megalithic-LLC/confd/backends/etcdv3"
+	"github.com/Megalithic-LLC/confd/backends/file"
+	"github.com/Megalithic-LLC/confd/backends/rancher"
+	"github.com/Megalithic-LLC/confd/backends/redis"
+	"github.com/Megalithic-LLC/confd/backends/ssm"
+	"github.com/Megalithic-LLC/confd/backends/vault"
+	"github.com/Megalithic-LLC/confd/backends/zookeeper"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 // The StoreClient interface is implemented by objects that can retrieve

diff --git a/backends/config.go b/backends/config.go
@@ -1,7 +1,7 @@
 package backends
 
 import (
-	util "github.com/kelseyhightower/confd/util"
+	util "github.com/Megalithic-LLC/confd/util"
 )
 
 type Config struct {

diff --git a/backends/dynamodb/client.go b/backends/dynamodb/client.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 // Client is a wrapper around the DynamoDB client

diff --git a/backends/env/client.go b/backends/env/client.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 var replacer = strings.NewReplacer("/", "_")

diff --git a/backends/etcd/client.go b/backends/etcd/client.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/coreos/etcd/client"
 	"golang.org/x/net/context"
-        "github.com/kelseyhightower/confd/log"
+        "github.com/Megalithic-LLC/confd/log"
 )
 
 // Client is a wrapper around the etcd client

diff --git a/backends/etcdv3/client.go b/backends/etcdv3/client.go
@@ -10,7 +10,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/coreos/etcd/clientv3"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 	"sync"
 )
 

diff --git a/backends/file/client.go b/backends/file/client.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/kelseyhightower/confd/log"
-	util "github.com/kelseyhightower/confd/util"
+	"github.com/Megalithic-LLC/confd/log"
+	util "github.com/Megalithic-LLC/confd/util"
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/backends/rancher/client.go b/backends/rancher/client.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/kelseyhightower/confd/log"
+	log "github.com/Megalithic-LLC/confd/log"
 )
 
 const (

diff --git a/backends/redis/client.go b/backends/redis/client.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/garyburd/redigo/redis"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 

diff --git a/backends/ssm/client.go b/backends/ssm/client.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ssm"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 type Client struct {

diff --git a/backends/vault/client.go b/backends/vault/client.go
@@ -11,7 +11,7 @@ import (
 	"path"
 
 	vaultapi "github.com/hashicorp/vault/api"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 // Client is a wrapper around the vault client

diff --git a/backends/zookeeper/client.go b/backends/zookeeper/client.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 	zk "github.com/samuel/go-zookeeper/zk"
 )
 

diff --git a/confd.go b/confd.go
@@ -8,9 +8,9 @@ import (
 	"runtime"
 	"syscall"
 
-	"github.com/kelseyhightower/confd/backends"
-	"github.com/kelseyhightower/confd/log"
-	"github.com/kelseyhightower/confd/resource/template"
+	"github.com/Megalithic-LLC/confd/backends"
+	"github.com/Megalithic-LLC/confd/log"
+	"github.com/Megalithic-LLC/confd/resource/template"
 )
 
 func main() {

diff --git a/config.go b/config.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	"github.com/kelseyhightower/confd/backends"
-	"github.com/kelseyhightower/confd/log"
-	"github.com/kelseyhightower/confd/resource/template"
+	"github.com/Megalithic-LLC/confd/backends"
+	"github.com/Megalithic-LLC/confd/log"
+	"github.com/Megalithic-LLC/confd/resource/template"
 )
 
 type TemplateConfig = template.Config

diff --git a/config_test.go b/config_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 func TestInitConfigDefaultConfig(t *testing.T) {

diff --git a/resource/template/processor.go b/resource/template/processor.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/kelseyhightower/confd/log"
-	util "github.com/kelseyhightower/confd/util"
+	"github.com/Megalithic-LLC/confd/log"
+	util "github.com/Megalithic-LLC/confd/util"
 )
 
 type Processor interface {

diff --git a/resource/template/resource.go b/resource/template/resource.go
@@ -15,9 +15,9 @@ import (
 	"text/template"
 
 	"github.com/BurntSushi/toml"
-	"github.com/kelseyhightower/confd/backends"
-	"github.com/kelseyhightower/confd/log"
-	util "github.com/kelseyhightower/confd/util"
+	"github.com/Megalithic-LLC/confd/backends"
+	"github.com/Megalithic-LLC/confd/log"
+	util "github.com/Megalithic-LLC/confd/util"
 	"github.com/kelseyhightower/memkv"
 	"github.com/xordataexchange/crypt/encoding/secconf"
 )

diff --git a/resource/template/resource_test.go b/resource/template/resource_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/kelseyhightower/confd/backends/env"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/backends/env"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 // createTempDirs is a helper function which creates temporary directories

diff --git a/resource/template/template_funcs.go b/resource/template/template_funcs.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	util "github.com/kelseyhightower/confd/util"
+	util "github.com/Megalithic-LLC/confd/util"
 	"github.com/kelseyhightower/memkv"
 )
 

diff --git a/resource/template/template_test.go b/resource/template/template_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/kelseyhightower/confd/backends"
+	"github.com/Megalithic-LLC/confd/backends"
 	"github.com/xordataexchange/crypt/encoding/secconf"
 )
 

diff --git a/util/util.go b/util/util.go
@@ -2,7 +2,7 @@ package util
 
 import (
 	"fmt"
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 	"os"
 	"path"
 	"path/filepath"

diff --git a/util/util_test.go b/util/util_test.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/kelseyhightower/confd/log"
+	"github.com/Megalithic-LLC/confd/log"
 )
 
 // createRecursiveDirs is a helper function which creates temporary directorie

diff --git a/version.go b/version.go
@@ -1,6 +1,6 @@
 package main
 
-const Version = "0.17.0-dev"
+const Version = "0.16.0-megalithic.1"
 
 // We want to replace this variable at build time with "-ldflags -X main.GitSHA=xxx", where const is not supported.
 var GitSHA = ""