Skip to content

Commit

Permalink
Formalize v2 module
Browse files Browse the repository at this point in the history
  • Loading branch information
Victor Castell committed Sep 12, 2019
1 parent 0f733d2 commit 0d62325
Show file tree
Hide file tree
Showing 38 changed files with 45 additions and 43 deletions.
2 changes: 1 addition & 1 deletion builtin/bins/dkron-executor-http/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"time"

"github.com/armon/circbuf"
"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-executor-http/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
)

func TestExecute(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-executor-http/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
dkplugin "github.com/distribworks/dkron/plugin"
dkplugin "github.com/distribworks/dkron/v2/plugin"
"github.com/hashicorp/go-plugin"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-executor-shell/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
dkplugin "github.com/distribworks/dkron/plugin"
dkplugin "github.com/distribworks/dkron/v2/plugin"
"github.com/hashicorp/go-plugin"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-executor-shell/shell.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/armon/circbuf"
"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/mattn/go-shellwords"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-files/files_output.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-files/files_output_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-files/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/distribworks/dkron/plugin"
"github.com/distribworks/dkron/v2/plugin"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-log/log_output.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-log/log_output_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-log/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/distribworks/dkron/plugin"
"github.com/distribworks/dkron/v2/plugin"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-syslog/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/distribworks/dkron/plugin"
"github.com/distribworks/dkron/v2/plugin"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-syslog/syslog_output.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/hashicorp/go-syslog"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/bins/dkron-processor-syslog/syslog_output_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"syscall"
"time"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/hashicorp/go-plugin"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/dkron.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"strings"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion cmd/leave.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/plugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"

"github.com/distribworks/dkron/dkron"
dkplugin "github.com/distribworks/dkron/plugin"
"github.com/distribworks/dkron/v2/dkron"
dkplugin "github.com/distribworks/dkron/v2/plugin"
"github.com/hashicorp/go-plugin"
"github.com/kardianos/osext"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/raft.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"fmt"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/ryanuber/columnize"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"fmt"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/hashicorp/serf/serf"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion dkron/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

metrics "github.com/armon/go-metrics"
"github.com/distribworks/dkron/proto"
"github.com/distribworks/dkron/v2/proto"
"github.com/hashicorp/memberlist"
"github.com/hashicorp/raft"
raftboltdb "github.com/hashicorp/raft-boltdb"
Expand Down
2 changes: 1 addition & 1 deletion dkron/assets/generate.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package assets

//go:generate vfsgendev -source="github.com/distribworks/dkron/dkron/assets".Assets
//go:generate vfsgendev -source="github.com/distribworks/dkron/v2/dkron/assets".Assets
4 changes: 2 additions & 2 deletions dkron/dashboard.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"time"

"github.com/distribworks/dkron/dkron/assets"
"github.com/distribworks/dkron/dkron/templates"
"github.com/distribworks/dkron/v2/dkron/assets"
"github.com/distribworks/dkron/v2/dkron/templates"
"github.com/gin-contrib/multitemplate"
"github.com/gin-gonic/gin"
)
Expand Down
2 changes: 1 addition & 1 deletion dkron/execution.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"time"

"github.com/distribworks/dkron/proto"
"github.com/distribworks/dkron/v2/proto"
"github.com/golang/protobuf/ptypes"
)

Expand Down
2 changes: 1 addition & 1 deletion dkron/fsm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"
"sync"

dkronpb "github.com/distribworks/dkron/proto"
dkronpb "github.com/distribworks/dkron/v2/proto"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/raft"
)
Expand Down
2 changes: 1 addition & 1 deletion dkron/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

metrics "github.com/armon/go-metrics"
"github.com/distribworks/dkron/proto"
"github.com/distribworks/dkron/v2/proto"
pb "github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/empty"
"github.com/hashicorp/raft"
Expand Down
2 changes: 1 addition & 1 deletion dkron/grpc_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

metrics "github.com/armon/go-metrics"
"github.com/distribworks/dkron/proto"
"github.com/distribworks/dkron/v2/proto"
"github.com/golang/protobuf/ptypes/empty"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
Expand Down
6 changes: 3 additions & 3 deletions dkron/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"time"

"github.com/dgraph-io/badger"
"github.com/distribworks/dkron/cron"
"github.com/distribworks/dkron/ntime"
"github.com/distribworks/dkron/proto"
"github.com/distribworks/dkron/v2/cron"
"github.com/distribworks/dkron/v2/ntime"
"github.com/distribworks/dkron/v2/proto"
"github.com/golang/protobuf/ptypes"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion dkron/scheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"expvar"

"github.com/armon/go-metrics"
"github.com/distribworks/dkron/cron"
"github.com/distribworks/dkron/v2/cron"
"github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions dkron/store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"time"

"github.com/dgraph-io/badger"
"github.com/distribworks/dkron/cron"
dkronpb "github.com/distribworks/dkron/proto"
"github.com/distribworks/dkron/v2/cron"
dkronpb "github.com/distribworks/dkron/v2/proto"
"github.com/golang/protobuf/proto"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion dkron/templates/generate.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package templates

//go:generate vfsgendev -source="github.com/distribworks/dkron/dkron/templates".Templates
//go:generate vfsgendev -source="github.com/distribworks/dkron/v2/dkron/templates".Templates
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/distribworks/dkron
module github.com/distribworks/dkron/v2

require (
github.com/DataDog/datadog-go v0.0.0-20170427165718-0ddda6bee211 // indirect
Expand Down Expand Up @@ -55,3 +55,5 @@ require (
)

replace github.com/hashicorp/mdns => github.com/hashicorp/mdns v1.0.1

go 1.13
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package main

import (
"github.com/distribworks/dkron/cmd"
"github.com/distribworks/dkron/v2/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion plugin/execution_processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package plugin
import (
"net/rpc"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/hashicorp/go-plugin"
)

Expand Down
2 changes: 1 addition & 1 deletion plugin/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"google.golang.org/grpc"

"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/hashicorp/go-plugin"
)

Expand Down
2 changes: 1 addition & 1 deletion plugin/serve.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package plugin

import (
"github.com/distribworks/dkron/dkron"
"github.com/distribworks/dkron/v2/dkron"
"github.com/hashicorp/go-plugin"
)

Expand Down
2 changes: 1 addition & 1 deletion website/content/usage/plugins/develop.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ With the directory made, create a main.go file. This project will be a binary so
package main

import (
"github.com/distribworks/dkron/plugin"
"github.com/distribworks/dkron/v2/plugin"
)

func main() {
Expand Down

0 comments on commit 0d62325

Please sign in to comment.