Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REFACTOR Updated references to go mod github.com/haproxytech/haproxy-consul-connect #26

Merged
merged 1 commit into from
Apr 15, 2020
Merged

REFACTOR Updated references to go mod github.com/haproxytech/haproxy-consul-connect #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion consul/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ type Logger interface {
Warnf(format string, args ...interface{})
// Errorf Display error message
Errorf(format string, args ...interface{})
}
}
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/criteo/haproxy-consul-connect
module github.com/haproxytech/haproxy-consul-connect

go 1.12

Expand Down
2 changes: 1 addition & 1 deletion haproxy/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion haproxy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions haproxy/haproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions haproxy/haproxy_cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion haproxy/haproxy_cmd/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions haproxy/haproxy_cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion haproxy/spoe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions haproxy/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion haproxy/state/downstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions haproxy/state/from_ha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
}
Expand Down
4 changes: 2 additions & 2 deletions haproxy/state/from_ha_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion haproxy/state/snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion haproxy/state/states.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion haproxy/state/upstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion haproxy/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion haproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down