From efaf658647987f84ad89972e502e79655f544f40 Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Sat, 10 Feb 2024 17:13:29 +0100 Subject: [PATCH] Bump module to v4 --- .goreleaser.yml | 2 +- Makefile | 6 ++--- .../dkron-executor-gcppubsub/gcppubsub.go | 19 +++++++------- .../gcppubsub_test.go | 2 +- builtin/bins/dkron-executor-gcppubsub/main.go | 2 +- builtin/bins/dkron-executor-grpc/grpc.go | 17 +++++++------ builtin/bins/dkron-executor-grpc/grpc_test.go | 9 ++++--- builtin/bins/dkron-executor-grpc/main.go | 2 +- builtin/bins/dkron-executor-http/http.go | 25 ++++++++++--------- builtin/bins/dkron-executor-http/http_test.go | 2 +- builtin/bins/dkron-executor-http/main.go | 2 +- builtin/bins/dkron-executor-kafka/kafka.go | 17 +++++++------ .../bins/dkron-executor-kafka/kafka_test.go | 4 +-- builtin/bins/dkron-executor-kafka/main.go | 2 +- builtin/bins/dkron-executor-nats/main.go | 2 +- builtin/bins/dkron-executor-nats/nats.go | 21 ++++++++-------- builtin/bins/dkron-executor-nats/nats_test.go | 2 +- builtin/bins/dkron-executor-rabbitmq/main.go | 2 +- .../bins/dkron-executor-rabbitmq/rabbitmq.go | 15 +++++------ .../dkron-executor-rabbitmq/rabbitmq_test.go | 2 +- .../dkron-processor-files/files_output.go | 4 +-- .../files_output_test.go | 4 +-- builtin/bins/dkron-processor-files/main.go | 2 +- .../dkron-processor-fluent/fluent_output.go | 4 +-- builtin/bins/dkron-processor-fluent/main.go | 2 +- .../bins/dkron-processor-log/log_output.go | 4 +-- .../dkron-processor-log/log_output_test.go | 4 +-- builtin/bins/dkron-processor-log/main.go | 2 +- builtin/bins/dkron-processor-syslog/main.go | 2 +- .../dkron-processor-syslog/syslog_output.go | 4 +-- .../syslog_output_test.go | 4 +-- cmd/agent.go | 2 +- cmd/agent_test.go | 2 +- cmd/dkron.go | 4 +-- cmd/leave.go | 2 +- cmd/plugins.go | 4 +-- cmd/raft.go | 2 +- cmd/shell.go | 4 +-- cmd/version.go | 2 +- dkron/agent.go | 4 +-- dkron/execution.go | 2 +- dkron/fsm.go | 2 +- dkron/grpc.go | 4 +-- dkron/grpc_agent.go | 2 +- dkron/grpc_client.go | 2 +- dkron/job.go | 8 +++--- dkron/job_test.go | 6 ++--- dkron/scheduler.go | 2 +- dkron/scheduler_test.go | 2 +- dkron/store.go | 2 +- go.mod | 2 +- main.go | 2 +- plugin/execution_processor.go | 2 +- plugin/executor.go | 2 +- plugin/executor_test.go | 2 +- plugin/shell/shell.go | 4 +-- 56 files changed, 135 insertions(+), 128 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index c0b33c14c..ff6b7315e 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -74,7 +74,7 @@ builds: id: dkron binary: dkron ldflags: - - -s -w -X github.com/distribworks/dkron/v3/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v3/dkron.Codename=Abaniko + - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko nfpms: - diff --git a/Makefile b/Makefile index d206a2d61..8b6fa33bd 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,10 @@ clean: GOBIN=`pwd` go clean -i ./builtin/... GOBIN=`pwd` go clean -.PHONY: doc apidoc test ui updatetestcert -doc: +.PHONY: docs apidoc test ui updatetestcert +docs: #scripts/run doc --dir website/docs/cli - cd website; yarn build --out-dir ../public + cd website; bun run build --out-dir ../public ghp-import -p public test: diff --git a/builtin/bins/dkron-executor-gcppubsub/gcppubsub.go b/builtin/bins/dkron-executor-gcppubsub/gcppubsub.go index e4b1a28f0..26ce6b46c 100644 --- a/builtin/bins/dkron-executor-gcppubsub/gcppubsub.go +++ b/builtin/bins/dkron-executor-gcppubsub/gcppubsub.go @@ -7,8 +7,8 @@ import ( "fmt" "cloud.google.com/go/pubsub" - dkplugin "github.com/distribworks/dkron/v3/plugin" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + dktypes "github.com/distribworks/dkron/v4/plugin/types" ) // GCPPubSub plugin publish message to topic when Execute method is called. @@ -24,12 +24,13 @@ const ( // Execute Process method of the plugin // "executor": "gcppubsub", -// "executor_config": { -// "project": "project-id", -// "topic": "topic-name", -// "data": "aGVsbG8gd29ybGQ=" // Optional. base64 encoded data -// "attributes": "{\"hello\":\"world\",\"waka\":\"paka\"}" // JSON serialized attributes -// } +// +// "executor_config": { +// "project": "project-id", +// "topic": "topic-name", +// "data": "aGVsbG8gd29ybGQ=" // Optional. base64 encoded data +// "attributes": "{\"hello\":\"world\",\"waka\":\"paka\"}" // JSON serialized attributes +// } func (g *GCPPubSub) Execute(args *dktypes.ExecuteRequest, _ dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) { out, err := g.ExecuteImpl(args) resp := &dktypes.ExecuteResponse{Output: out} @@ -91,7 +92,7 @@ func configToPubSubMessage(config map[string]string) (*pubsub.Message, error) { var attributes map[string]string if attributesJSON != "" { - if err := json.Unmarshal([]byte(attributesJSON), &attributes); err != nil { + if err := json.Unmarshal([]byte(attributesJSON), &attributes); err != nil { return nil, fmt.Errorf("invalid attributes JSON: %w", err) } msg.Attributes = attributes diff --git a/builtin/bins/dkron-executor-gcppubsub/gcppubsub_test.go b/builtin/bins/dkron-executor-gcppubsub/gcppubsub_test.go index add2f3633..025fe6613 100644 --- a/builtin/bins/dkron-executor-gcppubsub/gcppubsub_test.go +++ b/builtin/bins/dkron-executor-gcppubsub/gcppubsub_test.go @@ -4,7 +4,7 @@ import ( "testing" "cloud.google.com/go/pubsub" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dktypes "github.com/distribworks/dkron/v4/plugin/types" "github.com/stretchr/testify/assert" ) diff --git a/builtin/bins/dkron-executor-gcppubsub/main.go b/builtin/bins/dkron-executor-gcppubsub/main.go index 11e4aa956..d12a4f8aa 100644 --- a/builtin/bins/dkron-executor-gcppubsub/main.go +++ b/builtin/bins/dkron-executor-gcppubsub/main.go @@ -1,7 +1,7 @@ package main import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" ) diff --git a/builtin/bins/dkron-executor-grpc/grpc.go b/builtin/bins/dkron-executor-grpc/grpc.go index f1047f0de..5f8833036 100644 --- a/builtin/bins/dkron-executor-grpc/grpc.go +++ b/builtin/bins/dkron-executor-grpc/grpc.go @@ -9,8 +9,8 @@ import ( "time" "github.com/armon/circbuf" - dkplugin "github.com/distribworks/dkron/v3/plugin" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + dktypes "github.com/distribworks/dkron/v4/plugin/types" "github.com/fullstorydev/grpcurl" "github.com/jhump/protoreflect/grpcreflect" "github.com/pkg/errors" @@ -33,12 +33,13 @@ type GRPC struct{} // Execute Process method of the plugin // "executor": "grpc", -// "executor_config": { -// "url": "127.0.0.1:9000/demo.DemoService/Demo", // Request url -// "body": "", // POST body -// "timeout": "30", // Request timeout, unit seconds -// "expectCode": "0", // Expect response code, any of the described here https://grpc.github.io/grpc/core/md_doc_statuscodes.html -// } +// +// "executor_config": { +// "url": "127.0.0.1:9000/demo.DemoService/Demo", // Request url +// "body": "", // POST body +// "timeout": "30", // Request timeout, unit seconds +// "expectCode": "0", // Expect response code, any of the described here https://grpc.github.io/grpc/core/md_doc_statuscodes.html +// } func (g *GRPC) Execute(args *dktypes.ExecuteRequest, _ dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) { out, err := g.ExecuteImpl(args) resp := &dktypes.ExecuteResponse{Output: out} diff --git a/builtin/bins/dkron-executor-grpc/grpc_test.go b/builtin/bins/dkron-executor-grpc/grpc_test.go index 0496d1efe..7b914a01f 100644 --- a/builtin/bins/dkron-executor-grpc/grpc_test.go +++ b/builtin/bins/dkron-executor-grpc/grpc_test.go @@ -2,12 +2,13 @@ package main import ( "context" - "github.com/distribworks/dkron/v3/builtin/bins/dkron-executor-grpc/test" - dktypes "github.com/distribworks/dkron/v3/plugin/types" - "google.golang.org/grpc" - "google.golang.org/grpc/reflection" "net" "testing" + + "github.com/distribworks/dkron/v4/builtin/bins/dkron-executor-grpc/test" + dktypes "github.com/distribworks/dkron/v4/plugin/types" + "google.golang.org/grpc" + "google.golang.org/grpc/reflection" ) type DemoServer struct { diff --git a/builtin/bins/dkron-executor-grpc/main.go b/builtin/bins/dkron-executor-grpc/main.go index 3c820f36b..596ba08fd 100644 --- a/builtin/bins/dkron-executor-grpc/main.go +++ b/builtin/bins/dkron-executor-grpc/main.go @@ -1,7 +1,7 @@ package main import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" ) diff --git a/builtin/bins/dkron-executor-http/http.go b/builtin/bins/dkron-executor-http/http.go index 052083a2a..4cb637546 100644 --- a/builtin/bins/dkron-executor-http/http.go +++ b/builtin/bins/dkron-executor-http/http.go @@ -16,8 +16,8 @@ import ( "time" "github.com/armon/circbuf" - dkplugin "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" ) const ( @@ -35,16 +35,17 @@ type HTTP struct { // Execute Process method of the plugin // "executor": "http", -// "executor_config": { -// "method": "GET", // Request method in uppercase -// "url": "http://example.com", // Request url -// "headers": "[]" // Json string, such as "[\"Content-Type: application/json\"]" -// "body": "", // POST body -// "timeout": "30", // Request timeout, unit seconds -// "expectCode": "200", // Expect response code, such as 200,206 -// "expectBody": "", // Expect response body, support regexp, such as /success/ -// "debug": "true" // Debug option, will log everything when this option is not empty -// } +// +// "executor_config": { +// "method": "GET", // Request method in uppercase +// "url": "http://example.com", // Request url +// "headers": "[]" // Json string, such as "[\"Content-Type: application/json\"]" +// "body": "", // POST body +// "timeout": "30", // Request timeout, unit seconds +// "expectCode": "200", // Expect response code, such as 200,206 +// "expectBody": "", // Expect response body, support regexp, such as /success/ +// "debug": "true" // Debug option, will log everything when this option is not empty +// } func (s *HTTP) Execute(args *types.ExecuteRequest, cb dkplugin.StatusHelper) (*types.ExecuteResponse, error) { out, err := s.ExecuteImpl(args) resp := &types.ExecuteResponse{Output: out} diff --git a/builtin/bins/dkron-executor-http/http_test.go b/builtin/bins/dkron-executor-http/http_test.go index b2308042e..febe634c1 100644 --- a/builtin/bins/dkron-executor-http/http_test.go +++ b/builtin/bins/dkron-executor-http/http_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/stretchr/testify/assert" ) diff --git a/builtin/bins/dkron-executor-http/main.go b/builtin/bins/dkron-executor-http/main.go index 6aba43b62..3d262017c 100644 --- a/builtin/bins/dkron-executor-http/main.go +++ b/builtin/bins/dkron-executor-http/main.go @@ -1,7 +1,7 @@ package main import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" ) diff --git a/builtin/bins/dkron-executor-kafka/kafka.go b/builtin/bins/dkron-executor-kafka/kafka.go index 0dea3d2f0..1db314f6d 100644 --- a/builtin/bins/dkron-executor-kafka/kafka.go +++ b/builtin/bins/dkron-executor-kafka/kafka.go @@ -9,8 +9,8 @@ import ( "github.com/Shopify/sarama" "github.com/armon/circbuf" - dkplugin "github.com/distribworks/dkron/v3/plugin" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + dktypes "github.com/distribworks/dkron/v4/plugin/types" ) const ( @@ -26,12 +26,13 @@ type Kafka struct { // Execute Process method of the plugin // "executor": "kafka", -// "executor_config": { -// "brokerAddress": "192.168.59.103:9092", // kafka broker url -// "key": "", -// "message": "", -// "topic": "publishTopic" -// } +// +// "executor_config": { +// "brokerAddress": "192.168.59.103:9092", // kafka broker url +// "key": "", +// "message": "", +// "topic": "publishTopic" +// } func (s *Kafka) Execute(args *dktypes.ExecuteRequest, cb dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) { out, err := s.ExecuteImpl(args) diff --git a/builtin/bins/dkron-executor-kafka/kafka_test.go b/builtin/bins/dkron-executor-kafka/kafka_test.go index 2c67a7851..da48d0b81 100644 --- a/builtin/bins/dkron-executor-kafka/kafka_test.go +++ b/builtin/bins/dkron-executor-kafka/kafka_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dktypes "github.com/distribworks/dkron/v4/plugin/types" ) func TestProduceExecuteWithKey(t *testing.T) { @@ -44,4 +44,4 @@ func TestProduceExecuteWithoutKey(t *testing.T) { if err != nil { t.Fatal(err) } -} \ No newline at end of file +} diff --git a/builtin/bins/dkron-executor-kafka/main.go b/builtin/bins/dkron-executor-kafka/main.go index 5754d0499..7fda33be8 100644 --- a/builtin/bins/dkron-executor-kafka/main.go +++ b/builtin/bins/dkron-executor-kafka/main.go @@ -1,7 +1,7 @@ package main import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" ) diff --git a/builtin/bins/dkron-executor-nats/main.go b/builtin/bins/dkron-executor-nats/main.go index d0c63db8c..b335e9d6e 100644 --- a/builtin/bins/dkron-executor-nats/main.go +++ b/builtin/bins/dkron-executor-nats/main.go @@ -1,7 +1,7 @@ package main import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" ) diff --git a/builtin/bins/dkron-executor-nats/nats.go b/builtin/bins/dkron-executor-nats/nats.go index 844f5eadd..22e311c52 100644 --- a/builtin/bins/dkron-executor-nats/nats.go +++ b/builtin/bins/dkron-executor-nats/nats.go @@ -7,8 +7,8 @@ import ( "github.com/armon/circbuf" "github.com/nats-io/nats.go" - dkplugin "github.com/distribworks/dkron/v3/plugin" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + dktypes "github.com/distribworks/dkron/v4/plugin/types" ) const ( @@ -24,13 +24,14 @@ type Nats struct { // Execute Process method of the plugin // "executor": "nats", -// "executor_config": { -// "url": "tls://nats.demo.io:4443", // nats server url -// "message": "", -// "subject": "Subject", -// "userName":"test@hbh.dfg", -// "password":"dfdffs" -// } +// +// "executor_config": { +// "url": "tls://nats.demo.io:4443", // nats server url +// "message": "", +// "subject": "Subject", +// "userName":"test@hbh.dfg", +// "password":"dfdffs" +// } func (s *Nats) Execute(args *dktypes.ExecuteRequest, cb dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) { out, err := s.ExecuteImpl(args) @@ -73,7 +74,7 @@ func (s *Nats) ExecuteImpl(args *dktypes.ExecuteRequest) ([]byte, error) { if debug { log.Printf("request %#v\n\n", nc) } - + if nc.IsConnected() { defer nc.Flush() defer nc.Close() diff --git a/builtin/bins/dkron-executor-nats/nats_test.go b/builtin/bins/dkron-executor-nats/nats_test.go index 2958dad78..148246cf7 100644 --- a/builtin/bins/dkron-executor-nats/nats_test.go +++ b/builtin/bins/dkron-executor-nats/nats_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dktypes "github.com/distribworks/dkron/v4/plugin/types" ) func TestPublishExecute(t *testing.T) { diff --git a/builtin/bins/dkron-executor-rabbitmq/main.go b/builtin/bins/dkron-executor-rabbitmq/main.go index b7fd2ce48..5fcb23238 100644 --- a/builtin/bins/dkron-executor-rabbitmq/main.go +++ b/builtin/bins/dkron-executor-rabbitmq/main.go @@ -1,7 +1,7 @@ package main import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" ) diff --git a/builtin/bins/dkron-executor-rabbitmq/rabbitmq.go b/builtin/bins/dkron-executor-rabbitmq/rabbitmq.go index b6881b106..bb0db7964 100644 --- a/builtin/bins/dkron-executor-rabbitmq/rabbitmq.go +++ b/builtin/bins/dkron-executor-rabbitmq/rabbitmq.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "errors" - dkplugin "github.com/distribworks/dkron/v3/plugin" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + dktypes "github.com/distribworks/dkron/v4/plugin/types" "github.com/streadway/amqp" ) @@ -15,11 +15,12 @@ type RabbitMQ struct { // Execute method of the plugin // "executor": "rabbitmq", -// "executor_config": { -// "url": "amqp://guest:guest@localhost:5672/", // rabbitmq server url -// "text": "hello world!", // or "base64" to send bytes as rabbitmq message -// "queue": "test", // -// } +// +// "executor_config": { +// "url": "amqp://guest:guest@localhost:5672/", // rabbitmq server url +// "text": "hello world!", // or "base64" to send bytes as rabbitmq message +// "queue": "test", // +// } func (r *RabbitMQ) Execute(args *dktypes.ExecuteRequest, cb dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) { out, err := r.ExecuteImpl(args, cb) resp := &dktypes.ExecuteResponse{Output: out} diff --git a/builtin/bins/dkron-executor-rabbitmq/rabbitmq_test.go b/builtin/bins/dkron-executor-rabbitmq/rabbitmq_test.go index a8c85ba05..c84911c28 100644 --- a/builtin/bins/dkron-executor-rabbitmq/rabbitmq_test.go +++ b/builtin/bins/dkron-executor-rabbitmq/rabbitmq_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dktypes "github.com/distribworks/dkron/v4/plugin/types" ) func TestPublishExecute(t *testing.T) { diff --git a/builtin/bins/dkron-processor-files/files_output.go b/builtin/bins/dkron-processor-files/files_output.go index a7289a7da..e81983e70 100644 --- a/builtin/bins/dkron-processor-files/files_output.go +++ b/builtin/bins/dkron-processor-files/files_output.go @@ -6,8 +6,8 @@ import ( "os" "strconv" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" log "github.com/sirupsen/logrus" ) diff --git a/builtin/bins/dkron-processor-files/files_output_test.go b/builtin/bins/dkron-processor-files/files_output_test.go index 3e205b984..5d25d0af3 100644 --- a/builtin/bins/dkron-processor-files/files_output_test.go +++ b/builtin/bins/dkron-processor-files/files_output_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" ) diff --git a/builtin/bins/dkron-processor-files/main.go b/builtin/bins/dkron-processor-files/main.go index b656f5318..c31f62b85 100644 --- a/builtin/bins/dkron-processor-files/main.go +++ b/builtin/bins/dkron-processor-files/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/distribworks/dkron/v3/plugin" + "github.com/distribworks/dkron/v4/plugin" ) func main() { diff --git a/builtin/bins/dkron-processor-fluent/fluent_output.go b/builtin/bins/dkron-processor-fluent/fluent_output.go index 5825e4749..a7a3bbf49 100644 --- a/builtin/bins/dkron-processor-fluent/fluent_output.go +++ b/builtin/bins/dkron-processor-fluent/fluent_output.go @@ -3,8 +3,8 @@ package main import ( "strconv" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" log "github.com/sirupsen/logrus" ) diff --git a/builtin/bins/dkron-processor-fluent/main.go b/builtin/bins/dkron-processor-fluent/main.go index 16c744e52..37a543e03 100644 --- a/builtin/bins/dkron-processor-fluent/main.go +++ b/builtin/bins/dkron-processor-fluent/main.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - "github.com/distribworks/dkron/v3/plugin" + "github.com/distribworks/dkron/v4/plugin" "github.com/fluent/fluent-logger-golang/fluent" log "github.com/sirupsen/logrus" ) diff --git a/builtin/bins/dkron-processor-log/log_output.go b/builtin/bins/dkron-processor-log/log_output.go index 5425e15d4..2cf6c2260 100644 --- a/builtin/bins/dkron-processor-log/log_output.go +++ b/builtin/bins/dkron-processor-log/log_output.go @@ -5,8 +5,8 @@ import ( "os" "strconv" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" log "github.com/sirupsen/logrus" ) diff --git a/builtin/bins/dkron-processor-log/log_output_test.go b/builtin/bins/dkron-processor-log/log_output_test.go index 9ce9f8a4a..74a8bec35 100644 --- a/builtin/bins/dkron-processor-log/log_output_test.go +++ b/builtin/bins/dkron-processor-log/log_output_test.go @@ -3,8 +3,8 @@ package main import ( "testing" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" ) diff --git a/builtin/bins/dkron-processor-log/main.go b/builtin/bins/dkron-processor-log/main.go index 3420925a5..858ba220f 100644 --- a/builtin/bins/dkron-processor-log/main.go +++ b/builtin/bins/dkron-processor-log/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/distribworks/dkron/v3/plugin" + "github.com/distribworks/dkron/v4/plugin" ) func main() { diff --git a/builtin/bins/dkron-processor-syslog/main.go b/builtin/bins/dkron-processor-syslog/main.go index 77c0abaea..8f9b1e05f 100644 --- a/builtin/bins/dkron-processor-syslog/main.go +++ b/builtin/bins/dkron-processor-syslog/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/distribworks/dkron/v3/plugin" + "github.com/distribworks/dkron/v4/plugin" ) func main() { diff --git a/builtin/bins/dkron-processor-syslog/syslog_output.go b/builtin/bins/dkron-processor-syslog/syslog_output.go index 276ad5f91..685bcc709 100644 --- a/builtin/bins/dkron-processor-syslog/syslog_output.go +++ b/builtin/bins/dkron-processor-syslog/syslog_output.go @@ -3,8 +3,8 @@ package main import ( "strconv" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" gsyslog "github.com/hashicorp/go-syslog" log "github.com/sirupsen/logrus" ) diff --git a/builtin/bins/dkron-processor-syslog/syslog_output_test.go b/builtin/bins/dkron-processor-syslog/syslog_output_test.go index dcfa7d50e..6307c41dd 100644 --- a/builtin/bins/dkron-processor-syslog/syslog_output_test.go +++ b/builtin/bins/dkron-processor-syslog/syslog_output_test.go @@ -3,8 +3,8 @@ package main import ( "testing" - "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/golang/protobuf/ptypes" "github.com/stretchr/testify/assert" ) diff --git a/cmd/agent.go b/cmd/agent.go index 00213e7a1..5a3f5ad68 100644 --- a/cmd/agent.go +++ b/cmd/agent.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/distribworks/dkron/v3/dkron" + "github.com/distribworks/dkron/v4/dkron" "github.com/hashicorp/go-plugin" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/agent_test.go b/cmd/agent_test.go index de496d45f..5a9a2b8d4 100644 --- a/cmd/agent_test.go +++ b/cmd/agent_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/distribworks/dkron/v3/dkron" + "github.com/distribworks/dkron/v4/dkron" "github.com/spf13/viper" "github.com/stretchr/testify/assert" ) diff --git a/cmd/dkron.go b/cmd/dkron.go index 8410dc805..313d02eda 100644 --- a/cmd/dkron.go +++ b/cmd/dkron.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/distribworks/dkron/v3/dkron" - "github.com/distribworks/dkron/v3/logging" + "github.com/distribworks/dkron/v4/dkron" + "github.com/distribworks/dkron/v4/logging" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/leave.go b/cmd/leave.go index 604ad39bc..fe08eb66a 100644 --- a/cmd/leave.go +++ b/cmd/leave.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/distribworks/dkron/v3/dkron" + "github.com/distribworks/dkron/v4/dkron" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/plugins.go b/cmd/plugins.go index 3ba9394cd..833d80219 100644 --- a/cmd/plugins.go +++ b/cmd/plugins.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/distribworks/dkron/v3/dkron" - dkplugin "github.com/distribworks/dkron/v3/plugin" + "github.com/distribworks/dkron/v4/dkron" + dkplugin "github.com/distribworks/dkron/v4/plugin" "github.com/hashicorp/go-plugin" "github.com/kardianos/osext" "github.com/sirupsen/logrus" diff --git a/cmd/raft.go b/cmd/raft.go index 9bddbcd1c..d1537a065 100644 --- a/cmd/raft.go +++ b/cmd/raft.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/distribworks/dkron/v3/dkron" + "github.com/distribworks/dkron/v4/dkron" "github.com/ryanuber/columnize" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/shell.go b/cmd/shell.go index 2a792a521..3e0cd73ca 100644 --- a/cmd/shell.go +++ b/cmd/shell.go @@ -1,8 +1,8 @@ package cmd import ( - dkplugin "github.com/distribworks/dkron/v3/plugin" - "github.com/distribworks/dkron/v3/plugin/shell" + dkplugin "github.com/distribworks/dkron/v4/plugin" + "github.com/distribworks/dkron/v4/plugin/shell" "github.com/hashicorp/go-plugin" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index 66aff38a6..148e586a1 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/distribworks/dkron/v3/dkron" + "github.com/distribworks/dkron/v4/dkron" "github.com/hashicorp/serf/serf" "github.com/spf13/cobra" ) diff --git a/dkron/agent.go b/dkron/agent.go index 5f163cd77..ee9f913fc 100644 --- a/dkron/agent.go +++ b/dkron/agent.go @@ -17,8 +17,8 @@ import ( metrics "github.com/armon/go-metrics" "github.com/devopsfaith/krakend-usage/client" - "github.com/distribworks/dkron/v3/plugin" - proto "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + proto "github.com/distribworks/dkron/v4/plugin/types" "github.com/hashicorp/go-uuid" "github.com/hashicorp/memberlist" "github.com/hashicorp/raft" diff --git a/dkron/execution.go b/dkron/execution.go index 3a1b5befe..de23fe7aa 100644 --- a/dkron/execution.go +++ b/dkron/execution.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - proto "github.com/distribworks/dkron/v3/plugin/types" + proto "github.com/distribworks/dkron/v4/plugin/types" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/dkron/fsm.go b/dkron/fsm.go index 6f711df00..aa1c26994 100644 --- a/dkron/fsm.go +++ b/dkron/fsm.go @@ -3,7 +3,7 @@ package dkron import ( "io" - dkronpb "github.com/distribworks/dkron/v3/plugin/types" + dkronpb "github.com/distribworks/dkron/v4/plugin/types" "github.com/hashicorp/raft" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" diff --git a/dkron/grpc.go b/dkron/grpc.go index e3d9d54e6..b905d72c4 100644 --- a/dkron/grpc.go +++ b/dkron/grpc.go @@ -9,8 +9,8 @@ import ( "time" metrics "github.com/armon/go-metrics" - "github.com/distribworks/dkron/v3/plugin" - proto "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin" + proto "github.com/distribworks/dkron/v4/plugin/types" "github.com/golang/protobuf/ptypes/empty" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" diff --git a/dkron/grpc_agent.go b/dkron/grpc_agent.go index 59c146215..d293f8ff3 100644 --- a/dkron/grpc_agent.go +++ b/dkron/grpc_agent.go @@ -6,7 +6,7 @@ import ( "github.com/armon/circbuf" metrics "github.com/armon/go-metrics" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/sirupsen/logrus" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/dkron/grpc_client.go b/dkron/grpc_client.go index a6eb2988e..719cb6cd3 100644 --- a/dkron/grpc_client.go +++ b/dkron/grpc_client.go @@ -6,7 +6,7 @@ import ( "time" metrics "github.com/armon/go-metrics" - proto "github.com/distribworks/dkron/v3/plugin/types" + proto "github.com/distribworks/dkron/v4/plugin/types" "github.com/golang/protobuf/ptypes/empty" "github.com/sirupsen/logrus" "golang.org/x/net/context" diff --git a/dkron/job.go b/dkron/job.go index 75faf7c0a..8c498c6d3 100644 --- a/dkron/job.go +++ b/dkron/job.go @@ -6,10 +6,10 @@ import ( "regexp" "time" - "github.com/distribworks/dkron/v3/extcron" - "github.com/distribworks/dkron/v3/ntime" - "github.com/distribworks/dkron/v3/plugin" - proto "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/extcron" + "github.com/distribworks/dkron/v4/ntime" + "github.com/distribworks/dkron/v4/plugin" + proto "github.com/distribworks/dkron/v4/plugin/types" "github.com/sirupsen/logrus" "github.com/tidwall/buntdb" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/dkron/job_test.go b/dkron/job_test.go index 83d6c6710..22dc1746f 100644 --- a/dkron/job_test.go +++ b/dkron/job_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/distribworks/dkron/v3/ntime" - "github.com/distribworks/dkron/v3/plugin" - proto "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/ntime" + "github.com/distribworks/dkron/v4/plugin" + proto "github.com/distribworks/dkron/v4/plugin/types" "github.com/hashicorp/serf/testutil" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/dkron/scheduler.go b/dkron/scheduler.go index bd343108a..ab62c380b 100644 --- a/dkron/scheduler.go +++ b/dkron/scheduler.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/armon/go-metrics" - "github.com/distribworks/dkron/v3/extcron" + "github.com/distribworks/dkron/v4/extcron" "github.com/robfig/cron/v3" "github.com/sirupsen/logrus" ) diff --git a/dkron/scheduler_test.go b/dkron/scheduler_test.go index 0a622801c..4262a38e8 100644 --- a/dkron/scheduler_test.go +++ b/dkron/scheduler_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/distribworks/dkron/v3/extcron" + "github.com/distribworks/dkron/v4/extcron" "github.com/robfig/cron/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dkron/store.go b/dkron/store.go index 77786e35d..fc05d3237 100644 --- a/dkron/store.go +++ b/dkron/store.go @@ -12,7 +12,7 @@ import ( "sync" "time" - dkronpb "github.com/distribworks/dkron/v3/plugin/types" + dkronpb "github.com/distribworks/dkron/v4/plugin/types" "github.com/sirupsen/logrus" "github.com/tidwall/buntdb" "google.golang.org/protobuf/proto" diff --git a/go.mod b/go.mod index 6bfc8cc54..4c4c35db8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/distribworks/dkron/v3 +module github.com/distribworks/dkron/v4 require ( cloud.google.com/go/pubsub v1.33.0 diff --git a/main.go b/main.go index 224f1f047..52d0765a5 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( - "github.com/distribworks/dkron/v3/cmd" + "github.com/distribworks/dkron/v4/cmd" ) func main() { diff --git a/plugin/execution_processor.go b/plugin/execution_processor.go index 45e36d81c..bb98d40b0 100644 --- a/plugin/execution_processor.go +++ b/plugin/execution_processor.go @@ -3,7 +3,7 @@ package plugin import ( "net/rpc" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/hashicorp/go-plugin" ) diff --git a/plugin/executor.go b/plugin/executor.go index b4587e952..d465542ff 100644 --- a/plugin/executor.go +++ b/plugin/executor.go @@ -3,7 +3,7 @@ package plugin import ( "context" - "github.com/distribworks/dkron/v3/plugin/types" + "github.com/distribworks/dkron/v4/plugin/types" "github.com/hashicorp/go-plugin" "google.golang.org/grpc" ) diff --git a/plugin/executor_test.go b/plugin/executor_test.go index a6cc4a092..a211ba961 100644 --- a/plugin/executor_test.go +++ b/plugin/executor_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dktypes "github.com/distribworks/dkron/v4/plugin/types" grpc "google.golang.org/grpc" ) diff --git a/plugin/shell/shell.go b/plugin/shell/shell.go index 1161be4bc..1c69e269e 100644 --- a/plugin/shell/shell.go +++ b/plugin/shell/shell.go @@ -13,8 +13,8 @@ import ( "time" "github.com/armon/circbuf" - dkplugin "github.com/distribworks/dkron/v3/plugin" - dktypes "github.com/distribworks/dkron/v3/plugin/types" + dkplugin "github.com/distribworks/dkron/v4/plugin" + dktypes "github.com/distribworks/dkron/v4/plugin/types" "github.com/mattn/go-shellwords" )