diff --git a/README.md b/README.md index ac02ab1..bff9cb0 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Three components are used : To handle intentions, HAProxy Connect, sets up a SPOE filter on the application public frontend. On each connection HAProxy checks with HAProxy Connect that the incomming connection is authorized. HAProxy Connect parses the request certificates and in turn calls the Consul agent to know wether it should tell HAProxy to allow or deny the connection. -![architecture](https://github.com/criteo/haproxy-consul-connect/blob/master/docs/architecture.png) +![architecture](https://github.com/haproxytech/haproxy-consul-connect/blob/master/docs/architecture.png) ## Requirements diff --git a/consul/logger.go b/consul/logger.go index ecc279b..524c2cf 100644 --- a/consul/logger.go +++ b/consul/logger.go @@ -10,4 +10,4 @@ type Logger interface { Warnf(format string, args ...interface{}) // Errorf Display error message Errorf(format string, args ...interface{}) -} \ No newline at end of file +} diff --git a/go.mod b/go.mod index 7b363e0..865d466 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/criteo/haproxy-consul-connect +module github.com/haproxytech/haproxy-consul-connect go 1.12 diff --git a/haproxy/certs.go b/haproxy/certs.go index 45264a7..46edfa1 100644 --- a/haproxy/certs.go +++ b/haproxy/certs.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/criteo/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/consul" log "github.com/sirupsen/logrus" ) diff --git a/haproxy/config.go b/haproxy/config.go index 2ee666f..4412408 100644 --- a/haproxy/config.go +++ b/haproxy/config.go @@ -8,7 +8,7 @@ import ( "text/template" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/lib" log "github.com/sirupsen/logrus" ) diff --git a/haproxy/haproxy.go b/haproxy/haproxy.go index cdda754..e7c190f 100644 --- a/haproxy/haproxy.go +++ b/haproxy/haproxy.go @@ -7,12 +7,12 @@ import ( "strconv" "time" - "github.com/criteo/haproxy-consul-connect/consul" - "github.com/criteo/haproxy-consul-connect/haproxy/dataplane" - "github.com/criteo/haproxy-consul-connect/haproxy/haproxy_cmd" - "github.com/criteo/haproxy-consul-connect/haproxy/state" - "github.com/criteo/haproxy-consul-connect/lib" spoe "github.com/criteo/haproxy-spoe-go" + "github.com/haproxytech/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/haproxy/dataplane" + "github.com/haproxytech/haproxy-consul-connect/haproxy/haproxy_cmd" + "github.com/haproxytech/haproxy-consul-connect/haproxy/state" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/hashicorp/consul/api" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" diff --git a/haproxy/haproxy_cmd/cmd.go b/haproxy/haproxy_cmd/cmd.go index c6af717..6e19473 100644 --- a/haproxy/haproxy_cmd/cmd.go +++ b/haproxy/haproxy_cmd/cmd.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "syscall" - "github.com/criteo/haproxy-consul-connect/haproxy/halog" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/haproxy/halog" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/haproxy/haproxy_cmd/cmd_test.go b/haproxy/haproxy_cmd/cmd_test.go index 144a88f..799f153 100644 --- a/haproxy/haproxy_cmd/cmd_test.go +++ b/haproxy/haproxy_cmd/cmd_test.go @@ -3,7 +3,7 @@ package haproxy_cmd import ( "testing" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/stretchr/testify/assert" ) diff --git a/haproxy/haproxy_cmd/run.go b/haproxy/haproxy_cmd/run.go index e73ce92..53422d6 100644 --- a/haproxy/haproxy_cmd/run.go +++ b/haproxy/haproxy_cmd/run.go @@ -7,8 +7,8 @@ import ( "os" "time" - "github.com/criteo/haproxy-consul-connect/haproxy/dataplane" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/haproxy/dataplane" + "github.com/haproxytech/haproxy-consul-connect/lib" ) type Config struct { diff --git a/haproxy/spoe.go b/haproxy/spoe.go index 295eb81..035e24e 100644 --- a/haproxy/spoe.go +++ b/haproxy/spoe.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/criteo/haproxy-consul-connect/consul" spoe "github.com/criteo/haproxy-spoe-go" + "github.com/haproxytech/haproxy-consul-connect/consul" "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/api" "github.com/pkg/errors" diff --git a/haproxy/state.go b/haproxy/state.go index 841e6ea..cc25fcb 100644 --- a/haproxy/state.go +++ b/haproxy/state.go @@ -4,9 +4,9 @@ import ( "sync/atomic" "time" - "github.com/criteo/haproxy-consul-connect/consul" - "github.com/criteo/haproxy-consul-connect/haproxy/state" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/haproxy/state" + "github.com/haproxytech/haproxy-consul-connect/lib" log "github.com/sirupsen/logrus" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/haproxy/state/downstream.go b/haproxy/state/downstream.go index a24c33b..f66de69 100644 --- a/haproxy/state/downstream.go +++ b/haproxy/state/downstream.go @@ -3,7 +3,7 @@ package state import ( "fmt" - "github.com/criteo/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/consul" "github.com/haproxytech/models" ) diff --git a/haproxy/state/from_ha.go b/haproxy/state/from_ha.go index c42c453..14380e6 100644 --- a/haproxy/state/from_ha.go +++ b/haproxy/state/from_ha.go @@ -101,8 +101,8 @@ func FromHAProxy(ha HAProxyRead) (State, error) { } state.Backends = append(state.Backends, Backend{ - Backend: b, - Servers: servers, + Backend: b, + Servers: servers, LogTarget: lt, }) } diff --git a/haproxy/state/from_ha_test.go b/haproxy/state/from_ha_test.go index e22e05b..97a6f18 100644 --- a/haproxy/state/from_ha_test.go +++ b/haproxy/state/from_ha_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/criteo/haproxy-consul-connect/haproxy/haproxy_cmd" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/haproxy/haproxy_cmd" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/stretchr/testify/require" ) diff --git a/haproxy/state/snapshot_test.go b/haproxy/state/snapshot_test.go index fc20cea..7a06271 100644 --- a/haproxy/state/snapshot_test.go +++ b/haproxy/state/snapshot_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/criteo/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/consul" "github.com/haproxytech/models" "github.com/stretchr/testify/require" ) diff --git a/haproxy/state/states.go b/haproxy/state/states.go index aa8aa5d..fce1db6 100644 --- a/haproxy/state/states.go +++ b/haproxy/state/states.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/criteo/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/consul" "github.com/haproxytech/models" ) diff --git a/haproxy/state/upstream.go b/haproxy/state/upstream.go index 949bd8d..4ded654 100644 --- a/haproxy/state/upstream.go +++ b/haproxy/state/upstream.go @@ -3,7 +3,7 @@ package state import ( "fmt" - "github.com/criteo/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/consul" "github.com/haproxytech/models" ) diff --git a/haproxy/stats.go b/haproxy/stats.go index adf75da..fd62142 100644 --- a/haproxy/stats.go +++ b/haproxy/stats.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/criteo/haproxy-consul-connect/haproxy/dataplane" + "github.com/haproxytech/haproxy-consul-connect/haproxy/dataplane" "github.com/haproxytech/models" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/haproxy_test.go b/haproxy_test.go index ddc6df6..1c7d820 100644 --- a/haproxy_test.go +++ b/haproxy_test.go @@ -7,7 +7,7 @@ import ( "net/http" - "github.com/criteo/haproxy-consul-connect/lib" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/hashicorp/consul/api" "github.com/stretchr/testify/require" ) diff --git a/main.go b/main.go index f698bfc..667bd87 100644 --- a/main.go +++ b/main.go @@ -8,12 +8,12 @@ import ( log "github.com/sirupsen/logrus" - haproxy "github.com/criteo/haproxy-consul-connect/haproxy" - "github.com/criteo/haproxy-consul-connect/lib" + haproxy "github.com/haproxytech/haproxy-consul-connect/haproxy" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/hashicorp/consul/api" - "github.com/criteo/haproxy-consul-connect/consul" + "github.com/haproxytech/haproxy-consul-connect/consul" ) // Version is set by Travis build diff --git a/utils_test.go b/utils_test.go index db611e5..0591ecf 100644 --- a/utils_test.go +++ b/utils_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/criteo/haproxy-consul-connect/consul" - haproxy "github.com/criteo/haproxy-consul-connect/haproxy" - "github.com/criteo/haproxy-consul-connect/lib" "github.com/facebookgo/freeport" + "github.com/haproxytech/haproxy-consul-connect/consul" + haproxy "github.com/haproxytech/haproxy-consul-connect/haproxy" + "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/testrpc"