From be8527d369a714b267babcfe55aaa86789cdd964 Mon Sep 17 00:00:00 2001 From: Victor Castell Date: Thu, 24 Jan 2019 21:38:57 +0100 Subject: [PATCH] Remove deprecated parameters (#489) Remove support for old job command parameters Deprecated long ago, Job params: command, shell and environment_variables are now gone. This could be breaking change for installations still using those params --- CHANGELOG.md | 1 + .../bins/dkron-executor-shell/shell_test.go | 38 ++ dkron/agent.go | 4 +- dkron/agent_test.go | 2 +- dkron/api.go | 5 +- dkron/api_test.go | 8 +- dkron/grpc.go | 3 - dkron/grpc_test.go | 9 +- dkron/invoke.go | 44 +-- dkron/invoke_test.go | 48 --- dkron/job.go | 44 +-- dkron/job_test.go | 14 +- dkron/scheduler_test.go | 24 +- dkron/store_test.go | 9 +- proto/dkron.pb.go | 341 ++++++++++-------- proto/dkron.proto | 5 +- 16 files changed, 292 insertions(+), 307 deletions(-) create mode 100644 builtin/bins/dkron-executor-shell/shell_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7198ab2..999486f47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Unreleased - Add DynamoDB support +- Breaking: Remove support and deprecation message for old command, environment_variables and shell parameters ## 1.0.2 diff --git a/builtin/bins/dkron-executor-shell/shell_test.go b/builtin/bins/dkron-executor-shell/shell_test.go new file mode 100644 index 000000000..e187b1394 --- /dev/null +++ b/builtin/bins/dkron-executor-shell/shell_test.go @@ -0,0 +1,38 @@ +package main + +import ( + "os" + "testing" + + "github.com/stretchr/testify/assert" +) + +func Test_buildCmd(t *testing.T) { + + // test shell command + cmd, err := buildCmd("echo 'test1' && echo 'success'", true, []string{}, "") + assert.NoError(t, err) + out, err := cmd.CombinedOutput() + assert.NoError(t, err) + assert.Equal(t, "test1\nsuccess\n", string(out)) + + // test not shell command + cmd, err = buildCmd("date && echo 'success'", false, []string{}, "") + assert.NoError(t, err) + out, err = cmd.CombinedOutput() + assert.Error(t, err) +} + +func Test_buildCmdWithCustomEnvironmentVariables(t *testing.T) { + defer func() { + os.Setenv("Foo", "") + }() + os.Setenv("Foo", "Bar") + + cmd, err := buildCmd("echo $Foo && echo $He", true, []string{"Foo=Toto", "He=Ho"}, "") + assert.NoError(t, err) + out, err := cmd.CombinedOutput() + assert.NoError(t, err) + assert.Equal(t, "Toto\nHo\n", string(out)) + +} diff --git a/dkron/agent.go b/dkron/agent.go index 616f723ae..b571631e1 100644 --- a/dkron/agent.go +++ b/dkron/agent.go @@ -463,7 +463,7 @@ func (a *Agent) eventLoop() { log.WithError(err).Error("agent: Error on rpc.GetJob call") continue } - log.WithField("command", job.Command).Debug("agent: GetJob by RPC") + log.WithField("job", job.Name).Debug("agent: GetJob by RPC") ex := rqp.Execution ex.StartedAt = time.Now() @@ -471,7 +471,7 @@ func (a *Agent) eventLoop() { go func() { if err := a.invokeJob(job, ex); err != nil { - log.WithError(err).Error("agent: Error invoking job command") + log.WithError(err).Error("agent: Error invoking job") } }() diff --git a/dkron/agent_test.go b/dkron/agent_test.go index eb509095f..b4e379834 100644 --- a/dkron/agent_test.go +++ b/dkron/agent_test.go @@ -12,7 +12,7 @@ import ( ) var ( - logLevel = "debug" + logLevel = "error" etcdAddr = getEnvWithDefault() ) diff --git a/dkron/api.go b/dkron/api.go index 7c2200759..b11d446ae 100644 --- a/dkron/api.go +++ b/dkron/api.go @@ -170,7 +170,7 @@ func (h *HTTPTransport) jobCreateOrUpdateHandler(c *gin.Context) { h.agent.SchedulerRestart() c.Header("Location", fmt.Sprintf("%s/%s", c.Request.RequestURI, job.Name)) - renderJSON(c, http.StatusCreated, job) + renderJSON(c, http.StatusCreated, &job) } func (h *HTTPTransport) jobDeleteHandler(c *gin.Context) { @@ -237,9 +237,6 @@ func (h *HTTPTransport) leaderHandler(c *gin.Context) { } func (h *HTTPTransport) leaveHandler(c *gin.Context) { - if c.Request.Method == http.MethodGet { - log.Warn("/leave GET is deprecated and will be removed, use POST") - } if err := h.agent.serf.Leave(); err != nil { renderJSON(c, http.StatusOK, h.agent.listServers()) } diff --git a/dkron/api_test.go b/dkron/api_test.go index 193ec47f2..29e789bf5 100644 --- a/dkron/api_test.go +++ b/dkron/api_test.go @@ -44,7 +44,7 @@ func setupAPITest(t *testing.T) (a *Agent) { func TestAPIJobCreateUpdate(t *testing.T) { a := setupAPITest(t) - jsonStr := []byte(`{"name": "test_job", "schedule": "@every 1m", "command": "date", "owner": "mec", "owner_email": "foo@bar.com", "disabled": true}`) + jsonStr := []byte(`{"name": "test_job", "schedule": "@every 1m", "executor": "shell", "executor_config": {"command": "date"}, "owner": "mec", "owner_email": "foo@bar.com", "disabled": true}`) resp, err := http.Post("http://localhost:8090/v1/jobs", "encoding/json", bytes.NewBuffer(jsonStr)) if err != nil { @@ -59,7 +59,7 @@ func TestAPIJobCreateUpdate(t *testing.T) { t.Fatal(err) } - jsonStr1 := []byte(`{"name": "test_job", "schedule": "@every 1m", "command": "test", "disabled": false}`) + jsonStr1 := []byte(`{"name": "test_job", "schedule": "@every 1m", "executor": "shell", "executor_config": {"command": "test"}, "disabled": false}`) resp, err = http.Post("http://localhost:8090/v1/jobs", "encoding/json", bytes.NewBuffer(jsonStr1)) if err != nil { t.Fatal(err) @@ -75,8 +75,8 @@ func TestAPIJobCreateUpdate(t *testing.T) { assert.Equal(t, origJob.Name, overwriteJob.Name) assert.False(t, overwriteJob.Disabled) - assert.NotEqual(t, origJob.Command, overwriteJob.Command) - assert.Equal(t, "test", overwriteJob.Command) + assert.NotEqual(t, origJob.ExecutorConfig["command"], overwriteJob.ExecutorConfig["command"]) + assert.Equal(t, "test", overwriteJob.ExecutorConfig["command"]) // Send a shutdown request a.Stop() diff --git a/dkron/grpc.go b/dkron/grpc.go index 273bd8457..ee86f4b8e 100644 --- a/dkron/grpc.go +++ b/dkron/grpc.go @@ -72,9 +72,6 @@ func (grpcs *GRPCServer) GetJob(ctx context.Context, getJobReq *proto.GetJobRequ // Copy the data structure gjr.Name = j.Name - gjr.Shell = j.Shell - gjr.EnvironmentVariables = j.EnvironmentVariables - gjr.Command = j.Command gjr.Executor = j.Executor gjr.ExecutorConfig = j.ExecutorConfig diff --git a/dkron/grpc_test.go b/dkron/grpc_test.go index 47777201a..1dd728be7 100644 --- a/dkron/grpc_test.go +++ b/dkron/grpc_test.go @@ -38,10 +38,11 @@ func TestGRPCExecutionDone(t *testing.T) { time.Sleep(2 * time.Second) testJob := &Job{ - Name: "test", - Schedule: "@every 1m", - Command: "/bin/false", - Disabled: true, + Name: "test", + Schedule: "@every 1m", + Executor: "shell", + ExecutorConfig: map[string]string{"command": "/bin/false"}, + Disabled: true, } if err := store.SetJob(testJob, true); err != nil { diff --git a/dkron/invoke.go b/dkron/invoke.go index 89780cbd8..f4e08b825 100644 --- a/dkron/invoke.go +++ b/dkron/invoke.go @@ -1,17 +1,12 @@ package dkron import ( + "errors" "math/rand" - "os" - "os/exec" - "runtime" - "strconv" - "strings" "time" "github.com/armon/circbuf" "github.com/hashicorp/serf/serf" - "github.com/mattn/go-shellwords" ) const ( @@ -32,15 +27,7 @@ func (a *Agent) invokeJob(job *Job, execution *Execution) error { jex := job.Executor exc := job.ExecutorConfig if jex == "" { - jex = "shell" - exc = map[string]string{ - "command": job.Command, - "shell": strconv.FormatBool(job.Shell), - "env": strings.Join(job.EnvironmentVariables, ","), - } - log.Warning("invoke: Deprecation waring! fields command, " + - "shell and environment_variables params are deprecated and will be removed in future versions. " + - "Consider migrating the job definition to the shell executor plugin") + return errors.New("invoke: No executor defined, nothing to do") } // Check if executor is exists @@ -93,30 +80,3 @@ func (a *Agent) getServerRPCAddresFromTags() (string, error) { } return "", ErrNoRPCAddress } - -// Determine the shell invocation based on OS -func buildCmd(job *Job) (cmd *exec.Cmd) { - var shell, flag string - - if job.Shell { - if runtime.GOOS == windows { - shell = "cmd" - flag = "/C" - } else { - shell = "/bin/sh" - flag = "-c" - } - cmd = exec.Command(shell, flag, job.Command) - } else { - args, err := shellwords.Parse(job.Command) - if err != nil { - log.WithError(err).Fatal("invoke: Error parsing command arguments") - } - cmd = exec.Command(args[0], args[1:]...) - } - if job.EnvironmentVariables != nil { - cmd.Env = append(os.Environ(), job.EnvironmentVariables...) - } - - return -} diff --git a/dkron/invoke_test.go b/dkron/invoke_test.go index 8d5117291..115a0b6dd 100644 --- a/dkron/invoke_test.go +++ b/dkron/invoke_test.go @@ -1,49 +1 @@ package dkron - -import ( - "os" - "testing" - - "github.com/stretchr/testify/assert" -) - -func Test_buildCmd(t *testing.T) { - - // test shell command - testJob1 := &Job{ - Command: "echo 'test1' && echo 'success'", - Shell: true, - } - - cmd := buildCmd(testJob1) - out, err := cmd.CombinedOutput() - assert.NoError(t, err) - assert.Equal(t, "test1\nsuccess\n", string(out)) - - // test not shell command - testJob2 := &Job{ - Command: "date && echo 'success'", - Shell: false, - } - cmd = buildCmd(testJob2) - out, err = cmd.CombinedOutput() - assert.Error(t, err) -} - -func Test_buildCmdWithCustomEnvironmentVariables(t *testing.T) { - defer func() { - os.Setenv("Foo", "") - }() - os.Setenv("Foo", "Bar") - testJob := &Job{ - Command: "echo $Foo && echo $He", - EnvironmentVariables: []string{"Foo=Toto", "He=Ho"}, - Shell: true, - } - - cmd := buildCmd(testJob) - out, err := cmd.CombinedOutput() - assert.NoError(t, err) - assert.Equal(t, "Toto\nHo\n", string(out)) - -} diff --git a/dkron/job.go b/dkron/job.go index 9febb8ba4..0d2b1b94e 100644 --- a/dkron/job.go +++ b/dkron/job.go @@ -55,15 +55,6 @@ type Job struct { // Cron expression for the job. When to run the job. Schedule string `json:"schedule"` - // Use shell to run the command. - Shell bool `json:"shell"` - - // Command to run. Must be a shell command to execute. - Command string `json:"command"` - - // Extra environment variable to give to the command to execute. - EnvironmentVariables []string `json:"environment_variables"` - // Owner of the job. Owner string `json:"owner"` @@ -122,25 +113,22 @@ type Job struct { func NewJobFromProto(in *proto.GetJobResponse) *Job { return &Job{ - Name: in.Name, - Timezone: in.Timezone, - Schedule: in.Schedule, - Shell: in.Shell, - Command: in.Command, - EnvironmentVariables: in.EnvironmentVariables, - Owner: in.Owner, - OwnerEmail: in.OwnerEmail, - SuccessCount: int(in.SuccessCount), - ErrorCount: int(in.ErrorCount), - Disabled: in.Disabled, - Tags: in.Tags, - Retries: uint(in.Retries), - DependentJobs: in.DependentJobs, - ParentJob: in.ParentJob, - Concurrency: in.Concurrency, - Executor: in.Executor, - ExecutorConfig: in.ExecutorConfig, - Status: in.Status, + Name: in.Name, + Timezone: in.Timezone, + Schedule: in.Schedule, + Owner: in.Owner, + OwnerEmail: in.OwnerEmail, + SuccessCount: int(in.SuccessCount), + ErrorCount: int(in.ErrorCount), + Disabled: in.Disabled, + Tags: in.Tags, + Retries: uint(in.Retries), + DependentJobs: in.DependentJobs, + ParentJob: in.ParentJob, + Concurrency: in.Concurrency, + Executor: in.Executor, + ExecutorConfig: in.ExecutorConfig, + Status: in.Status, } } diff --git a/dkron/job_test.go b/dkron/job_test.go index 26997a5a5..365a377e6 100644 --- a/dkron/job_test.go +++ b/dkron/job_test.go @@ -21,9 +21,10 @@ func TestJobGetParent(t *testing.T) { } parentTestJob := &Job{ - Name: "parent_test", - Command: "/bin/false", - Schedule: "@every 2s", + Name: "parent_test", + Executor: "shell", + ExecutorConfig: map[string]string{"command": "/bin/false"}, + Schedule: "@every 2s", } if err := store.SetJob(parentTestJob, true); err != nil { @@ -31,9 +32,10 @@ func TestJobGetParent(t *testing.T) { } dependentTestJob := &Job{ - Name: "dependent_test", - Command: "/bin/false", - ParentJob: "parent_test", + Name: "dependent_test", + Executor: "shell", + ExecutorConfig: map[string]string{"command": "/bin/false"}, + ParentJob: "parent_test", } err = store.SetJob(dependentTestJob, true) diff --git a/dkron/scheduler_test.go b/dkron/scheduler_test.go index 05a36adda..9bc135490 100644 --- a/dkron/scheduler_test.go +++ b/dkron/scheduler_test.go @@ -13,12 +13,12 @@ func TestSchedule(t *testing.T) { assert.False(t, sched.Started) testJob1 := &Job{ - Name: "cron_job", - Schedule: "@every 2s", - Command: "echo 'test1'", - Owner: "John Dough", - OwnerEmail: "foo@bar.com", - Shell: true, + Name: "cron_job", + Schedule: "@every 2s", + Executor: "shell", + ExecutorConfig: map[string]string{"command": "echo 'test1'", "shell": "true"}, + Owner: "John Dough", + OwnerEmail: "foo@bar.com", } sched.Start([]*Job{testJob1}) @@ -28,12 +28,12 @@ func TestSchedule(t *testing.T) { assert.Equal(t, now.Add(time.Second*2), sched.GetEntry(testJob1).Next) testJob2 := &Job{ - Name: "cron_job", - Schedule: "@every 5s", - Command: "echo 'test2'", - Owner: "John Dough", - OwnerEmail: "foo@bar.com", - Shell: true, + Name: "cron_job", + Schedule: "@every 5s", + Executor: "shell", + ExecutorConfig: map[string]string{"command": "echo 'test2'", "shell": "true"}, + Owner: "John Dough", + OwnerEmail: "foo@bar.com", } sched.Restart([]*Job{testJob2}) diff --git a/dkron/store_test.go b/dkron/store_test.go index 9b60798a2..bdc51f63a 100644 --- a/dkron/store_test.go +++ b/dkron/store_test.go @@ -18,10 +18,11 @@ func TestStore(t *testing.T) { } testJob := &Job{ - Name: "test", - Schedule: "@every 2s", - Command: "/bin/false", - Disabled: true, + Name: "test", + Schedule: "@every 2s", + Executor: "shell", + ExecutorConfig: map[string]string{"command": "/bin/false"}, + Disabled: true, } // Check that we still get an empty job list diff --git a/proto/dkron.pb.go b/proto/dkron.pb.go index d3f14d66a..f95ca3854 100644 --- a/proto/dkron.pb.go +++ b/proto/dkron.pb.go @@ -1,24 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: dkron.proto -/* -Package proto is a generated protocol buffer package. - -It is generated from these files: - dkron.proto - -It has these top-level messages: - GetJobRequest - GetJobResponse - ExecutionDoneRequest - ExecutionDoneResponse -*/ package proto -import proto1 "github.com/golang/protobuf/proto" +import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import google_protobuf "github.com/golang/protobuf/ptypes/timestamp" +import timestamp "github.com/golang/protobuf/ptypes/timestamp" import ( context "golang.org/x/net/context" @@ -26,7 +14,7 @@ import ( ) // Reference imports to suppress errors if they are not otherwise used. -var _ = proto1.Marshal +var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf @@ -34,16 +22,38 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto1.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type GetJobRequest struct { - JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName" json:"job_name,omitempty"` + JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName,proto3" json:"job_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *GetJobRequest) Reset() { *m = GetJobRequest{} } -func (m *GetJobRequest) String() string { return proto1.CompactTextString(m) } -func (*GetJobRequest) ProtoMessage() {} -func (*GetJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *GetJobRequest) Reset() { *m = GetJobRequest{} } +func (m *GetJobRequest) String() string { return proto.CompactTextString(m) } +func (*GetJobRequest) ProtoMessage() {} +func (*GetJobRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dkron_3b739081e7b8d623, []int{0} +} +func (m *GetJobRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetJobRequest.Unmarshal(m, b) +} +func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic) +} +func (dst *GetJobRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetJobRequest.Merge(dst, src) +} +func (m *GetJobRequest) XXX_Size() int { + return xxx_messageInfo_GetJobRequest.Size(m) +} +func (m *GetJobRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetJobRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetJobRequest proto.InternalMessageInfo func (m *GetJobRequest) GetJobName() string { if m != nil { @@ -53,31 +63,50 @@ func (m *GetJobRequest) GetJobName() string { } type GetJobResponse struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Timezone string `protobuf:"bytes,2,opt,name=timezone" json:"timezone,omitempty"` - Schedule string `protobuf:"bytes,3,opt,name=schedule" json:"schedule,omitempty"` - Shell bool `protobuf:"varint,4,opt,name=shell" json:"shell,omitempty"` - Command string `protobuf:"bytes,5,opt,name=command" json:"command,omitempty"` - EnvironmentVariables []string `protobuf:"bytes,6,rep,name=environment_variables,json=environmentVariables" json:"environment_variables,omitempty"` - Owner string `protobuf:"bytes,7,opt,name=owner" json:"owner,omitempty"` - OwnerEmail string `protobuf:"bytes,8,opt,name=owner_email,json=ownerEmail" json:"owner_email,omitempty"` - SuccessCount int32 `protobuf:"varint,9,opt,name=success_count,json=successCount" json:"success_count,omitempty"` - ErrorCount int32 `protobuf:"varint,10,opt,name=error_count,json=errorCount" json:"error_count,omitempty"` - Disabled bool `protobuf:"varint,11,opt,name=disabled" json:"disabled,omitempty"` - Tags map[string]string `protobuf:"bytes,12,rep,name=tags" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Retries uint32 `protobuf:"varint,13,opt,name=retries" json:"retries,omitempty"` - DependentJobs []string `protobuf:"bytes,14,rep,name=dependent_jobs,json=dependentJobs" json:"dependent_jobs,omitempty"` - ParentJob string `protobuf:"bytes,15,opt,name=parent_job,json=parentJob" json:"parent_job,omitempty"` - Concurrency string `protobuf:"bytes,16,opt,name=concurrency" json:"concurrency,omitempty"` - Executor string `protobuf:"bytes,17,opt,name=executor" json:"executor,omitempty"` - ExecutorConfig map[string]string `protobuf:"bytes,18,rep,name=executor_config,json=executorConfig" json:"executor_config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Status string `protobuf:"bytes,19,opt,name=status" json:"status,omitempty"` -} - -func (m *GetJobResponse) Reset() { *m = GetJobResponse{} } -func (m *GetJobResponse) String() string { return proto1.CompactTextString(m) } -func (*GetJobResponse) ProtoMessage() {} -func (*GetJobResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Timezone string `protobuf:"bytes,2,opt,name=timezone,proto3" json:"timezone,omitempty"` + Schedule string `protobuf:"bytes,3,opt,name=schedule,proto3" json:"schedule,omitempty"` + Owner string `protobuf:"bytes,7,opt,name=owner,proto3" json:"owner,omitempty"` + OwnerEmail string `protobuf:"bytes,8,opt,name=owner_email,json=ownerEmail,proto3" json:"owner_email,omitempty"` + SuccessCount int32 `protobuf:"varint,9,opt,name=success_count,json=successCount,proto3" json:"success_count,omitempty"` + ErrorCount int32 `protobuf:"varint,10,opt,name=error_count,json=errorCount,proto3" json:"error_count,omitempty"` + Disabled bool `protobuf:"varint,11,opt,name=disabled,proto3" json:"disabled,omitempty"` + Tags map[string]string `protobuf:"bytes,12,rep,name=tags,proto3" json:"tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Retries uint32 `protobuf:"varint,13,opt,name=retries,proto3" json:"retries,omitempty"` + DependentJobs []string `protobuf:"bytes,14,rep,name=dependent_jobs,json=dependentJobs,proto3" json:"dependent_jobs,omitempty"` + ParentJob string `protobuf:"bytes,15,opt,name=parent_job,json=parentJob,proto3" json:"parent_job,omitempty"` + Concurrency string `protobuf:"bytes,16,opt,name=concurrency,proto3" json:"concurrency,omitempty"` + Executor string `protobuf:"bytes,17,opt,name=executor,proto3" json:"executor,omitempty"` + ExecutorConfig map[string]string `protobuf:"bytes,18,rep,name=executor_config,json=executorConfig,proto3" json:"executor_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Status string `protobuf:"bytes,19,opt,name=status,proto3" json:"status,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetJobResponse) Reset() { *m = GetJobResponse{} } +func (m *GetJobResponse) String() string { return proto.CompactTextString(m) } +func (*GetJobResponse) ProtoMessage() {} +func (*GetJobResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dkron_3b739081e7b8d623, []int{1} +} +func (m *GetJobResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetJobResponse.Unmarshal(m, b) +} +func (m *GetJobResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetJobResponse.Marshal(b, m, deterministic) +} +func (dst *GetJobResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetJobResponse.Merge(dst, src) +} +func (m *GetJobResponse) XXX_Size() int { + return xxx_messageInfo_GetJobResponse.Size(m) +} +func (m *GetJobResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetJobResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetJobResponse proto.InternalMessageInfo func (m *GetJobResponse) GetName() string { if m != nil { @@ -100,27 +129,6 @@ func (m *GetJobResponse) GetSchedule() string { return "" } -func (m *GetJobResponse) GetShell() bool { - if m != nil { - return m.Shell - } - return false -} - -func (m *GetJobResponse) GetCommand() string { - if m != nil { - return m.Command - } - return "" -} - -func (m *GetJobResponse) GetEnvironmentVariables() []string { - if m != nil { - return m.EnvironmentVariables - } - return nil -} - func (m *GetJobResponse) GetOwner() string { if m != nil { return m.Owner @@ -213,20 +221,42 @@ func (m *GetJobResponse) GetStatus() string { } type ExecutionDoneRequest struct { - JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName" json:"job_name,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` - Output []byte `protobuf:"bytes,3,opt,name=output,proto3" json:"output,omitempty"` - NodeName string `protobuf:"bytes,4,opt,name=node_name,json=nodeName" json:"node_name,omitempty"` - Group int64 `protobuf:"varint,5,opt,name=group" json:"group,omitempty"` - Attempt uint32 `protobuf:"varint,6,opt,name=attempt" json:"attempt,omitempty"` - StartedAt *google_protobuf.Timestamp `protobuf:"bytes,7,opt,name=started_at,json=startedAt" json:"started_at,omitempty"` - FinishedAt *google_protobuf.Timestamp `protobuf:"bytes,8,opt,name=finished_at,json=finishedAt" json:"finished_at,omitempty"` + JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName,proto3" json:"job_name,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` + Output []byte `protobuf:"bytes,3,opt,name=output,proto3" json:"output,omitempty"` + NodeName string `protobuf:"bytes,4,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"` + Group int64 `protobuf:"varint,5,opt,name=group,proto3" json:"group,omitempty"` + Attempt uint32 `protobuf:"varint,6,opt,name=attempt,proto3" json:"attempt,omitempty"` + StartedAt *timestamp.Timestamp `protobuf:"bytes,7,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"` + FinishedAt *timestamp.Timestamp `protobuf:"bytes,8,opt,name=finished_at,json=finishedAt,proto3" json:"finished_at,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ExecutionDoneRequest) Reset() { *m = ExecutionDoneRequest{} } +func (m *ExecutionDoneRequest) String() string { return proto.CompactTextString(m) } +func (*ExecutionDoneRequest) ProtoMessage() {} +func (*ExecutionDoneRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dkron_3b739081e7b8d623, []int{2} +} +func (m *ExecutionDoneRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ExecutionDoneRequest.Unmarshal(m, b) +} +func (m *ExecutionDoneRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ExecutionDoneRequest.Marshal(b, m, deterministic) +} +func (dst *ExecutionDoneRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecutionDoneRequest.Merge(dst, src) +} +func (m *ExecutionDoneRequest) XXX_Size() int { + return xxx_messageInfo_ExecutionDoneRequest.Size(m) +} +func (m *ExecutionDoneRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ExecutionDoneRequest.DiscardUnknown(m) } -func (m *ExecutionDoneRequest) Reset() { *m = ExecutionDoneRequest{} } -func (m *ExecutionDoneRequest) String() string { return proto1.CompactTextString(m) } -func (*ExecutionDoneRequest) ProtoMessage() {} -func (*ExecutionDoneRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +var xxx_messageInfo_ExecutionDoneRequest proto.InternalMessageInfo func (m *ExecutionDoneRequest) GetJobName() string { if m != nil { @@ -270,14 +300,14 @@ func (m *ExecutionDoneRequest) GetAttempt() uint32 { return 0 } -func (m *ExecutionDoneRequest) GetStartedAt() *google_protobuf.Timestamp { +func (m *ExecutionDoneRequest) GetStartedAt() *timestamp.Timestamp { if m != nil { return m.StartedAt } return nil } -func (m *ExecutionDoneRequest) GetFinishedAt() *google_protobuf.Timestamp { +func (m *ExecutionDoneRequest) GetFinishedAt() *timestamp.Timestamp { if m != nil { return m.FinishedAt } @@ -285,14 +315,36 @@ func (m *ExecutionDoneRequest) GetFinishedAt() *google_protobuf.Timestamp { } type ExecutionDoneResponse struct { - From string `protobuf:"bytes,1,opt,name=from" json:"from,omitempty"` - Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"` + From string `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` + Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *ExecutionDoneResponse) Reset() { *m = ExecutionDoneResponse{} } -func (m *ExecutionDoneResponse) String() string { return proto1.CompactTextString(m) } -func (*ExecutionDoneResponse) ProtoMessage() {} -func (*ExecutionDoneResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (m *ExecutionDoneResponse) Reset() { *m = ExecutionDoneResponse{} } +func (m *ExecutionDoneResponse) String() string { return proto.CompactTextString(m) } +func (*ExecutionDoneResponse) ProtoMessage() {} +func (*ExecutionDoneResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dkron_3b739081e7b8d623, []int{3} +} +func (m *ExecutionDoneResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ExecutionDoneResponse.Unmarshal(m, b) +} +func (m *ExecutionDoneResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ExecutionDoneResponse.Marshal(b, m, deterministic) +} +func (dst *ExecutionDoneResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecutionDoneResponse.Merge(dst, src) +} +func (m *ExecutionDoneResponse) XXX_Size() int { + return xxx_messageInfo_ExecutionDoneResponse.Size(m) +} +func (m *ExecutionDoneResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ExecutionDoneResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ExecutionDoneResponse proto.InternalMessageInfo func (m *ExecutionDoneResponse) GetFrom() string { if m != nil { @@ -309,10 +361,12 @@ func (m *ExecutionDoneResponse) GetPayload() []byte { } func init() { - proto1.RegisterType((*GetJobRequest)(nil), "proto.GetJobRequest") - proto1.RegisterType((*GetJobResponse)(nil), "proto.GetJobResponse") - proto1.RegisterType((*ExecutionDoneRequest)(nil), "proto.ExecutionDoneRequest") - proto1.RegisterType((*ExecutionDoneResponse)(nil), "proto.ExecutionDoneResponse") + proto.RegisterType((*GetJobRequest)(nil), "proto.GetJobRequest") + proto.RegisterType((*GetJobResponse)(nil), "proto.GetJobResponse") + proto.RegisterMapType((map[string]string)(nil), "proto.GetJobResponse.ExecutorConfigEntry") + proto.RegisterMapType((map[string]string)(nil), "proto.GetJobResponse.TagsEntry") + proto.RegisterType((*ExecutionDoneRequest)(nil), "proto.ExecutionDoneRequest") + proto.RegisterType((*ExecutionDoneResponse)(nil), "proto.ExecutionDoneResponse") } // Reference imports to suppress errors if they are not otherwise used. @@ -323,8 +377,9 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for Dkron service - +// DkronClient is the client API for Dkron service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type DkronClient interface { GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*GetJobResponse, error) ExecutionDone(ctx context.Context, in *ExecutionDoneRequest, opts ...grpc.CallOption) (*ExecutionDoneResponse, error) @@ -340,7 +395,7 @@ func NewDkronClient(cc *grpc.ClientConn) DkronClient { func (c *dkronClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*GetJobResponse, error) { out := new(GetJobResponse) - err := grpc.Invoke(ctx, "/proto.Dkron/GetJob", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/proto.Dkron/GetJob", in, out, opts...) if err != nil { return nil, err } @@ -349,15 +404,14 @@ func (c *dkronClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grp func (c *dkronClient) ExecutionDone(ctx context.Context, in *ExecutionDoneRequest, opts ...grpc.CallOption) (*ExecutionDoneResponse, error) { out := new(ExecutionDoneResponse) - err := grpc.Invoke(ctx, "/proto.Dkron/ExecutionDone", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/proto.Dkron/ExecutionDone", in, out, opts...) if err != nil { return nil, err } return out, nil } -// Server API for Dkron service - +// DkronServer is the server API for Dkron service. type DkronServer interface { GetJob(context.Context, *GetJobRequest) (*GetJobResponse, error) ExecutionDone(context.Context, *ExecutionDoneRequest) (*ExecutionDoneResponse, error) @@ -420,52 +474,49 @@ var _Dkron_serviceDesc = grpc.ServiceDesc{ Metadata: "dkron.proto", } -func init() { proto1.RegisterFile("dkron.proto", fileDescriptor0) } - -var fileDescriptor0 = []byte{ - // 691 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcb, 0x6e, 0xdb, 0x3a, - 0x10, 0x85, 0xe3, 0x47, 0xec, 0x91, 0xed, 0xe4, 0x32, 0xce, 0x05, 0xaf, 0x72, 0x8b, 0x08, 0x2e, - 0x0a, 0xb8, 0x5d, 0x38, 0x40, 0x82, 0xa2, 0xaf, 0x55, 0x90, 0x18, 0x05, 0xbc, 0xe8, 0x42, 0x08, - 0xba, 0x35, 0x28, 0x69, 0xec, 0x28, 0x91, 0x48, 0x95, 0xa4, 0xd2, 0xba, 0x9f, 0xd0, 0x7d, 0xff, - 0xa1, 0x9f, 0x59, 0x90, 0x94, 0xdc, 0x24, 0x30, 0x10, 0x74, 0x25, 0x9e, 0x33, 0x47, 0x33, 0x9c, - 0x07, 0x07, 0xbc, 0xe4, 0x56, 0x0a, 0x3e, 0x2d, 0xa4, 0xd0, 0x82, 0xb4, 0xed, 0xc7, 0x3f, 0x5e, - 0x09, 0xb1, 0xca, 0xf0, 0xc4, 0xa2, 0xa8, 0x5c, 0x9e, 0xe8, 0x34, 0x47, 0xa5, 0x59, 0x5e, 0x38, - 0xdd, 0xf8, 0x15, 0x0c, 0x3e, 0xa2, 0x9e, 0x8b, 0x28, 0xc4, 0x2f, 0x25, 0x2a, 0x4d, 0xfe, 0x83, - 0xee, 0x8d, 0x88, 0x16, 0x9c, 0xe5, 0x48, 0x1b, 0x41, 0x63, 0xd2, 0x0b, 0x77, 0x6f, 0x44, 0xf4, - 0x89, 0xe5, 0x38, 0xfe, 0xd9, 0x81, 0x61, 0x2d, 0x56, 0x85, 0xe0, 0x0a, 0x09, 0x81, 0xd6, 0x3d, - 0xa5, 0x3d, 0x13, 0x1f, 0xba, 0x26, 0xca, 0x77, 0xc1, 0x91, 0xee, 0x58, 0x7e, 0x83, 0x8d, 0x4d, - 0xc5, 0xd7, 0x98, 0x94, 0x19, 0xd2, 0xa6, 0xb3, 0xd5, 0x98, 0x8c, 0xa0, 0xad, 0xae, 0x31, 0xcb, - 0x68, 0x2b, 0x68, 0x4c, 0xba, 0xa1, 0x03, 0x84, 0xc2, 0x6e, 0x2c, 0xf2, 0x9c, 0xf1, 0x84, 0xb6, - 0xdd, 0x75, 0x2a, 0x48, 0xce, 0xe0, 0x10, 0xf9, 0x5d, 0x2a, 0x05, 0xcf, 0x91, 0xeb, 0xc5, 0x1d, - 0x93, 0x29, 0x8b, 0x32, 0x54, 0xb4, 0x13, 0x34, 0x27, 0xbd, 0x70, 0x74, 0xcf, 0xf8, 0xb9, 0xb6, - 0x99, 0x20, 0xe2, 0x2b, 0x47, 0x49, 0x77, 0xad, 0x33, 0x07, 0xc8, 0x31, 0x78, 0xf6, 0xb0, 0xc0, - 0x9c, 0xa5, 0x19, 0xed, 0x5a, 0x1b, 0x58, 0x6a, 0x66, 0x18, 0xf2, 0x1c, 0x06, 0xaa, 0x8c, 0x63, - 0x54, 0x6a, 0x11, 0x8b, 0x92, 0x6b, 0xda, 0x0b, 0x1a, 0x93, 0x76, 0xd8, 0xaf, 0xc8, 0x0b, 0xc3, - 0x19, 0x2f, 0x28, 0xa5, 0x90, 0x95, 0x04, 0xac, 0x04, 0x2c, 0xe5, 0x04, 0x3e, 0x74, 0x93, 0x54, - 0x99, 0x8b, 0x24, 0xd4, 0xb3, 0x49, 0x6e, 0x30, 0x39, 0x83, 0x96, 0x66, 0x2b, 0x45, 0xfb, 0x41, - 0x73, 0xe2, 0x9d, 0x1e, 0xbb, 0xf6, 0x4c, 0x1f, 0x96, 0x7b, 0x7a, 0xc5, 0x56, 0x6a, 0xc6, 0xb5, - 0x5c, 0x87, 0x56, 0x6c, 0x8a, 0x23, 0x51, 0xcb, 0x14, 0x15, 0x1d, 0x04, 0x8d, 0xc9, 0x20, 0xac, - 0x21, 0x79, 0x01, 0xc3, 0x04, 0x0b, 0xe4, 0x89, 0x29, 0xcd, 0x8d, 0x88, 0x14, 0x1d, 0xda, 0xaa, - 0x0c, 0x36, 0xec, 0x5c, 0x44, 0x8a, 0x3c, 0x03, 0x28, 0x98, 0xac, 0x34, 0x74, 0xcf, 0xe6, 0xdd, - 0x73, 0xcc, 0x5c, 0x44, 0x24, 0x00, 0x2f, 0x16, 0x3c, 0x2e, 0xa5, 0x44, 0x1e, 0xaf, 0xe9, 0xbe, - 0xb5, 0xdf, 0xa7, 0x4c, 0x4a, 0xf8, 0x0d, 0xe3, 0x52, 0x0b, 0x49, 0xff, 0x71, 0x0d, 0xad, 0x31, - 0x09, 0x61, 0xaf, 0x3e, 0x2f, 0x62, 0xc1, 0x97, 0xe9, 0x8a, 0x12, 0x9b, 0xdd, 0xcb, 0xed, 0xd9, - 0xcd, 0x2a, 0xf1, 0x85, 0xd5, 0xba, 0x3c, 0x87, 0xf8, 0x80, 0x24, 0xff, 0x42, 0x47, 0x69, 0xa6, - 0x4b, 0x45, 0x0f, 0x6c, 0xb4, 0x0a, 0xf9, 0x6f, 0xa0, 0xb7, 0x29, 0x0e, 0xd9, 0x87, 0xe6, 0x2d, - 0xae, 0xab, 0xa1, 0x34, 0x47, 0xd3, 0xf6, 0x3b, 0x96, 0x95, 0xf5, 0x40, 0x3a, 0xf0, 0x7e, 0xe7, - 0x6d, 0xc3, 0x3f, 0x87, 0x83, 0x2d, 0x71, 0xff, 0xc6, 0xc5, 0xf8, 0xd7, 0x0e, 0x8c, 0x9c, 0x8f, - 0x54, 0xf0, 0x4b, 0xc1, 0xf1, 0xe9, 0xb7, 0x64, 0x3a, 0x57, 0xcd, 0x8e, 0xf5, 0xd7, 0x0d, 0x6b, - 0x68, 0x32, 0x14, 0xa5, 0x2e, 0x4a, 0x6d, 0x1f, 0x48, 0x3f, 0xac, 0x10, 0x39, 0x82, 0x1e, 0x17, - 0x09, 0x3a, 0x6f, 0x2d, 0x57, 0x6a, 0x43, 0x58, 0x77, 0x23, 0x68, 0xaf, 0xa4, 0x28, 0x0b, 0xfb, - 0x46, 0x9a, 0xa1, 0x03, 0x26, 0x08, 0xd3, 0x1a, 0xf3, 0x42, 0xd3, 0x8e, 0x1b, 0x8f, 0x0a, 0x92, - 0x77, 0x00, 0x4a, 0x33, 0xa9, 0x31, 0x59, 0x30, 0x6d, 0xdf, 0x82, 0x77, 0xea, 0x4f, 0xdd, 0xb2, - 0x98, 0xd6, 0xcb, 0x62, 0x7a, 0x55, 0x2f, 0x8b, 0xb0, 0x57, 0xa9, 0xcf, 0x35, 0xf9, 0x00, 0xde, - 0x32, 0xe5, 0xa9, 0xba, 0x76, 0xff, 0x76, 0x9f, 0xfc, 0x17, 0x6a, 0xf9, 0xb9, 0x1e, 0xcf, 0xe0, - 0xf0, 0x51, 0xa5, 0xfe, 0x2c, 0x92, 0xa5, 0x14, 0x79, 0xbd, 0x48, 0xcc, 0xd9, 0x5c, 0xbf, 0x60, - 0xeb, 0x4c, 0xb0, 0xc4, 0xd6, 0xa8, 0x1f, 0xd6, 0xf0, 0xf4, 0x47, 0x03, 0xda, 0x97, 0x66, 0xdb, - 0x91, 0xd7, 0xd0, 0x71, 0x53, 0x44, 0x46, 0x8f, 0x86, 0xca, 0xb6, 0xc0, 0x3f, 0xdc, 0x3a, 0x6a, - 0x64, 0x0e, 0x83, 0x07, 0xf7, 0x20, 0x47, 0x95, 0x6e, 0x5b, 0x1f, 0xfd, 0xff, 0xb7, 0x1b, 0x9d, - 0xaf, 0xa8, 0x63, 0x8d, 0x67, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x1c, 0x7c, 0x3c, 0x80, - 0x05, 0x00, 0x00, +func init() { proto.RegisterFile("dkron.proto", fileDescriptor_dkron_3b739081e7b8d623) } + +var fileDescriptor_dkron_3b739081e7b8d623 = []byte{ + // 644 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4d, 0x6f, 0xdb, 0x38, + 0x10, 0x85, 0xe2, 0xd8, 0xb1, 0x47, 0xb6, 0x93, 0x65, 0x9c, 0x05, 0x57, 0xd9, 0x22, 0x82, 0x8b, + 0x02, 0x6a, 0x0f, 0x0e, 0x90, 0xa0, 0xe8, 0xd7, 0x29, 0x48, 0x8c, 0x02, 0x3e, 0xf4, 0x20, 0xe4, + 0x6e, 0x50, 0xd2, 0xd8, 0x51, 0x62, 0x91, 0x2a, 0x49, 0xb5, 0x75, 0x7f, 0x42, 0x7f, 0x49, 0x8f, + 0xfd, 0x89, 0x05, 0x49, 0xc9, 0x4d, 0x02, 0x03, 0x41, 0x4f, 0x9e, 0xf7, 0xe6, 0x69, 0xc8, 0x19, + 0xbe, 0x31, 0xf8, 0xd9, 0x9d, 0x14, 0x7c, 0x52, 0x4a, 0xa1, 0x05, 0x69, 0xdb, 0x9f, 0xe0, 0x64, + 0x29, 0xc4, 0x72, 0x85, 0xa7, 0x16, 0x25, 0xd5, 0xe2, 0x54, 0xe7, 0x05, 0x2a, 0xcd, 0x8a, 0xd2, + 0xe9, 0xc6, 0xaf, 0x60, 0xf0, 0x11, 0xf5, 0x4c, 0x24, 0x31, 0x7e, 0xae, 0x50, 0x69, 0xf2, 0x1f, + 0x74, 0x6f, 0x45, 0x32, 0xe7, 0xac, 0x40, 0xea, 0x85, 0x5e, 0xd4, 0x8b, 0xf7, 0x6e, 0x45, 0xf2, + 0x89, 0x15, 0x38, 0xfe, 0xd5, 0x86, 0x61, 0x23, 0x56, 0xa5, 0xe0, 0x0a, 0x09, 0x81, 0xdd, 0x7b, + 0x4a, 0x1b, 0x93, 0x00, 0xba, 0xe6, 0x94, 0xef, 0x82, 0x23, 0xdd, 0xb1, 0xfc, 0x06, 0x9b, 0x9c, + 0x4a, 0x6f, 0x30, 0xab, 0x56, 0x48, 0x5b, 0x2e, 0xd7, 0x60, 0x32, 0x82, 0xb6, 0xf8, 0xca, 0x51, + 0xd2, 0x3d, 0x9b, 0x70, 0x80, 0x9c, 0x80, 0x6f, 0x83, 0x39, 0x16, 0x2c, 0x5f, 0xd1, 0xae, 0xcd, + 0x81, 0xa5, 0xa6, 0x86, 0x21, 0xcf, 0x61, 0xa0, 0xaa, 0x34, 0x45, 0xa5, 0xe6, 0xa9, 0xa8, 0xb8, + 0xa6, 0xbd, 0xd0, 0x8b, 0xda, 0x71, 0xbf, 0x26, 0x2f, 0x0d, 0x67, 0xaa, 0xa0, 0x94, 0x42, 0xd6, + 0x12, 0xb0, 0x12, 0xb0, 0x94, 0x13, 0x04, 0xd0, 0xcd, 0x72, 0xc5, 0x92, 0x15, 0x66, 0xd4, 0x0f, + 0xbd, 0xa8, 0x1b, 0x6f, 0x30, 0x39, 0x87, 0x5d, 0xcd, 0x96, 0x8a, 0xf6, 0xc3, 0x56, 0xe4, 0x9f, + 0x9d, 0xb8, 0xc9, 0x4d, 0x1e, 0x4e, 0x62, 0x72, 0xcd, 0x96, 0x6a, 0xca, 0xb5, 0x5c, 0xc7, 0x56, + 0x4c, 0x28, 0xec, 0x49, 0xd4, 0x32, 0x47, 0x45, 0x07, 0xa1, 0x17, 0x0d, 0xe2, 0x06, 0x92, 0x17, + 0x30, 0xcc, 0xb0, 0x44, 0x9e, 0x21, 0xd7, 0xf3, 0x5b, 0x91, 0x28, 0x3a, 0x0c, 0x5b, 0x51, 0x2f, + 0x1e, 0x6c, 0xd8, 0x99, 0x48, 0x14, 0x79, 0x06, 0x50, 0x32, 0x59, 0x6b, 0xe8, 0xbe, 0xed, 0xbb, + 0xe7, 0x98, 0x99, 0x48, 0x48, 0x08, 0x7e, 0x2a, 0x78, 0x5a, 0x49, 0x89, 0x3c, 0x5d, 0xd3, 0x03, + 0x9b, 0xbf, 0x4f, 0x99, 0x96, 0xf0, 0x1b, 0xa6, 0x95, 0x16, 0x92, 0xfe, 0xe3, 0x66, 0xdd, 0x60, + 0x12, 0xc3, 0x7e, 0x13, 0xcf, 0x53, 0xc1, 0x17, 0xf9, 0x92, 0x12, 0xdb, 0xdd, 0xcb, 0xed, 0xdd, + 0x4d, 0x6b, 0xf1, 0xa5, 0xd5, 0xba, 0x3e, 0x87, 0xf8, 0x80, 0x24, 0xff, 0x42, 0x47, 0x69, 0xa6, + 0x2b, 0x45, 0x0f, 0xed, 0x69, 0x35, 0x0a, 0xde, 0x40, 0x6f, 0x33, 0x1c, 0x72, 0x00, 0xad, 0x3b, + 0x5c, 0xd7, 0x7e, 0x31, 0xa1, 0x79, 0xf6, 0x2f, 0x6c, 0x55, 0x35, 0x5e, 0x71, 0xe0, 0xfd, 0xce, + 0x5b, 0x2f, 0xb8, 0x80, 0xc3, 0x2d, 0xe7, 0xfe, 0x4d, 0x89, 0xf1, 0xcf, 0x1d, 0x18, 0xb9, 0x1a, + 0xb9, 0xe0, 0x57, 0x82, 0xe3, 0xd3, 0x36, 0x37, 0x2f, 0x57, 0x7b, 0xc7, 0xd6, 0xeb, 0xc6, 0x0d, + 0x34, 0x1d, 0x8a, 0x4a, 0x97, 0x95, 0xb6, 0xde, 0xed, 0xc7, 0x35, 0x22, 0xc7, 0xd0, 0xe3, 0x22, + 0x43, 0x57, 0x6d, 0xd7, 0x8d, 0xda, 0x10, 0xb6, 0xdc, 0x08, 0xda, 0x4b, 0x29, 0xaa, 0x92, 0xb6, + 0x43, 0x2f, 0x6a, 0xc5, 0x0e, 0x98, 0x43, 0x98, 0xd6, 0x58, 0x94, 0x9a, 0x76, 0x9c, 0x3d, 0x6a, + 0x48, 0xde, 0x01, 0x28, 0xcd, 0xa4, 0xc6, 0x6c, 0xce, 0xb4, 0xdd, 0x05, 0xff, 0x2c, 0x98, 0xb8, + 0x3d, 0x9e, 0x34, 0x7b, 0x3c, 0xb9, 0x6e, 0xf6, 0x38, 0xee, 0xd5, 0xea, 0x0b, 0x4d, 0x3e, 0x80, + 0xbf, 0xc8, 0x79, 0xae, 0x6e, 0xdc, 0xb7, 0xdd, 0x27, 0xbf, 0x85, 0x46, 0x7e, 0xa1, 0xc7, 0x53, + 0x38, 0x7a, 0x34, 0xa9, 0x3f, 0x3b, 0xbe, 0x90, 0xa2, 0x68, 0x76, 0xdc, 0xc4, 0xe6, 0xfa, 0x25, + 0x5b, 0xaf, 0x04, 0xcb, 0xec, 0x8c, 0xfa, 0x71, 0x03, 0xcf, 0x7e, 0x78, 0xd0, 0xbe, 0x32, 0x7f, + 0x44, 0xe4, 0x35, 0x74, 0x9c, 0x8b, 0xc8, 0xe8, 0x91, 0xa9, 0xec, 0x13, 0x04, 0x47, 0x5b, 0xad, + 0x46, 0x66, 0x30, 0x78, 0x70, 0x0f, 0x72, 0x5c, 0xeb, 0xb6, 0xbd, 0x63, 0xf0, 0xff, 0xf6, 0xa4, + 0xab, 0x95, 0x74, 0x6c, 0xf2, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x92, 0x66, 0x1c, 0x16, + 0x1b, 0x05, 0x00, 0x00, } diff --git a/proto/dkron.proto b/proto/dkron.proto index 3d1d09dc2..e100d0b84 100644 --- a/proto/dkron.proto +++ b/proto/dkron.proto @@ -1,4 +1,4 @@ -// protoc -I proto/ proto/dkron.proto --go_out=plugins=grpc:dkron/grpc/ +// protoc -I proto/ proto/dkron.proto --go_out=plugins=grpc:proto/ syntax = "proto3"; package proto; @@ -13,9 +13,6 @@ message GetJobResponse { string name = 1; string timezone = 2; string schedule = 3; - bool shell = 4; - string command = 5; - repeated string environment_variables = 6; string owner = 7; string owner_email = 8; int32 success_count = 9;