Skip to content

fix(deps): remove replace directive for github.com/openark/golib #64

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(deps): remove replace directive for github.com/openark/golib #64

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: 0 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ require (
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11
github.com/mattn/go-sqlite3 v1.14.22
github.com/montanaflynn/stats v0.7.1
github.com/openark/golib v0.0.0-20210531070646-355f37940af8
github.com/outbrain/zookeepercli v1.0.12
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
Expand Down Expand Up @@ -54,7 +53,6 @@ require (

replace (
github.com/hashicorp/raft => github.com/openark/raft v0.0.0-20170918052300-fba9f909f7fe
github.com/openark/golib => ./go/golib
golang.org/x/text v0.3.0 => golang.org/x/text v0.3.8
golang.org/x/text v0.3.7 => golang.org/x/text v0.3.8
)
4 changes: 2 additions & 2 deletions go/agent/agent_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"sync"
"time"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
"github.com/openark/orchestrator/go/inst"
Expand Down
2 changes: 1 addition & 1 deletion go/agent/instance_topology_agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"encoding/json"
"fmt"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/inst"
)

Expand Down
4 changes: 2 additions & 2 deletions go/app/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"strings"
"time"

"github.com/openark/golib/log"
"github.com/openark/golib/util"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/util"
"github.com/openark/orchestrator/go/agent"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/inst"
Expand Down
4 changes: 2 additions & 2 deletions go/app/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app

import (
"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion go/app/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/martini-contrib/auth"
"github.com/martini-contrib/gzip"
"github.com/martini-contrib/render"
"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
)

const discoveryMetricsName = "DISCOVERY_METRICS"
Expand Down
4 changes: 2 additions & 2 deletions go/attributes/attributes_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"net/http"
"strings"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/db"
)

Expand Down
2 changes: 1 addition & 1 deletion go/cmd/orchestrator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"os"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/app"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/inst"
Expand Down
2 changes: 1 addition & 1 deletion go/collection/collection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import (
"sync"
"time"

// "github.com/openark/golib/log"
// "github.com/openark/orchestrator/go/golib/log"

"github.com/openark/orchestrator/go/config"
)
Expand Down
2 changes: 1 addition & 1 deletion go/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"gopkg.in/gcfg.v1"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions go/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package config
import (
"testing"

"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions go/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"sync"
"time"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/config"
)

Expand Down
4 changes: 2 additions & 2 deletions go/db/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"time"

"github.com/go-sql-driver/mysql"
"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/patrickmn/go-cache"
"github.com/rcrowley/go-metrics"

Expand Down
2 changes: 1 addition & 1 deletion go/discovery/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sync"
"time"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/inst"
)
Expand Down
2 changes: 1 addition & 1 deletion go/discovery/queue_aggregated_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package discovery
import (
"github.com/montanaflynn/stats"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
)

// AggregatedQueueMetrics contains aggregate information some part queue metrics
Expand Down
3 changes: 0 additions & 3 deletions go/golib/go.mod
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion go/golib/sqlutils/sqlutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

_ "github.com/go-sql-driver/mysql"
_ "github.com/mattn/go-sqlite3"
"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
)

const DateTimeFormat = "2006-01-02 15:04:05.999999"
Expand Down
4 changes: 2 additions & 2 deletions go/http/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/martini-contrib/auth"
"github.com/martini-contrib/render"

"github.com/openark/golib/log"
"github.com/openark/golib/util"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/util"

fqdn "github.com/Showmax/go-fqdn"
"github.com/openark/orchestrator/go/agent"
Expand Down
4 changes: 2 additions & 2 deletions go/http/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/go-martini/martini"

"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
)

Expand Down
2 changes: 1 addition & 1 deletion go/http/raft_reverse_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httputil"
"net/url"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"

"github.com/go-martini/martini"
"github.com/openark/orchestrator/go/raft"
Expand Down
4 changes: 2 additions & 2 deletions go/inst/analysis_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
orcraft "github.com/openark/orchestrator/go/raft"
"github.com/openark/orchestrator/go/util"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/patrickmn/go-cache"
"github.com/rcrowley/go-metrics"
)
Expand Down
4 changes: 2 additions & 2 deletions go/inst/analysis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package inst
import (
"testing"

"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
)

Expand Down
4 changes: 2 additions & 2 deletions go/inst/audit_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"os"
"time"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
"github.com/rcrowley/go-metrics"
Expand Down
4 changes: 2 additions & 2 deletions go/inst/binlog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package inst

import (
"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
"testing"
)
Expand Down
4 changes: 2 additions & 2 deletions go/inst/candidate_database_instance_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package inst
import (
"fmt"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"

"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
Expand Down
4 changes: 2 additions & 2 deletions go/inst/cluster_alias_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package inst
import (
"fmt"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
)
Expand Down
2 changes: 1 addition & 1 deletion go/inst/cluster_domain_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package inst

import (
"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
)
Expand Down
4 changes: 2 additions & 2 deletions go/inst/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package inst
import (
"fmt"

"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion go/inst/dead_instance_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/config"
"github.com/rcrowley/go-metrics"
)
Expand Down
4 changes: 2 additions & 2 deletions go/inst/downtime_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"time"

"github.com/openark/golib/log"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
)
Expand Down
2 changes: 1 addition & 1 deletion go/inst/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"github.com/openark/golib/math"
"github.com/openark/orchestrator/go/golib/math"
"github.com/openark/orchestrator/go/config"
)

Expand Down
2 changes: 1 addition & 1 deletion go/inst/instance_binlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"regexp"
"strings"

"github.com/openark/golib/log"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/config"
)

Expand Down
6 changes: 3 additions & 3 deletions go/inst/instance_binlog_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"strings"
"time"

"github.com/openark/golib/log"
"github.com/openark/golib/math"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/math"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/openark/orchestrator/go/config"
"github.com/openark/orchestrator/go/db"
"github.com/patrickmn/go-cache"
Expand Down
6 changes: 3 additions & 3 deletions go/inst/instance_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (

"github.com/go-sql-driver/mysql"

"github.com/openark/golib/log"
"github.com/openark/golib/math"
"github.com/openark/golib/sqlutils"
"github.com/openark/orchestrator/go/golib/log"
"github.com/openark/orchestrator/go/golib/math"
"github.com/openark/orchestrator/go/golib/sqlutils"
"github.com/patrickmn/go-cache"
"github.com/rcrowley/go-metrics"
"github.com/sjmudd/stopwatch"
Expand Down
2 changes: 1 addition & 1 deletion go/inst/instance_dao_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

test "github.com/openark/golib/tests"
test "github.com/openark/orchestrator/go/golib/tests"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions go/inst/instance_key_map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/rand"
"testing"

"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
)

Expand Down
4 changes: 2 additions & 2 deletions go/inst/instance_key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package inst
import (
"testing"

"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
)

Expand Down
4 changes: 2 additions & 2 deletions go/inst/instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package inst

import (
"github.com/openark/golib/log"
test "github.com/openark/golib/tests"
"github.com/openark/orchestrator/go/golib/log"
test "github.com/openark/orchestrator/go/golib/tests"
"github.com/openark/orchestrator/go/config"
"testing"
)
Expand Down
Loading