Merge pull request #55 from hashicorp/add_consul_ACL

Add consul acl

consul/service_resolver.go

@@ -71,10 +71,11 @@ type cacheItem struct {
 }
 
 // NewResolver creates a new Resolver
-func NewResolver(address string, logger hclog.Logger) *Resolver {
+func NewResolver(address, ACLToken string, logger hclog.Logger) *Resolver {
 	clientSet := dependency.NewClientSet()
 	clientSet.CreateConsulClient(&dependency.CreateConsulClientInput{
 		Address: address,
+		Token:   ACLToken,
 	})
 
 	watch, _ := watch.NewWatcher(&watch.NewWatcherInput{

main.go

@@ -30,6 +30,7 @@ var (
 	nodeURI               = flag.String("node_addr", "localhost", "URI of the current Nomad node, this address is used for reporting and logging")
 	nomadAddr             = flag.String("nomad_addr", "localhost:4646", "Address for Nomad API endpoint")
 	consulAddr            = flag.String("consul_addr", "http://localhost:8500", "Address for Consul API endpoint")
+  consulACL           = flag.String("consul_acl", "", "ACL token for Consul API, only required if ACL are enabled in Consul")
 	nomadRegion           = flag.String("nomad_region", "global", "Default region to schedule functions in")
 	enableBasicAuth       = flag.Bool("enable_basic_auth", false, "Flag for enabling basic authentication on gateway endpoints")
 	basicAuthSecretPath   = flag.String("basic_auth_secret_path", "/secrets", "The directory path to the basic auth secret file")
@@ -123,6 +124,7 @@ func main() {
 		*nodeURI,
 		*nomadAddr,
 		*consulAddr,
+		*consulACL,
 		*nomadRegion,
 	)
 
@@ -165,7 +167,7 @@ func createFaaSHandlers(nomadClient *api.Client, consulResolver *consul.Resolver
 	}
 }
 
-func makeDependencies(statsDAddr, thisAddr, nomadAddr, consulAddr, region string) (hclog.Logger, *statsd.Client, *api.Client, *consul.Resolver) {
+func makeDependencies(statsDAddr, thisAddr, nomadAddr, consulAddr, consulACL, region string) (hclog.Logger, *statsd.Client, *api.Client, *consul.Resolver) {
 	logger := setupLogging()
 
 	logger.Info("Using StatsD server:" + statsDAddr)
@@ -185,7 +187,7 @@ func makeDependencies(statsDAddr, thisAddr, nomadAddr, consulAddr, region string
 		logger.Error("Unable to create nomad client", err)
 	}
 
-	cr := consul.NewResolver(consulAddr, logger.Named("consul_resolver"))
+	cr := consul.NewResolver(consulAddr, consulACL, logger.Named("consul_resolver"))
 
 	return logger, stats, nomadClient, cr
 }

travis_deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ([ "$TRAVIS_BRANCH" == "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
+if ([ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then 
   cd $GOPATH/src/github.com/hashicorp/faas-nomad;
   docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" quay.io; 
   goreleaser --rm-dist --skip-validate