Merge pull request #695 from luraproject/listen_address

Allow to configure the listen address of the service

config/config.go

@@ -11,6 +11,7 @@ import (
  "encoding/json"
  "errors"
  "fmt"
+ "net"
  "net/http"
  "net/textproto"
  "regexp"
@@ -56,6 +57,8 @@ type ServiceConfig struct {
  Host []string `mapstructure:"host"`
  // port to bind the lura service
  Port int `mapstructure:"port"`
+ // address to listen
+ Address string `mapstructure:"listen_ip"`
  // version code of the configuration
  Version int `mapstructure:"version"`
  // OutputEncoding defines the default encoding strategy to use for the endpoint responses
@@ -404,6 +407,13 @@ func (s *ServiceConfig) initGlobalParams() error {
  if s.Port == 0 {
  s.Port = defaultPort
  }
+
+ if s.Address != "" {
+ if !validateAddress(s.Address) {
+ return fmt.Errorf("invalid ip address %s", s.Address)
+ }
+ }
+
  if s.MaxIdleConnsPerHost == 0 {
  s.MaxIdleConnsPerHost = DefaultMaxIdleConnsPerHost
  }
@@ -766,3 +776,8 @@ func SetSequentialParamsPattern(pattern string) error {
  sequentialParamsPattern = re
  return nil
 }
+
+func validateAddress(address string) bool {
+ ip := net.ParseIP(address)
+ return ip != nil
+}

config/config_test.go

@@ -211,7 +211,7 @@ func TestConfig_init(t *testing.T) {
  t.Error(err.Error())
  }
 
- if hash != "v28MFBnMvvy1JAQZcC3ZBhusgtxl/o0k+7R1NiK0M34=" {
+ if hash != "FK9W9HSD9jkExuf53M9SUs5bCwlwRde5kRX0cn8rGm4=" {
  t.Errorf("unexpected hash: %s", hash)
  }
 }

config/parser.go

@@ -139,6 +139,7 @@ type parseableServiceConfig struct {
  CacheTTL string `json:"cache_ttl"`
  Host []string `json:"host"`
  Port int `json:"port"`
+ Address string `json:"listen_ip"`
  Version int `json:"version"`
  ExtraConfig *ExtraConfig `json:"extra_config,omitempty"`
  ReadTimeout string `json:"read_timeout"`
@@ -171,6 +172,7 @@ func (p *parseableServiceConfig) normalize() ServiceConfig {
  CacheTTL: parseDuration(p.CacheTTL),
  Host: p.Host,
  Port: p.Port,
+ Address: p.Address,
  Version: p.Version,
  Debug: p.Debug,
  Echo: p.Echo,

transport/http/server/server.go

@@ -141,7 +141,7 @@ func NewServer(cfg config.ServiceConfig, handler http.Handler) *http.Server {
 
 func NewServerWithLogger(cfg config.ServiceConfig, handler http.Handler, logger logging.Logger) *http.Server {
  return &http.Server{
- Addr: fmt.Sprintf(":%d", cfg.Port),
+ Addr: net.JoinHostPort(cfg.Address, fmt.Sprintf("%d", cfg.Port)),
  Handler: handler,
  ReadTimeout: cfg.ReadTimeout,
  WriteTimeout: cfg.WriteTimeout,