From ac6f4814a1f0f8bc7aa1a3c10b9844b94923ca45 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Thu, 1 Mar 2018 16:34:27 +0000 Subject: [PATCH 01/29] -> When GET /metadata/workflow/{name} is called without a version conductor returns the latest version Line 110: Conductor python library defaults to version=1 -> When GET /workflow/running/{name} is called without version conductor returns all the running workflows for all versions Line 203: Conductor python library default, only gets version=1 -> When POST /workflow is sent an object without the 'version' key, it starts the latest version of that workflow Line 211: Conductor python library defaults to run the version=1 Line 266: unneccessary ';' at the end of line Line 287: wfc.terminateWorkflow(wfId) returns nothing ** This commit fixes the problems stated above ** --- client/python/conductor/conductor.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/client/python/conductor/conductor.py b/client/python/conductor/conductor.py index 73d9839f3f..afe1993107 100644 --- a/client/python/conductor/conductor.py +++ b/client/python/conductor/conductor.py @@ -107,7 +107,7 @@ class MetadataClient(BaseClient): def __init__(self, baseURL): BaseClient.__init__(self, baseURL, self.BASE_RESOURCE) - def getWorkflowDef(self, wfname, version=1): + def getWorkflowDef(self, wfname, version=None): url = self.makeUrl('workflow/{}', wfname) params = {} params['version']=version @@ -200,7 +200,7 @@ def getWorkflow(self, wfId, includeTasks=True): params['includeTasks']=includeTasks return self.get(url, params) - def getRunningWorkflows(self, wfName, version=1, startTime=None, endTime=None): + def getRunningWorkflows(self, wfName, version=None, startTime=None, endTime=None): url = self.makeUrl('running/{}', wfName) params = {} params['version']=version @@ -208,7 +208,7 @@ def getRunningWorkflows(self, wfName, version=1, startTime=None, endTime=None): params['endTime']=endTime return self.get(url, params) - def startWorkflow(self, wfName, inputjson, version=1, correlationId=None): + def startWorkflow(self, wfName, inputjson, version=None, correlationId=None): url = self.makeUrl('{}', wfName) params = {} params['version']=version @@ -263,7 +263,7 @@ def main(): if command == 'start': if len(sys.argv) < 7: print('python conductor server_url start workflow_name input_json [version] [correlationId]') - return None; + return None wfName = sys.argv[3] version = sys.argv[4] input = json.loads(sys.argv[5]) @@ -284,8 +284,11 @@ def main(): print('python conductor server_url terminate workflow_id') return None wfId = sys.argv[3] - wfjson = wfc.terminateWorkflow(wfId) + wfc.terminateWorkflow(wfId) print('OK') return wfId + + if __name__ == '__main__': main() + From 6bfcc420981e74ae407269831cfa134aa77f1c31 Mon Sep 17 00:00:00 2001 From: Greg Orzell Date: Thu, 6 Sep 2018 16:21:44 +0200 Subject: [PATCH 02/29] [WIP] Try to improve Golang bootstrap/build. --- client/gogrpc/Makefile | 35 ++++++++++++++++++++++++++++++++--- client/gogrpc/go.mod | 14 ++++++++++++++ client/gogrpc/go.sum | 21 +++++++++++++++++++++ client/gogrpc/tools.go | 9 +++++++++ 4 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 client/gogrpc/go.mod create mode 100644 client/gogrpc/go.sum create mode 100644 client/gogrpc/tools.go diff --git a/client/gogrpc/Makefile b/client/gogrpc/Makefile index 805a841fa7..2e24b0a11a 100644 --- a/client/gogrpc/Makefile +++ b/client/gogrpc/Makefile @@ -1,5 +1,17 @@ PROTO_SRC = ../../grpc/src/main/proto +PROTO_VERSION = 3.5.1 +UNAME_S := $(shell uname -s) +OSFLAG:= +ifeq ($(UNAME_S),Linux) + OS = linux +endif +ifeq ($(UNAME_S),Darwin) + OS = osx +endif + +BUILD_DIR = build +BIN_DIR = $(BUILD_DIR)/bin SERVICES = \ $(PROTO_SRC)/grpc/event_service.pb.go \ $(PROTO_SRC)/grpc/metadata_service.pb.go \ @@ -7,10 +19,27 @@ SERVICES = \ $(PROTO_SRC)/grpc/task_service.pb.go \ $(PROTO_SRC)/grpc/workflow_service.pb.go +bootstrap: install-protoc + go install github.com/golang/protobuf/protoc-gen-go + go install github.com/square/goprotowrap/cmd/protowrap + +proto: models $(SERVICES) + +build: + go fmt ./... + go build ./... + +test: + go test ./... + +# Helpers $(SERVICES): %.pb.go: %.proto - protoc -I $(PROTO_SRC) $< --go_out=plugins=grpc:$(GOPATH)/src + $(BIN_DIR)/protoc -I $(PROTO_SRC) $< --go_out=plugins=grpc:$(GOPATH)/src models: - protoc -I $(PROTO_SRC) $(PROTO_SRC)/model/*.proto --go_out=$(GOPATH)/src + $(BIN_DIR)/protoc -I $(PROTO_SRC) $(PROTO_SRC)/model/*.proto --go_out=$(GOPATH)/src -proto: models $(SERVICES) \ No newline at end of file +install-protoc: + mkdir -p $(BIN_DIR) + curl -Lso $(BUILD_DIR)/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTO_VERSION)/protoc-$(PROTO_VERSION)-$(OS)-x86_64.zip + cd $(BUILD_DIR); unzip protoc.zip diff --git a/client/gogrpc/go.mod b/client/gogrpc/go.mod new file mode 100644 index 0000000000..0816d05e74 --- /dev/null +++ b/client/gogrpc/go.mod @@ -0,0 +1,14 @@ +module github.com/netflix/conductor/client/gogrpc + +require ( + github.com/davecgh/go-spew v1.1.0 + github.com/golang/protobuf v1.1.0 + github.com/pmezard/go-difflib v1.0.0 + github.com/square/goprotowrap v0.0.0-20180504135057-6f414ea4a80c // indirect + github.com/stretchr/testify v1.2.1 + golang.org/x/net v0.0.0-20180826012351-8a410e7b638d + golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20180831171423-11092d34479b // indirect + google.golang.org/grpc v1.14.0 +) diff --git a/client/gogrpc/go.sum b/client/gogrpc/go.sum new file mode 100644 index 0000000000..5db68e5cb1 --- /dev/null +++ b/client/gogrpc/go.sum @@ -0,0 +1,21 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/netflix/conductor v1.11.5 h1:HxVBurFWxFtz56wepyiXFkLunRISlXTKfBlkuAnXPd0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/square/goprotowrap v0.0.0-20180504135057-6f414ea4a80c h1:iIIx5xujWT8vyoW+umx0/JSpNvZQgQUv9krqlN2AOTA= +github.com/square/goprotowrap v0.0.0-20180504135057-6f414ea4a80c/go.mod h1:ss+tcSDAsyytwf1fIIsDTBbLS5uMvktdl8DvEZwELx4= +github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U= +github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= diff --git a/client/gogrpc/tools.go b/client/gogrpc/tools.go new file mode 100644 index 0000000000..5b4c8025ad --- /dev/null +++ b/client/gogrpc/tools.go @@ -0,0 +1,9 @@ +// +build tools + +package tools + +import ( + _ "github.com/golang/protobuf/protoc-gen-go" + _ "github.com/square/goprotowrap/cmd/protowrap" + _ "github.com/kazegusuri/grpcurl" +) From de57e60e0f944f61b9e01d661abc1de0de15b68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Thu, 6 Sep 2018 20:15:36 -0700 Subject: [PATCH 03/29] Docker container specification to build/test conductor --- docker/ci/Dockerfile | 6 ++++++ .../com/netflix/conductor/dao/mysql/EmbeddedDatabase.java | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 docker/ci/Dockerfile diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile new file mode 100644 index 0000000000..68f7e9f19e --- /dev/null +++ b/docker/ci/Dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8-jdk + +WORKDIR /workspace/conductor +COPY . /workspace/conductor + +RUN ./gradlew clean build diff --git a/mysql-persistence/src/test/java/com/netflix/conductor/dao/mysql/EmbeddedDatabase.java b/mysql-persistence/src/test/java/com/netflix/conductor/dao/mysql/EmbeddedDatabase.java index 6776966097..9ca5b7b264 100644 --- a/mysql-persistence/src/test/java/com/netflix/conductor/dao/mysql/EmbeddedDatabase.java +++ b/mysql-persistence/src/test/java/com/netflix/conductor/dao/mysql/EmbeddedDatabase.java @@ -1,5 +1,7 @@ package com.netflix.conductor.dao.mysql; +import ch.vorburger.mariadb4j.DBConfiguration; +import ch.vorburger.mariadb4j.DBConfigurationBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +20,11 @@ public DB getDB() { private DB startEmbeddedDatabase() { try { - DB db = DB.newEmbeddedDB(33307); + DBConfiguration dbConfiguration = DBConfigurationBuilder.newBuilder() + .setPort(33307) + .addArg("--user=root") + .build(); + DB db = DB.newEmbeddedDB(dbConfiguration); db.start(); db.createDB("conductor"); return db; From 1469fabd26aa8b586794662b6363775000469928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Fri, 7 Sep 2018 13:18:46 -0700 Subject: [PATCH 04/29] Update Dockerfiles to use openjdk image - Java image is deprecated (https://hub.docker.com/_/java/) --- docker/server/Dockerfile | 2 +- docker/server/Dockerfile.build | 2 +- docker/serverAndUI/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index a3d3efdd5d..496c2098ae 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,7 +1,7 @@ # # conductor:server - Netflix conductor server # -FROM java:8-jre-alpine +FROM openjdk:8-jre-alpine MAINTAINER Netflix OSS diff --git a/docker/server/Dockerfile.build b/docker/server/Dockerfile.build index ea82dc149c..3bfec6c5c1 100644 --- a/docker/server/Dockerfile.build +++ b/docker/server/Dockerfile.build @@ -1,7 +1,7 @@ # # conductor:server - Netflix conductor server # -FROM java:8-jdk +FROM openjdk:8-jdk MAINTAINER Netflix OSS diff --git a/docker/serverAndUI/Dockerfile b/docker/serverAndUI/Dockerfile index 1e4a8ec520..0669ccc833 100644 --- a/docker/serverAndUI/Dockerfile +++ b/docker/serverAndUI/Dockerfile @@ -1,7 +1,7 @@ # # conductor:serverAndUI - Netflix conductor server and UI # -FROM java:8-jdk +FROM openjdk:8-jdk MAINTAINER Netflix OSS From 9a7911f5867d1d1fe47bad20ae071cbb30552d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Fri, 7 Sep 2018 20:02:45 -0700 Subject: [PATCH 05/29] Dockerfile for gogrpc client build and test --- client/gogrpc/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 client/gogrpc/Dockerfile diff --git a/client/gogrpc/Dockerfile b/client/gogrpc/Dockerfile new file mode 100644 index 0000000000..340726fa61 --- /dev/null +++ b/client/gogrpc/Dockerfile @@ -0,0 +1,8 @@ +FROM golang:1.11-stretch + +RUN apt-get update && apt-get install unzip + +COPY . /conductor +WORKDIR /conductor + +RUN cd /conductor/client/gogrpc && make bootstrap && make proto && make build && make test From 69de92b35713cbe1a854c478d6c2d513b892392a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Fri, 7 Sep 2018 20:03:25 -0700 Subject: [PATCH 06/29] Updated worker_test.go in order to pass the go client grpc tests --- client/gogrpc/conductor/worker_test.go | 74 ++++++++++++++++---------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/client/gogrpc/conductor/worker_test.go b/client/gogrpc/conductor/worker_test.go index 152197c2e9..9e693d3bda 100644 --- a/client/gogrpc/conductor/worker_test.go +++ b/client/gogrpc/conductor/worker_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/golang/protobuf/ptypes/empty" - pb "github.com/netflix/conductor/client/gogrpc/conductor/grpc" + tasks "github.com/netflix/conductor/client/gogrpc/conductor/grpc/tasks" + "github.com/netflix/conductor/client/gogrpc/conductor/model" "google.golang.org/grpc" @@ -40,7 +40,7 @@ func randomTaskID() string { var ErrNotImplemented = fmt.Errorf("API call not implemented") -func (s *fakeTaskService) newTask(req *pb.PollRequest) (*model.Task, error) { +func (s *fakeTaskService) newTask(req *tasks.PollRequest) (*model.Task, error) { id := randomTaskID() s.mu.Lock() @@ -54,7 +54,7 @@ func (s *fakeTaskService) newTask(req *pb.PollRequest) (*model.Task, error) { }, nil } -func (s *fakeTaskService) updateTask(res *model.TaskResult) (*pb.TaskUpdateResponse, error) { +func (s *fakeTaskService) updateTask(res *model.TaskResult) (*tasks.UpdateTaskResponse, error) { id := res.GetTaskId() s.mu.Lock() @@ -64,51 +64,69 @@ func (s *fakeTaskService) updateTask(res *model.TaskResult) (*pb.TaskUpdateRespo s.completed[id] = true s.mu.Unlock() - return &pb.TaskUpdateResponse{ + return &tasks.UpdateTaskResponse{ TaskId: id, }, nil } -func (s *fakeTaskService) Poll(ctx context.Context, in *pb.PollRequest, opts ...grpc.CallOption) (*model.Task, error) { - select { - case <-time.After(s.latency): - return s.newTask(in) - case <-s.shutdown: - return nil, s.result - } -} -func (s *fakeTaskService) PollStream(ctx context.Context, opts ...grpc.CallOption) (pb.TaskService_PollStreamClient, error) { +func (s *fakeTaskService) Poll(ctx context.Context, in *tasks.PollRequest, opts ...grpc.CallOption) (*tasks.PollResponse, error) { return nil, ErrNotImplemented } -func (s *fakeTaskService) GetTasksInProgress(ctx context.Context, in *pb.TasksInProgressRequest, opts ...grpc.CallOption) (*pb.TasksInProgressResponse, error) { + +func (s *fakeTaskService) BatchPoll(context.Context, *tasks.BatchPollRequest, ...grpc.CallOption) (tasks.TaskService_BatchPollClient, error) { return nil, ErrNotImplemented } -func (s *fakeTaskService) GetPendingTaskForWorkflow(ctx context.Context, in *pb.PendingTaskRequest, opts ...grpc.CallOption) (*model.Task, error) { - return nil, ErrNotImplemented + +func (s *fakeTaskService) GetPendingTaskForWorkflow(context.Context, *tasks.PendingTaskRequest, ...grpc.CallOption) (*tasks.PendingTaskResponse, error) { + return nil, ErrNotImplemented } -func (s *fakeTaskService) UpdateTask(ctx context.Context, in *model.TaskResult, opts ...grpc.CallOption) (*pb.TaskUpdateResponse, error) { - select { - case <-time.After(s.latency): - return s.updateTask(in) - case <-s.shutdown: - return nil, s.result - } + +func (s *fakeTaskService) GetTasksInProgress(ctx context.Context, in *tasks.TasksInProgressRequest, opts ...grpc.CallOption) (*tasks.TasksInProgressResponse, error) { + return nil, ErrNotImplemented } -func (s *fakeTaskService) AckTask(ctx context.Context, in *pb.AckTaskRequest, opts ...grpc.CallOption) (*pb.AckTaskResponse, error) { + +func (s *fakeTaskService) UpdateTask(ctx context.Context, in *tasks.UpdateTaskRequest, opts ...grpc.CallOption) (*tasks.UpdateTaskResponse, error) { return nil, ErrNotImplemented } -func (s *fakeTaskService) AddLog(ctx context.Context, in *pb.AddLogRequest, opts ...grpc.CallOption) (*empty.Empty, error) { + +func (s *fakeTaskService) AckTask(ctx context.Context, in *tasks.AckTaskRequest, opts ...grpc.CallOption) (*tasks.AckTaskResponse, error) { return nil, ErrNotImplemented } -func (s *fakeTaskService) GetLogs(ctx context.Context, in *pb.TaskId, opts ...grpc.CallOption) (*pb.GetLogsResponse, error) { + +func (s *fakeTaskService) AddLog(ctx context.Context, in *tasks.AddLogRequest, opts ...grpc.CallOption) (*tasks.AddLogResponse, error) { return nil, ErrNotImplemented } +func (s *fakeTaskService) GetQueueAllInfo(ctx context.Context, in *tasks.QueueAllInfoRequest, opts ...grpc.CallOption) (*tasks.QueueAllInfoResponse, error) { + return nil, ErrNotImplemented +} + +func (s *fakeTaskService) GetQueueInfo(ctx context.Context, in *tasks.QueueInfoRequest, opts ...grpc.CallOption) (*tasks.QueueInfoResponse, error) { + return nil, ErrNotImplemented +} + +func (s *fakeTaskService) GetTaskLogs(ctx context.Context, in *tasks.GetTaskLogsRequest, opts ...grpc.CallOption) (*tasks.GetTaskLogsResponse, error) { + return nil, ErrNotImplemented +} + +func (s *fakeTaskService) GetTask(ctx context.Context, in *tasks.GetTaskRequest, opts ...grpc.CallOption) (*tasks.GetTaskResponse, error) { + return nil, ErrNotImplemented +} + +func (s *fakeTaskService) RemoveTaskFromQueue(ctx context.Context, in *tasks.RemoveTaskRequest, opts ...grpc.CallOption) (*tasks.RemoveTaskResponse, error) { + return nil, ErrNotImplemented +} + +func (s *fakeTaskService) GetQueueSizesForTasks(ctx context.Context, in *tasks.QueueSizesRequest, opts ...grpc.CallOption) (*tasks.QueueSizesResponse, error) { + return nil, ErrNotImplemented +} + + type fakeTaskClient struct { tasks *fakeTaskService } -func (c *fakeTaskClient) Tasks() pb.TaskServiceClient { +func (c *fakeTaskClient) Tasks() tasks.TaskServiceClient { return c.tasks } From 0e5bf1fd606ef5866049f9bafea636bd6e400da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Sun, 9 Sep 2018 22:29:28 -0700 Subject: [PATCH 07/29] Entrypoint script for go build dockerization - Understanding and customizing docker-protoc example from namely. Work in progress --- client/gogrpc/entrypoint.sh | 66 +++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 client/gogrpc/entrypoint.sh diff --git a/client/gogrpc/entrypoint.sh b/client/gogrpc/entrypoint.sh new file mode 100755 index 0000000000..b6f246adf7 --- /dev/null +++ b/client/gogrpc/entrypoint.sh @@ -0,0 +1,66 @@ +#!/bin/bash + +set -e + +printUsage() { + echo "gen-proto generates grpc and protobuf" + echo " " + echo "Usage: gen-proto --protoDir myProtoDir --output ." + echo " " + echo "options:" + echo " -h, --help Show help" + echo " --protoDir DIR Scans the given directory for all proto files" + echo " --output DIR The output directory for generated files. Will be automatically created." +} + +OUTPUT_DIR="" + +while test $# -gt 0; do + case "$1" in + -h|--help) + printUsage + exit 0 + ;; + --protoDir) + shift + if test $# -gt 0; then + PROTO_DIR=$1 + else + echo "Directory not specified for consuming proto files" + exit 1 + fi + shift + ;; + --output) + shift + OUTPUT_DIR=$1 + shift + ;; + esac +done + +if [[ -z $PROTO_DIR ]]; then + echo "Error: You must specify a proto directory" + printUsage + exit 1 +fi + +if [[ $OUTPUT_DIR == '' ]]; then + OUTPUT_DIR="." +fi + +OUTPUT_DIR="${OUTPUT_DIR}/generated" + +echo "Generating Go files for ${PROTO_DIR} in $OUTPUT_DIR" + +## TODO +## Think about make and where the go_out should live + +if [[ ! -d $OUTPUT_DIR ]]; then + mkdir -p $OUTPUT_DIR +fi + + +GEN_STRING="--go_out=${GO_SOURCE_RELATIVE}plugins=grpc:$OUT_DIR" + + From 53186b70baf091dfad940b68d600213f59670329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Mon, 10 Sep 2018 14:02:38 -0700 Subject: [PATCH 08/29] Creation of grpc client on demand through docker - Finished creation of the script in charge of generating the grpc client inside Docker --- client/gogrpc/Dockerfile | 9 +++++++-- client/gogrpc/Makefile | 5 +++-- client/gogrpc/entrypoint.sh | 19 ++++++++----------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/client/gogrpc/Dockerfile b/client/gogrpc/Dockerfile index 340726fa61..818c591d33 100644 --- a/client/gogrpc/Dockerfile +++ b/client/gogrpc/Dockerfile @@ -3,6 +3,11 @@ FROM golang:1.11-stretch RUN apt-get update && apt-get install unzip COPY . /conductor -WORKDIR /conductor +WORKDIR /conductor/client/gogrpc -RUN cd /conductor/client/gogrpc && make bootstrap && make proto && make build && make test +#Installs all dependencies, creates a build of the grpc client and tests it +RUN make bootstrap && make proto && make build && make test + +#Entrypoint for generation of grpc client on demand +RUN chmod +x entrypoint.sh +ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/client/gogrpc/Makefile b/client/gogrpc/Makefile index 2e24b0a11a..b1002aada3 100644 --- a/client/gogrpc/Makefile +++ b/client/gogrpc/Makefile @@ -1,5 +1,6 @@ PROTO_SRC = ../../grpc/src/main/proto PROTO_VERSION = 3.5.1 +GO_OUTPUT=$(GOPATH)/src UNAME_S := $(shell uname -s) OSFLAG:= @@ -34,10 +35,10 @@ test: # Helpers $(SERVICES): %.pb.go: %.proto - $(BIN_DIR)/protoc -I $(PROTO_SRC) $< --go_out=plugins=grpc:$(GOPATH)/src + $(BIN_DIR)/protoc -I $(PROTO_SRC) $< --go_out=plugins=grpc:$(GO_OUTPUT) models: - $(BIN_DIR)/protoc -I $(PROTO_SRC) $(PROTO_SRC)/model/*.proto --go_out=$(GOPATH)/src + $(BIN_DIR)/protoc -I $(PROTO_SRC) $(PROTO_SRC)/model/*.proto --go_out=$(GO_OUTPUT) install-protoc: mkdir -p $(BIN_DIR) diff --git a/client/gogrpc/entrypoint.sh b/client/gogrpc/entrypoint.sh index b6f246adf7..d26ec1b457 100755 --- a/client/gogrpc/entrypoint.sh +++ b/client/gogrpc/entrypoint.sh @@ -3,14 +3,14 @@ set -e printUsage() { - echo "gen-proto generates grpc and protobuf" + echo "entrypoint generates grpc client" echo " " - echo "Usage: gen-proto --protoDir myProtoDir --output ." + echo "Usage: ./entrypoint --dir myProtoDir --output ." echo " " echo "options:" - echo " -h, --help Show help" - echo " --protoDir DIR Scans the given directory for all proto files" - echo " --output DIR The output directory for generated files. Will be automatically created." + echo " -h, --help Show help" + echo " -d, --dir DIR Scans the given directory for all proto files" + echo " -o, --output DIR The output directory for generated files. Will be automatically created." } OUTPUT_DIR="" @@ -21,7 +21,7 @@ while test $# -gt 0; do printUsage exit 0 ;; - --protoDir) + -d|--dir) shift if test $# -gt 0; then PROTO_DIR=$1 @@ -31,7 +31,7 @@ while test $# -gt 0; do fi shift ;; - --output) + -o|--output) shift OUTPUT_DIR=$1 shift @@ -53,14 +53,11 @@ OUTPUT_DIR="${OUTPUT_DIR}/generated" echo "Generating Go files for ${PROTO_DIR} in $OUTPUT_DIR" -## TODO -## Think about make and where the go_out should live - if [[ ! -d $OUTPUT_DIR ]]; then mkdir -p $OUTPUT_DIR fi -GEN_STRING="--go_out=${GO_SOURCE_RELATIVE}plugins=grpc:$OUT_DIR" +make PROTO_SRC=$PROTO_DIR GO_OUTPUT=$OUTPUT_DIR proto From e7178bf98b1b95beae266cd94aec4bc03c94b0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Mon, 10 Sep 2018 15:33:53 -0700 Subject: [PATCH 09/29] Updated entrypoint script for docker proto generation --- client/gogrpc/Dockerfile | 4 +++- client/gogrpc/entrypoint.sh | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/gogrpc/Dockerfile b/client/gogrpc/Dockerfile index 818c591d33..173fbba926 100644 --- a/client/gogrpc/Dockerfile +++ b/client/gogrpc/Dockerfile @@ -2,7 +2,9 @@ FROM golang:1.11-stretch RUN apt-get update && apt-get install unzip -COPY . /conductor +ADD ./client /conductor/client +ADD ./grpc /conductor/grpc + WORKDIR /conductor/client/gogrpc #Installs all dependencies, creates a build of the grpc client and tests it diff --git a/client/gogrpc/entrypoint.sh b/client/gogrpc/entrypoint.sh index d26ec1b457..ca8491ac00 100755 --- a/client/gogrpc/entrypoint.sh +++ b/client/gogrpc/entrypoint.sh @@ -3,9 +3,9 @@ set -e printUsage() { - echo "entrypoint generates grpc client" + echo "./entrypoint.sh generates grpc client" echo " " - echo "Usage: ./entrypoint --dir myProtoDir --output ." + echo "Usage: ./entrypoint.sh --dir myProtoDir --output ." echo " " echo "options:" echo " -h, --help Show help" @@ -13,6 +13,7 @@ printUsage() { echo " -o, --output DIR The output directory for generated files. Will be automatically created." } +PROTO_DIR="/conductor/grpc/src/main/proto" OUTPUT_DIR="" while test $# -gt 0; do From 63935d2dc7e9527a12de3d08215f658faa95ebbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Mon, 10 Sep 2018 15:53:03 -0700 Subject: [PATCH 10/29] Added README instructions for go gRPC client generation --- client/gogrpc/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 client/gogrpc/README.md diff --git a/client/gogrpc/README.md b/client/gogrpc/README.md new file mode 100644 index 0000000000..24b6ccd77f --- /dev/null +++ b/client/gogrpc/README.md @@ -0,0 +1,17 @@ +## Conductor: gRPC Go client generation +At the moment, the generation of the go client is manual. +You can generate the Go gRPC client through docker doing the following: +- On the project directory, create/update the latest proto files +``` +./gradlew clean build +``` +This should update the `grpc` folder with the latest proto definitions. +- Build the docker image in charge of generating, building and testing the client. +``` +docker build -f client/gogrpc/Dockerfile . -t protocontainer +``` +- Once the build passes, we can generate the client on demand doing the following: +``` +docker run --rm -it -v $PWD/client/gogrpc/generated:'/conductor/client/gogrpc/generated' protocontainer:latest +``` +This should create a folder under `/client/gogrpc/generated`. \ No newline at end of file From e8e21e424285bbce001dbd85d626dea5b3443446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Tue, 11 Sep 2018 19:21:36 -0700 Subject: [PATCH 11/29] Generation of grpc client can be done through make --- client/gogrpc/Dockerfile | 15 ------ client/gogrpc/Makefile | 8 +++- client/gogrpc/conductor/worker_test.go | 2 +- client/gogrpc/docker/Dockerfile | 13 ++++++ client/gogrpc/entrypoint.sh | 64 -------------------------- 5 files changed, 20 insertions(+), 82 deletions(-) delete mode 100644 client/gogrpc/Dockerfile create mode 100644 client/gogrpc/docker/Dockerfile delete mode 100755 client/gogrpc/entrypoint.sh diff --git a/client/gogrpc/Dockerfile b/client/gogrpc/Dockerfile deleted file mode 100644 index 173fbba926..0000000000 --- a/client/gogrpc/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM golang:1.11-stretch - -RUN apt-get update && apt-get install unzip - -ADD ./client /conductor/client -ADD ./grpc /conductor/grpc - -WORKDIR /conductor/client/gogrpc - -#Installs all dependencies, creates a build of the grpc client and tests it -RUN make bootstrap && make proto && make build && make test - -#Entrypoint for generation of grpc client on demand -RUN chmod +x entrypoint.sh -ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/client/gogrpc/Makefile b/client/gogrpc/Makefile index b1002aada3..e5936a9833 100644 --- a/client/gogrpc/Makefile +++ b/client/gogrpc/Makefile @@ -21,8 +21,8 @@ SERVICES = \ $(PROTO_SRC)/grpc/workflow_service.pb.go bootstrap: install-protoc - go install github.com/golang/protobuf/protoc-gen-go - go install github.com/square/goprotowrap/cmd/protowrap + go get -u github.com/golang/protobuf/protoc-gen-go + go get -u github.com/square/goprotowrap/cmd/protowrap proto: models $(SERVICES) @@ -44,3 +44,7 @@ install-protoc: mkdir -p $(BIN_DIR) curl -Lso $(BUILD_DIR)/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTO_VERSION)/protoc-$(PROTO_VERSION)-$(OS)-x86_64.zip cd $(BUILD_DIR); unzip protoc.zip + +generateClient: + docker build -f docker/Dockerfile -t protocontainer $(PWD)/../../ + docker run --rm -it -v $(PWD)/generated:'/generated' protocontainer:latest diff --git a/client/gogrpc/conductor/worker_test.go b/client/gogrpc/conductor/worker_test.go index 9e693d3bda..39e6416f2b 100644 --- a/client/gogrpc/conductor/worker_test.go +++ b/client/gogrpc/conductor/worker_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - tasks "github.com/netflix/conductor/client/gogrpc/conductor/grpc/tasks" + "github.com/netflix/conductor/client/gogrpc/conductor/grpc/tasks" "github.com/netflix/conductor/client/gogrpc/conductor/model" "google.golang.org/grpc" diff --git a/client/gogrpc/docker/Dockerfile b/client/gogrpc/docker/Dockerfile new file mode 100644 index 0000000000..73f52d60e3 --- /dev/null +++ b/client/gogrpc/docker/Dockerfile @@ -0,0 +1,13 @@ +FROM golang:1.11-stretch as builder + +RUN apt-get update && apt-get install unzip + +WORKDIR /go/src/github.com/netflix/conductor + +ADD ./client ./client +ADD ./grpc ./grpc + +ENV GO111MODULE on +RUN cd client/gogrpc && make bootstrap proto test + +ENTRYPOINT ["cp", "-r", "client/gogrpc/conductor/grpc", "client/gogrpc/conductor/model", "/generated"] diff --git a/client/gogrpc/entrypoint.sh b/client/gogrpc/entrypoint.sh deleted file mode 100755 index ca8491ac00..0000000000 --- a/client/gogrpc/entrypoint.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -set -e - -printUsage() { - echo "./entrypoint.sh generates grpc client" - echo " " - echo "Usage: ./entrypoint.sh --dir myProtoDir --output ." - echo " " - echo "options:" - echo " -h, --help Show help" - echo " -d, --dir DIR Scans the given directory for all proto files" - echo " -o, --output DIR The output directory for generated files. Will be automatically created." -} - -PROTO_DIR="/conductor/grpc/src/main/proto" -OUTPUT_DIR="" - -while test $# -gt 0; do - case "$1" in - -h|--help) - printUsage - exit 0 - ;; - -d|--dir) - shift - if test $# -gt 0; then - PROTO_DIR=$1 - else - echo "Directory not specified for consuming proto files" - exit 1 - fi - shift - ;; - -o|--output) - shift - OUTPUT_DIR=$1 - shift - ;; - esac -done - -if [[ -z $PROTO_DIR ]]; then - echo "Error: You must specify a proto directory" - printUsage - exit 1 -fi - -if [[ $OUTPUT_DIR == '' ]]; then - OUTPUT_DIR="." -fi - -OUTPUT_DIR="${OUTPUT_DIR}/generated" - -echo "Generating Go files for ${PROTO_DIR} in $OUTPUT_DIR" - -if [[ ! -d $OUTPUT_DIR ]]; then - mkdir -p $OUTPUT_DIR -fi - - -make PROTO_SRC=$PROTO_DIR GO_OUTPUT=$OUTPUT_DIR proto - - From 89d7eb697daa40ba990cf0f7e414d9cff5f26ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Tue, 11 Sep 2018 23:12:43 -0700 Subject: [PATCH 12/29] Permission overwrite for grpc client generation --- client/gogrpc/.gitignore | 3 ++- client/gogrpc/Makefile | 5 ++++- client/gogrpc/README.md | 17 ++++------------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/client/gogrpc/.gitignore b/client/gogrpc/.gitignore index 49ce3c193f..ae4ffe4983 100644 --- a/client/gogrpc/.gitignore +++ b/client/gogrpc/.gitignore @@ -1 +1,2 @@ -/vendor \ No newline at end of file +/vendor +/generated \ No newline at end of file diff --git a/client/gogrpc/Makefile b/client/gogrpc/Makefile index e5936a9833..7c001f911f 100644 --- a/client/gogrpc/Makefile +++ b/client/gogrpc/Makefile @@ -3,6 +3,9 @@ PROTO_VERSION = 3.5.1 GO_OUTPUT=$(GOPATH)/src UNAME_S := $(shell uname -s) +USER_ID := $(shell id -u) +GROUP_ID := $(shell id -g) + OSFLAG:= ifeq ($(UNAME_S),Linux) OS = linux @@ -47,4 +50,4 @@ install-protoc: generateClient: docker build -f docker/Dockerfile -t protocontainer $(PWD)/../../ - docker run --rm -it -v $(PWD)/generated:'/generated' protocontainer:latest + docker run --user $(USER_ID):$(GROUP_ID) --rm -it -v $(PWD)/generated:'/generated' protocontainer:latest diff --git a/client/gogrpc/README.md b/client/gogrpc/README.md index 24b6ccd77f..c20fc75158 100644 --- a/client/gogrpc/README.md +++ b/client/gogrpc/README.md @@ -1,17 +1,8 @@ ## Conductor: gRPC Go client generation At the moment, the generation of the go client is manual. -You can generate the Go gRPC client through docker doing the following: -- On the project directory, create/update the latest proto files +In order to generate the Go gRPC client, run: ``` -./gradlew clean build +make generateClient ``` -This should update the `grpc` folder with the latest proto definitions. -- Build the docker image in charge of generating, building and testing the client. -``` -docker build -f client/gogrpc/Dockerfile . -t protocontainer -``` -- Once the build passes, we can generate the client on demand doing the following: -``` -docker run --rm -it -v $PWD/client/gogrpc/generated:'/conductor/client/gogrpc/generated' protocontainer:latest -``` -This should create a folder under `/client/gogrpc/generated`. \ No newline at end of file +This should create a folder under `/client/gogrpc/generated`. If there are changes on your proto files, +you will probably need to review these changes under `generated` and commit them. \ No newline at end of file From 0335c8e1c336d22c4f9c62b1ca4bea282cf8ed25 Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Fri, 14 Sep 2018 17:48:27 +0200 Subject: [PATCH 13/29] client/gogrpc: Use Docker for Proto compilation --- client/gogrpc/Gopkg.lock | 127 ++++++++++- client/gogrpc/Gopkg.toml | 43 +--- client/gogrpc/Makefile | 37 +--- .../conductor/grpc/events/event_service.pb.go | 18 +- .../grpc/metadata/metadata_service.pb.go | 20 +- .../gogrpc/conductor/grpc/search/search.pb.go | 10 +- .../conductor/grpc/tasks/task_service.pb.go | 72 +++--- .../grpc/workflows/workflow_service.pb.go | 62 +++--- .../conductor/model/dynamicforkjointask.pb.go | 10 +- .../model/dynamicforkjointasklist.pb.go | 2 +- .../conductor/model/eventexecution.pb.go | 16 +- .../gogrpc/conductor/model/eventhandler.pb.go | 38 ++-- client/gogrpc/conductor/model/polldata.pb.go | 8 +- .../model/rerunworkflowrequest.pb.go | 10 +- .../conductor/model/skiptaskrequest.pb.go | 8 +- .../model/startworkflowrequest.pb.go | 78 ++++--- .../conductor/model/subworkflowparams.pb.go | 49 ++--- client/gogrpc/conductor/model/task.pb.go | 205 +++++++++--------- client/gogrpc/conductor/model/taskdef.pb.go | 120 +++++----- .../gogrpc/conductor/model/taskexeclog.pb.go | 6 +- .../gogrpc/conductor/model/taskresult.pb.go | 16 +- .../gogrpc/conductor/model/tasksummary.pb.go | 32 +-- client/gogrpc/conductor/model/workflow.pb.go | 143 ++++++------ .../gogrpc/conductor/model/workflowdef.pb.go | 18 +- .../conductor/model/workflowsummary.pb.go | 28 +-- .../gogrpc/conductor/model/workflowtask.pb.go | 200 +++++++---------- client/gogrpc/go.mod | 10 +- 27 files changed, 712 insertions(+), 674 deletions(-) diff --git a/client/gogrpc/Gopkg.lock b/client/gogrpc/Gopkg.lock index 3f80dd76e9..e86460aad9 100644 --- a/client/gogrpc/Gopkg.lock +++ b/client/gogrpc/Gopkg.lock @@ -2,39 +2,115 @@ [[projects]] + digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" name = "github.com/davecgh/go-spew" packages = ["spew"] + pruneopts = "NUT" revision = "346938d642f2ec3594ed81d874461961cd0faa76" version = "v1.1.0" [[projects]] + digest = "1:7a38683af7fc3662a7c85a0795c638c8598cbee808b2246b7f3f16e3f5b302c2" name = "github.com/golang/protobuf" packages = [ + "jsonpb", "proto", + "protoc-gen-go", + "protoc-gen-go/descriptor", + "protoc-gen-go/generator", + "protoc-gen-go/generator/internal/remap", + "protoc-gen-go/grpc", + "protoc-gen-go/plugin", "ptypes", "ptypes/any", "ptypes/duration", "ptypes/empty", "ptypes/struct", - "ptypes/timestamp" + "ptypes/timestamp", + "ptypes/wrappers", ] + pruneopts = "NUT" revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" version = "v1.1.0" [[projects]] + digest = "1:406338ad39ab2e37b7f4452906442a3dbf0eb3379dd1f06aafb5c07e769a5fbb" + name = "github.com/inconshreveable/mousetrap" + packages = ["."] + pruneopts = "NUT" + revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + version = "v1.0" + +[[projects]] + digest = "1:d0ede3366f0fca3c7c0eec74a2c5bfae7711a2fdecb2a3c63330840f333f7977" + name = "github.com/jhump/protoreflect" + packages = [ + "desc", + "desc/internal", + "dynamic", + "dynamic/grpcdynamic", + "grpcreflect", + "internal", + ] + pruneopts = "NUT" + revision = "b28d968eb345542b430a717dc72a88abf10d0b95" + version = "v1.0.0" + +[[projects]] + branch = "master" + digest = "1:d6b6479233449ae6a3defd500360f810d55415f2a768a9ecf62c126b7667903f" + name = "github.com/kazegusuri/grpcurl" + packages = ["."] + pruneopts = "NUT" + revision = "98e92bc156677950a3bedb128a7227b40f0ff125" + +[[projects]] + digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" name = "github.com/pmezard/go-difflib" packages = ["difflib"] + pruneopts = "NUT" revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" [[projects]] + digest = "1:343d44e06621142ab09ae0c76c1799104cdfddd3ffb445d78b1adf8dc3ffaf3d" + name = "github.com/spf13/cobra" + packages = ["."] + pruneopts = "NUT" + revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" + version = "v0.0.3" + +[[projects]] + digest = "1:e3707aeaccd2adc89eba6c062fec72116fe1fc1ba71097da85b4d8ae1668a675" + name = "github.com/spf13/pflag" + packages = ["."] + pruneopts = "NUT" + revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" + version = "v1.0.2" + +[[projects]] + branch = "master" + digest = "1:ea222cd3bb494fb2b0f799e33f91691d2f60cb298d064233367cd692d07d6c39" + name = "github.com/square/goprotowrap" + packages = [ + ".", + "cmd/protowrap", + "wrapper", + ] + pruneopts = "NUT" + revision = "6f414ea4a80cc23c26725b193215be2a0d85d6e1" + +[[projects]] + digest = "1:a852b1ad03ca063d2c57866d9f94dcb1cb2e111415c5902ce0586fc2d207221b" name = "github.com/stretchr/testify" packages = ["assert"] + pruneopts = "NUT" revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" version = "v1.2.1" [[projects]] branch = "master" + digest = "1:d0f20c081d47c012952ec7c153e3f3c751aaaf16608fcc5de77dab7ce67470b5" name = "golang.org/x/net" packages = [ "context", @@ -43,11 +119,21 @@ "http2/hpack", "idna", "internal/timeseries", - "trace" + "trace", ] + pruneopts = "NUT" revision = "dfa909b99c79129e1100513e5cd36307665e5723" [[projects]] + branch = "master" + digest = "1:5c2d57086d29bf60bf5fc8a1e6550650034f8b26177dced9b16d1f673311ab40" + name = "golang.org/x/sys" + packages = ["unix"] + pruneopts = "NUT" + revision = "d0be0721c37eeb5299f245a996a483160fc36940" + +[[projects]] + digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619" name = "golang.org/x/text" packages = [ "collate", @@ -63,51 +149,72 @@ "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable" + "unicode/rangetable", ] + pruneopts = "NUT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" version = "v0.3.0" [[projects]] branch = "master" + digest = "1:3b771528df2dc447e06c130b3131e6c4d0e5093b8a2c44868b7f3d45af517efe" name = "google.golang.org/genproto" - packages = ["googleapis/rpc/status"] + packages = [ + "googleapis/rpc/errdetails", + "googleapis/rpc/status", + ] + pruneopts = "NUT" revision = "694d95ba50e67b2e363f3483057db5d4910c18f9" [[projects]] + digest = "1:827de0295c937025afe1896edd20b56aa9be42840818c194cf0eee6ab7d27e43" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", "balancer/roundrobin", - "channelz", "codes", "connectivity", "credentials", "encoding", "encoding/proto", - "grpclb/grpc_lb_v1/messages", "grpclog", "internal", + "internal/backoff", + "internal/channelz", + "internal/envconfig", + "internal/grpcrand", + "internal/transport", "keepalive", "metadata", "naming", "peer", + "reflection/grpc_reflection_v1alpha", "resolver", "resolver/dns", "resolver/passthrough", "stats", "status", "tap", - "transport" ] - revision = "41344da2231b913fa3d983840a57a6b1b7b631a1" - version = "v1.12.0" + pruneopts = "NUT" + revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" + version = "v1.15.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "ca4602bc2319dbe8e34a88c36f06c428a40582ae6be51bb01af6953432d754c5" + input-imports = [ + "github.com/golang/protobuf/proto", + "github.com/golang/protobuf/protoc-gen-go", + "github.com/golang/protobuf/ptypes/any", + "github.com/golang/protobuf/ptypes/struct", + "github.com/kazegusuri/grpcurl", + "github.com/square/goprotowrap/cmd/protowrap", + "github.com/stretchr/testify/assert", + "golang.org/x/net/context", + "google.golang.org/grpc", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/client/gogrpc/Gopkg.toml b/client/gogrpc/Gopkg.toml index e40cb23029..55ddf0e9e4 100644 --- a/client/gogrpc/Gopkg.toml +++ b/client/gogrpc/Gopkg.toml @@ -1,47 +1,12 @@ -# Gopkg.toml example -# -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/golang/protobuf" - version = "1.1.0" - -[[constraint]] - branch = "master" - name = "golang.org/x/net" - -[[constraint]] - name = "google.golang.org/grpc" - version = "1.12.0" - [prune] go-tests = true unused-packages = true non-go = true +[[constraint]] + name = "google.golang.org/grpc" + version = "1.15.0" + [[constraint]] name = "github.com/stretchr/testify" version = "1.2.1" diff --git a/client/gogrpc/Makefile b/client/gogrpc/Makefile index 7c001f911f..74578d7e65 100644 --- a/client/gogrpc/Makefile +++ b/client/gogrpc/Makefile @@ -1,18 +1,5 @@ PROTO_SRC = ../../grpc/src/main/proto PROTO_VERSION = 3.5.1 -GO_OUTPUT=$(GOPATH)/src - -UNAME_S := $(shell uname -s) -USER_ID := $(shell id -u) -GROUP_ID := $(shell id -g) - -OSFLAG:= -ifeq ($(UNAME_S),Linux) - OS = linux -endif -ifeq ($(UNAME_S),Darwin) - OS = osx -endif BUILD_DIR = build BIN_DIR = $(BUILD_DIR)/bin @@ -23,9 +10,14 @@ SERVICES = \ $(PROTO_SRC)/grpc/task_service.pb.go \ $(PROTO_SRC)/grpc/workflow_service.pb.go -bootstrap: install-protoc - go get -u github.com/golang/protobuf/protoc-gen-go - go get -u github.com/square/goprotowrap/cmd/protowrap +USER_ID := $(shell id -u) +GROUP_ID := $(shell id -g) +CONDUCTOR_ROOT = /go/src/github.com/netflix/conductor +PROTOC = docker run --rm -it \ + --user $(USER_ID):$(GROUP_ID) \ + -v '$(PWD)/../..':'$(CONDUCTOR_ROOT)' \ + -w $(CONDUCTOR_ROOT)/client/gogrpc \ + znly/protoc:0.3.0 proto: models $(SERVICES) @@ -38,16 +30,7 @@ test: # Helpers $(SERVICES): %.pb.go: %.proto - $(BIN_DIR)/protoc -I $(PROTO_SRC) $< --go_out=plugins=grpc:$(GO_OUTPUT) + $(PROTOC) -I $(PROTO_SRC) $< --go_out=plugins=grpc:/go/src models: - $(BIN_DIR)/protoc -I $(PROTO_SRC) $(PROTO_SRC)/model/*.proto --go_out=$(GO_OUTPUT) - -install-protoc: - mkdir -p $(BIN_DIR) - curl -Lso $(BUILD_DIR)/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTO_VERSION)/protoc-$(PROTO_VERSION)-$(OS)-x86_64.zip - cd $(BUILD_DIR); unzip protoc.zip - -generateClient: - docker build -f docker/Dockerfile -t protocontainer $(PWD)/../../ - docker run --user $(USER_ID):$(GROUP_ID) --rm -it -v $(PWD)/generated:'/generated' protocontainer:latest + $(PROTOC) -I $(PROTO_SRC) $(PROTO_SRC)/model/*.proto --go_out=/go/src \ No newline at end of file diff --git a/client/gogrpc/conductor/grpc/events/event_service.pb.go b/client/gogrpc/conductor/grpc/events/event_service.pb.go index 3283eca7f0..6972471586 100644 --- a/client/gogrpc/conductor/grpc/events/event_service.pb.go +++ b/client/gogrpc/conductor/grpc/events/event_service.pb.go @@ -25,7 +25,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type AddEventHandlerRequest struct { - Handler *model.EventHandler `protobuf:"bytes,1,opt,name=handler" json:"handler,omitempty"` + Handler *model.EventHandler `protobuf:"bytes,1,opt,name=handler,proto3" json:"handler,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -93,7 +93,7 @@ func (m *AddEventHandlerResponse) XXX_DiscardUnknown() { var xxx_messageInfo_AddEventHandlerResponse proto.InternalMessageInfo type UpdateEventHandlerRequest struct { - Handler *model.EventHandler `protobuf:"bytes,1,opt,name=handler" json:"handler,omitempty"` + Handler *model.EventHandler `protobuf:"bytes,1,opt,name=handler,proto3" json:"handler,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -161,7 +161,7 @@ func (m *UpdateEventHandlerResponse) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateEventHandlerResponse proto.InternalMessageInfo type RemoveEventHandlerRequest struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -259,8 +259,8 @@ func (m *GetEventHandlersRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetEventHandlersRequest proto.InternalMessageInfo type GetEventHandlersForEventRequest struct { - Event string `protobuf:"bytes,1,opt,name=event" json:"event,omitempty"` - ActiveOnly bool `protobuf:"varint,2,opt,name=active_only,json=activeOnly" json:"active_only,omitempty"` + Event string `protobuf:"bytes,1,opt,name=event,proto3" json:"event,omitempty"` + ActiveOnly bool `protobuf:"varint,2,opt,name=active_only,json=activeOnly,proto3" json:"active_only,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -335,7 +335,7 @@ func (m *GetQueuesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetQueuesRequest proto.InternalMessageInfo type GetQueuesResponse struct { - EventToQueueUri map[string]string `protobuf:"bytes,1,rep,name=event_to_queue_uri,json=eventToQueueUri" json:"event_to_queue_uri,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + EventToQueueUri map[string]string `protobuf:"bytes,1,rep,name=event_to_queue_uri,json=eventToQueueUri,proto3" json:"event_to_queue_uri,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -403,7 +403,7 @@ func (m *GetQueueSizesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetQueueSizesRequest proto.InternalMessageInfo type GetQueueSizesResponse struct { - EventToQueueInfo map[string]*GetQueueSizesResponse_QueueInfo `protobuf:"bytes,2,rep,name=event_to_queue_info,json=eventToQueueInfo" json:"event_to_queue_info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + EventToQueueInfo map[string]*GetQueueSizesResponse_QueueInfo `protobuf:"bytes,2,rep,name=event_to_queue_info,json=eventToQueueInfo,proto3" json:"event_to_queue_info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -441,7 +441,7 @@ func (m *GetQueueSizesResponse) GetEventToQueueInfo() map[string]*GetQueueSizesR } type GetQueueSizesResponse_QueueInfo struct { - QueueSizes map[string]int64 `protobuf:"bytes,1,rep,name=queue_sizes,json=queueSizes" json:"queue_sizes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + QueueSizes map[string]int64 `protobuf:"bytes,1,rep,name=queue_sizes,json=queueSizes,proto3" json:"queue_sizes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -509,7 +509,7 @@ func (m *GetQueueProvidersRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetQueueProvidersRequest proto.InternalMessageInfo type GetQueueProvidersResponse struct { - Providers []string `protobuf:"bytes,1,rep,name=providers" json:"providers,omitempty"` + Providers []string `protobuf:"bytes,1,rep,name=providers,proto3" json:"providers,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go b/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go index 95d4c3a980..daf353165f 100644 --- a/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go +++ b/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go @@ -25,7 +25,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type CreateWorkflowRequest struct { - Workflow *model.WorkflowDef `protobuf:"bytes,1,opt,name=workflow" json:"workflow,omitempty"` + Workflow *model.WorkflowDef `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -93,7 +93,7 @@ func (m *CreateWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateWorkflowResponse proto.InternalMessageInfo type UpdateWorkflowsRequest struct { - Defs []*model.WorkflowDef `protobuf:"bytes,1,rep,name=defs" json:"defs,omitempty"` + Defs []*model.WorkflowDef `protobuf:"bytes,1,rep,name=defs,proto3" json:"defs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -161,8 +161,8 @@ func (m *UpdateWorkflowsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateWorkflowsResponse proto.InternalMessageInfo type GetWorkflowRequest struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -207,7 +207,7 @@ func (m *GetWorkflowRequest) GetVersion() int32 { } type GetWorkflowResponse struct { - Workflow *model.WorkflowDef `protobuf:"bytes,1,opt,name=workflow" json:"workflow,omitempty"` + Workflow *model.WorkflowDef `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -245,7 +245,7 @@ func (m *GetWorkflowResponse) GetWorkflow() *model.WorkflowDef { } type CreateTasksRequest struct { - Defs []*model.TaskDef `protobuf:"bytes,1,rep,name=defs" json:"defs,omitempty"` + Defs []*model.TaskDef `protobuf:"bytes,1,rep,name=defs,proto3" json:"defs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -313,7 +313,7 @@ func (m *CreateTasksResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateTasksResponse proto.InternalMessageInfo type UpdateTaskRequest struct { - Task *model.TaskDef `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` + Task *model.TaskDef `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -381,7 +381,7 @@ func (m *UpdateTaskResponse) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateTaskResponse proto.InternalMessageInfo type GetTaskRequest struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -419,7 +419,7 @@ func (m *GetTaskRequest) GetTaskType() string { } type GetTaskResponse struct { - Task *model.TaskDef `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` + Task *model.TaskDef `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -457,7 +457,7 @@ func (m *GetTaskResponse) GetTask() *model.TaskDef { } type DeleteTaskRequest struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/grpc/search/search.pb.go b/client/gogrpc/conductor/grpc/search/search.pb.go index 1c7ade8fd2..2a5710156d 100644 --- a/client/gogrpc/conductor/grpc/search/search.pb.go +++ b/client/gogrpc/conductor/grpc/search/search.pb.go @@ -19,11 +19,11 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Request struct { - Start int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` - Size int32 `protobuf:"varint,2,opt,name=size" json:"size,omitempty"` - Sort string `protobuf:"bytes,3,opt,name=sort" json:"sort,omitempty"` - FreeText string `protobuf:"bytes,4,opt,name=free_text,json=freeText" json:"free_text,omitempty"` - Query string `protobuf:"bytes,5,opt,name=query" json:"query,omitempty"` + Start int32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"` + Size int32 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` + Sort string `protobuf:"bytes,3,opt,name=sort,proto3" json:"sort,omitempty"` + FreeText string `protobuf:"bytes,4,opt,name=free_text,json=freeText,proto3" json:"free_text,omitempty"` + Query string `protobuf:"bytes,5,opt,name=query,proto3" json:"query,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/grpc/tasks/task_service.pb.go b/client/gogrpc/conductor/grpc/tasks/task_service.pb.go index 6c74f322a2..eabcf3ae1a 100644 --- a/client/gogrpc/conductor/grpc/tasks/task_service.pb.go +++ b/client/gogrpc/conductor/grpc/tasks/task_service.pb.go @@ -25,9 +25,9 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type PollRequest struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` - WorkerId string `protobuf:"bytes,2,opt,name=worker_id,json=workerId" json:"worker_id,omitempty"` - Domain string `protobuf:"bytes,3,opt,name=domain" json:"domain,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` + WorkerId string `protobuf:"bytes,2,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -79,7 +79,7 @@ func (m *PollRequest) GetDomain() string { } type PollResponse struct { - Task *model.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` + Task *model.Task `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -117,11 +117,11 @@ func (m *PollResponse) GetTask() *model.Task { } type BatchPollRequest struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` - WorkerId string `protobuf:"bytes,2,opt,name=worker_id,json=workerId" json:"worker_id,omitempty"` - Domain string `protobuf:"bytes,3,opt,name=domain" json:"domain,omitempty"` - Count int32 `protobuf:"varint,4,opt,name=count" json:"count,omitempty"` - Timeout int32 `protobuf:"varint,5,opt,name=timeout" json:"timeout,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` + WorkerId string `protobuf:"bytes,2,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + Count int32 `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"` + Timeout int32 `protobuf:"varint,5,opt,name=timeout,proto3" json:"timeout,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -187,9 +187,9 @@ func (m *BatchPollRequest) GetTimeout() int32 { } type TasksInProgressRequest struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` - StartKey string `protobuf:"bytes,2,opt,name=start_key,json=startKey" json:"start_key,omitempty"` - Count int32 `protobuf:"varint,3,opt,name=count" json:"count,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` + StartKey string `protobuf:"bytes,2,opt,name=start_key,json=startKey,proto3" json:"start_key,omitempty"` + Count int32 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -241,7 +241,7 @@ func (m *TasksInProgressRequest) GetCount() int32 { } type TasksInProgressResponse struct { - Tasks []*model.Task `protobuf:"bytes,1,rep,name=tasks" json:"tasks,omitempty"` + Tasks []*model.Task `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -279,8 +279,8 @@ func (m *TasksInProgressResponse) GetTasks() []*model.Task { } type PendingTaskRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - TaskRefName string `protobuf:"bytes,2,opt,name=task_ref_name,json=taskRefName" json:"task_ref_name,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + TaskRefName string `protobuf:"bytes,2,opt,name=task_ref_name,json=taskRefName,proto3" json:"task_ref_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -325,7 +325,7 @@ func (m *PendingTaskRequest) GetTaskRefName() string { } type PendingTaskResponse struct { - Task *model.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` + Task *model.Task `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -363,7 +363,7 @@ func (m *PendingTaskResponse) GetTask() *model.Task { } type UpdateTaskRequest struct { - Result *model.TaskResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` + Result *model.TaskResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -401,7 +401,7 @@ func (m *UpdateTaskRequest) GetResult() *model.TaskResult { } type UpdateTaskResponse struct { - TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId" json:"task_id,omitempty"` + TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -439,8 +439,8 @@ func (m *UpdateTaskResponse) GetTaskId() string { } type AckTaskRequest struct { - TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId" json:"task_id,omitempty"` - WorkerId string `protobuf:"bytes,2,opt,name=worker_id,json=workerId" json:"worker_id,omitempty"` + TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` + WorkerId string `protobuf:"bytes,2,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -485,7 +485,7 @@ func (m *AckTaskRequest) GetWorkerId() string { } type AckTaskResponse struct { - Ack bool `protobuf:"varint,1,opt,name=ack" json:"ack,omitempty"` + Ack bool `protobuf:"varint,1,opt,name=ack,proto3" json:"ack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -523,8 +523,8 @@ func (m *AckTaskResponse) GetAck() bool { } type AddLogRequest struct { - TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId" json:"task_id,omitempty"` - Log string `protobuf:"bytes,2,opt,name=log" json:"log,omitempty"` + TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` + Log string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -599,7 +599,7 @@ func (m *AddLogResponse) XXX_DiscardUnknown() { var xxx_messageInfo_AddLogResponse proto.InternalMessageInfo type GetTaskLogsRequest struct { - TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId" json:"task_id,omitempty"` + TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -637,7 +637,7 @@ func (m *GetTaskLogsRequest) GetTaskId() string { } type GetTaskLogsResponse struct { - Logs []*model.TaskExecLog `protobuf:"bytes,1,rep,name=logs" json:"logs,omitempty"` + Logs []*model.TaskExecLog `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -675,7 +675,7 @@ func (m *GetTaskLogsResponse) GetLogs() []*model.TaskExecLog { } type GetTaskRequest struct { - TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId" json:"task_id,omitempty"` + TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -713,7 +713,7 @@ func (m *GetTaskRequest) GetTaskId() string { } type GetTaskResponse struct { - Task *model.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` + Task *model.Task `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -751,8 +751,8 @@ func (m *GetTaskResponse) GetTask() *model.Task { } type RemoveTaskRequest struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` - TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId" json:"task_id,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` + TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -827,7 +827,7 @@ func (m *RemoveTaskResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RemoveTaskResponse proto.InternalMessageInfo type QueueSizesRequest struct { - TaskTypes []string `protobuf:"bytes,1,rep,name=task_types,json=taskTypes" json:"task_types,omitempty"` + TaskTypes []string `protobuf:"bytes,1,rep,name=task_types,json=taskTypes,proto3" json:"task_types,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -865,7 +865,7 @@ func (m *QueueSizesRequest) GetTaskTypes() []string { } type QueueSizesResponse struct { - QueueForTask map[string]int32 `protobuf:"bytes,1,rep,name=queue_for_task,json=queueForTask" json:"queue_for_task,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + QueueForTask map[string]int32 `protobuf:"bytes,1,rep,name=queue_for_task,json=queueForTask,proto3" json:"queue_for_task,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -933,7 +933,7 @@ func (m *QueueInfoRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueueInfoRequest proto.InternalMessageInfo type QueueInfoResponse struct { - Queues map[string]int64 `protobuf:"bytes,1,rep,name=queues" json:"queues,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + Queues map[string]int64 `protobuf:"bytes,1,rep,name=queues,proto3" json:"queues,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1001,7 +1001,7 @@ func (m *QueueAllInfoRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueueAllInfoRequest proto.InternalMessageInfo type QueueAllInfoResponse struct { - Queues map[string]*QueueAllInfoResponse_QueueInfo `protobuf:"bytes,1,rep,name=queues" json:"queues,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Queues map[string]*QueueAllInfoResponse_QueueInfo `protobuf:"bytes,1,rep,name=queues,proto3" json:"queues,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1039,8 +1039,8 @@ func (m *QueueAllInfoResponse) GetQueues() map[string]*QueueAllInfoResponse_Queu } type QueueAllInfoResponse_ShardInfo struct { - Size int64 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"` - Uacked int64 `protobuf:"varint,2,opt,name=uacked" json:"uacked,omitempty"` + Size int64 `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"` + Uacked int64 `protobuf:"varint,2,opt,name=uacked,proto3" json:"uacked,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1085,7 +1085,7 @@ func (m *QueueAllInfoResponse_ShardInfo) GetUacked() int64 { } type QueueAllInfoResponse_QueueInfo struct { - Shards map[string]*QueueAllInfoResponse_ShardInfo `protobuf:"bytes,1,rep,name=shards" json:"shards,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Shards map[string]*QueueAllInfoResponse_ShardInfo `protobuf:"bytes,1,rep,name=shards,proto3" json:"shards,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go b/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go index fd87283a0e..e73a12be92 100644 --- a/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go +++ b/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go @@ -26,7 +26,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type StartWorkflowResponse struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -64,10 +64,10 @@ func (m *StartWorkflowResponse) GetWorkflowId() string { } type GetWorkflowsRequest struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - CorrelationId []string `protobuf:"bytes,2,rep,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - IncludeClosed bool `protobuf:"varint,3,opt,name=include_closed,json=includeClosed" json:"include_closed,omitempty"` - IncludeTasks bool `protobuf:"varint,4,opt,name=include_tasks,json=includeTasks" json:"include_tasks,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + CorrelationId []string `protobuf:"bytes,2,rep,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + IncludeClosed bool `protobuf:"varint,3,opt,name=include_closed,json=includeClosed,proto3" json:"include_closed,omitempty"` + IncludeTasks bool `protobuf:"varint,4,opt,name=include_tasks,json=includeTasks,proto3" json:"include_tasks,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -126,7 +126,7 @@ func (m *GetWorkflowsRequest) GetIncludeTasks() bool { } type GetWorkflowsResponse struct { - WorkflowsById map[string]*GetWorkflowsResponse_Workflows `protobuf:"bytes,1,rep,name=workflows_by_id,json=workflowsById" json:"workflows_by_id,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + WorkflowsById map[string]*GetWorkflowsResponse_Workflows `protobuf:"bytes,1,rep,name=workflows_by_id,json=workflowsById,proto3" json:"workflows_by_id,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -164,7 +164,7 @@ func (m *GetWorkflowsResponse) GetWorkflowsById() map[string]*GetWorkflowsRespon } type GetWorkflowsResponse_Workflows struct { - Workflows []*model.Workflow `protobuf:"bytes,1,rep,name=workflows" json:"workflows,omitempty"` + Workflows []*model.Workflow `protobuf:"bytes,1,rep,name=workflows,proto3" json:"workflows,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -202,8 +202,8 @@ func (m *GetWorkflowsResponse_Workflows) GetWorkflows() []*model.Workflow { } type GetWorkflowStatusRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - IncludeTasks bool `protobuf:"varint,2,opt,name=include_tasks,json=includeTasks" json:"include_tasks,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + IncludeTasks bool `protobuf:"varint,2,opt,name=include_tasks,json=includeTasks,proto3" json:"include_tasks,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -248,7 +248,7 @@ func (m *GetWorkflowStatusRequest) GetIncludeTasks() bool { } type GetWorkflowStatusResponse struct { - Workflow *model.Workflow `protobuf:"bytes,1,opt,name=workflow" json:"workflow,omitempty"` + Workflow *model.Workflow `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -286,8 +286,8 @@ func (m *GetWorkflowStatusResponse) GetWorkflow() *model.Workflow { } type RemoveWorkflowRequest struct { - WorkflodId string `protobuf:"bytes,1,opt,name=workflod_id,json=workflodId" json:"workflod_id,omitempty"` - ArchiveWorkflow bool `protobuf:"varint,2,opt,name=archive_workflow,json=archiveWorkflow" json:"archive_workflow,omitempty"` + WorkflodId string `protobuf:"bytes,1,opt,name=workflod_id,json=workflodId,proto3" json:"workflod_id,omitempty"` + ArchiveWorkflow bool `protobuf:"varint,2,opt,name=archive_workflow,json=archiveWorkflow,proto3" json:"archive_workflow,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -362,10 +362,10 @@ func (m *RemoveWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RemoveWorkflowResponse proto.InternalMessageInfo type GetRunningWorkflowsRequest struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"` - StartTime int64 `protobuf:"varint,3,opt,name=start_time,json=startTime" json:"start_time,omitempty"` - EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime" json:"end_time,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` + StartTime int64 `protobuf:"varint,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -424,7 +424,7 @@ func (m *GetRunningWorkflowsRequest) GetEndTime() int64 { } type GetRunningWorkflowsResponse struct { - WorkflowIds []string `protobuf:"bytes,1,rep,name=workflow_ids,json=workflowIds" json:"workflow_ids,omitempty"` + WorkflowIds []string `protobuf:"bytes,1,rep,name=workflow_ids,json=workflowIds,proto3" json:"workflow_ids,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -462,7 +462,7 @@ func (m *GetRunningWorkflowsResponse) GetWorkflowIds() []string { } type DecideWorkflowRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -530,7 +530,7 @@ func (m *DecideWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DecideWorkflowResponse proto.InternalMessageInfo type PauseWorkflowRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -598,7 +598,7 @@ func (m *PauseWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_PauseWorkflowResponse proto.InternalMessageInfo type ResumeWorkflowRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -666,9 +666,9 @@ func (m *ResumeWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ResumeWorkflowResponse proto.InternalMessageInfo type SkipTaskRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - TaskReferenceName string `protobuf:"bytes,2,opt,name=task_reference_name,json=taskReferenceName" json:"task_reference_name,omitempty"` - Request *model.SkipTaskRequest `protobuf:"bytes,3,opt,name=request" json:"request,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + TaskReferenceName string `protobuf:"bytes,2,opt,name=task_reference_name,json=taskReferenceName,proto3" json:"task_reference_name,omitempty"` + Request *model.SkipTaskRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -750,7 +750,7 @@ func (m *SkipTaskResponse) XXX_DiscardUnknown() { var xxx_messageInfo_SkipTaskResponse proto.InternalMessageInfo type RerunWorkflowResponse struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -788,7 +788,7 @@ func (m *RerunWorkflowResponse) GetWorkflowId() string { } type RestartWorkflowRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -856,7 +856,7 @@ func (m *RestartWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RestartWorkflowResponse proto.InternalMessageInfo type RetryWorkflowRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -924,7 +924,7 @@ func (m *RetryWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RetryWorkflowResponse proto.InternalMessageInfo type ResetWorkflowCallbacksRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -992,8 +992,8 @@ func (m *ResetWorkflowCallbacksResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ResetWorkflowCallbacksResponse proto.InternalMessageInfo type TerminateWorkflowRequest struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - Reason string `protobuf:"bytes,2,opt,name=reason" json:"reason,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + Reason string `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1068,8 +1068,8 @@ func (m *TerminateWorkflowResponse) XXX_DiscardUnknown() { var xxx_messageInfo_TerminateWorkflowResponse proto.InternalMessageInfo type WorkflowSummarySearchResult struct { - TotalHits int64 `protobuf:"varint,1,opt,name=total_hits,json=totalHits" json:"total_hits,omitempty"` - Results []*model.WorkflowSummary `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"` + TotalHits int64 `protobuf:"varint,1,opt,name=total_hits,json=totalHits,proto3" json:"total_hits,omitempty"` + Results []*model.WorkflowSummary `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/dynamicforkjointask.pb.go b/client/gogrpc/conductor/model/dynamicforkjointask.pb.go index f7d710983a..d47b9b6b61 100644 --- a/client/gogrpc/conductor/model/dynamicforkjointask.pb.go +++ b/client/gogrpc/conductor/model/dynamicforkjointask.pb.go @@ -20,11 +20,11 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type DynamicForkJoinTask struct { - TaskName string `protobuf:"bytes,1,opt,name=task_name,json=taskName" json:"task_name,omitempty"` - WorkflowName string `protobuf:"bytes,2,opt,name=workflow_name,json=workflowName" json:"workflow_name,omitempty"` - ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"` - Input map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Type string `protobuf:"bytes,5,opt,name=type" json:"type,omitempty"` + TaskName string `protobuf:"bytes,1,opt,name=task_name,json=taskName,proto3" json:"task_name,omitempty"` + WorkflowName string `protobuf:"bytes,2,opt,name=workflow_name,json=workflowName,proto3" json:"workflow_name,omitempty"` + ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"` + Input map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input,proto3" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go b/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go index 4dac9221d2..9650213be0 100644 --- a/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go +++ b/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go @@ -19,7 +19,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type DynamicForkJoinTaskList struct { - DynamicTasks []*DynamicForkJoinTask `protobuf:"bytes,1,rep,name=dynamic_tasks,json=dynamicTasks" json:"dynamic_tasks,omitempty"` + DynamicTasks []*DynamicForkJoinTask `protobuf:"bytes,1,rep,name=dynamic_tasks,json=dynamicTasks,proto3" json:"dynamic_tasks,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/eventexecution.pb.go b/client/gogrpc/conductor/model/eventexecution.pb.go index a08e1b4655..ac1c2a8ca0 100644 --- a/client/gogrpc/conductor/model/eventexecution.pb.go +++ b/client/gogrpc/conductor/model/eventexecution.pb.go @@ -49,14 +49,14 @@ func (EventExecution_Status) EnumDescriptor() ([]byte, []int) { } type EventExecution struct { - Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` - MessageId string `protobuf:"bytes,2,opt,name=message_id,json=messageId" json:"message_id,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` - Event string `protobuf:"bytes,4,opt,name=event" json:"event,omitempty"` - Created int64 `protobuf:"varint,5,opt,name=created" json:"created,omitempty"` - Status EventExecution_Status `protobuf:"varint,6,opt,name=status,enum=conductor.proto.EventExecution_Status" json:"status,omitempty"` - Action EventHandler_Action_Type `protobuf:"varint,7,opt,name=action,enum=conductor.proto.EventHandler_Action_Type" json:"action,omitempty"` - Output map[string]*_struct.Value `protobuf:"bytes,8,rep,name=output" json:"output,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + MessageId string `protobuf:"bytes,2,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Event string `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"` + Created int64 `protobuf:"varint,5,opt,name=created,proto3" json:"created,omitempty"` + Status EventExecution_Status `protobuf:"varint,6,opt,name=status,proto3,enum=conductor.proto.EventExecution_Status" json:"status,omitempty"` + Action EventHandler_Action_Type `protobuf:"varint,7,opt,name=action,proto3,enum=conductor.proto.EventHandler_Action_Type" json:"action,omitempty"` + Output map[string]*_struct.Value `protobuf:"bytes,8,rep,name=output,proto3" json:"output,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/eventhandler.pb.go b/client/gogrpc/conductor/model/eventhandler.pb.go index f64569a388..def177112d 100644 --- a/client/gogrpc/conductor/model/eventhandler.pb.go +++ b/client/gogrpc/conductor/model/eventhandler.pb.go @@ -47,11 +47,11 @@ func (EventHandler_Action_Type) EnumDescriptor() ([]byte, []int) { } type EventHandler struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Event string `protobuf:"bytes,2,opt,name=event" json:"event,omitempty"` - Condition string `protobuf:"bytes,3,opt,name=condition" json:"condition,omitempty"` - Actions []*EventHandler_Action `protobuf:"bytes,4,rep,name=actions" json:"actions,omitempty"` - Active bool `protobuf:"varint,5,opt,name=active" json:"active,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Event string `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"` + Condition string `protobuf:"bytes,3,opt,name=condition,proto3" json:"condition,omitempty"` + Actions []*EventHandler_Action `protobuf:"bytes,4,rep,name=actions,proto3" json:"actions,omitempty"` + Active bool `protobuf:"varint,5,opt,name=active,proto3" json:"active,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -117,11 +117,11 @@ func (m *EventHandler) GetActive() bool { } type EventHandler_StartWorkflow struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"` - CorrelationId string `protobuf:"bytes,3,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - Input map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - InputMessage *any.Any `protobuf:"bytes,5,opt,name=input_message,json=inputMessage" json:"input_message,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` + CorrelationId string `protobuf:"bytes,3,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + Input map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input,proto3" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + InputMessage *any.Any `protobuf:"bytes,5,opt,name=input_message,json=inputMessage,proto3" json:"input_message,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -187,10 +187,10 @@ func (m *EventHandler_StartWorkflow) GetInputMessage() *any.Any { } type EventHandler_TaskDetails struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - TaskRefName string `protobuf:"bytes,2,opt,name=task_ref_name,json=taskRefName" json:"task_ref_name,omitempty"` - Output map[string]*_struct.Value `protobuf:"bytes,3,rep,name=output" json:"output,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - OutputMessage *any.Any `protobuf:"bytes,4,opt,name=output_message,json=outputMessage" json:"output_message,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + TaskRefName string `protobuf:"bytes,2,opt,name=task_ref_name,json=taskRefName,proto3" json:"task_ref_name,omitempty"` + Output map[string]*_struct.Value `protobuf:"bytes,3,rep,name=output,proto3" json:"output,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + OutputMessage *any.Any `protobuf:"bytes,4,opt,name=output_message,json=outputMessage,proto3" json:"output_message,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -249,11 +249,11 @@ func (m *EventHandler_TaskDetails) GetOutputMessage() *any.Any { } type EventHandler_Action struct { - Action EventHandler_Action_Type `protobuf:"varint,1,opt,name=action,enum=conductor.proto.EventHandler_Action_Type" json:"action,omitempty"` - StartWorkflow *EventHandler_StartWorkflow `protobuf:"bytes,2,opt,name=start_workflow,json=startWorkflow" json:"start_workflow,omitempty"` - CompleteTask *EventHandler_TaskDetails `protobuf:"bytes,3,opt,name=complete_task,json=completeTask" json:"complete_task,omitempty"` - FailTask *EventHandler_TaskDetails `protobuf:"bytes,4,opt,name=fail_task,json=failTask" json:"fail_task,omitempty"` - ExpandInlineJson bool `protobuf:"varint,5,opt,name=expand_inline_json,json=expandInlineJson" json:"expand_inline_json,omitempty"` + Action EventHandler_Action_Type `protobuf:"varint,1,opt,name=action,proto3,enum=conductor.proto.EventHandler_Action_Type" json:"action,omitempty"` + StartWorkflow *EventHandler_StartWorkflow `protobuf:"bytes,2,opt,name=start_workflow,json=startWorkflow,proto3" json:"start_workflow,omitempty"` + CompleteTask *EventHandler_TaskDetails `protobuf:"bytes,3,opt,name=complete_task,json=completeTask,proto3" json:"complete_task,omitempty"` + FailTask *EventHandler_TaskDetails `protobuf:"bytes,4,opt,name=fail_task,json=failTask,proto3" json:"fail_task,omitempty"` + ExpandInlineJson bool `protobuf:"varint,5,opt,name=expand_inline_json,json=expandInlineJson,proto3" json:"expand_inline_json,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/polldata.pb.go b/client/gogrpc/conductor/model/polldata.pb.go index 53207b224e..b2ba7ff6ff 100644 --- a/client/gogrpc/conductor/model/polldata.pb.go +++ b/client/gogrpc/conductor/model/polldata.pb.go @@ -19,10 +19,10 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type PollData struct { - QueueName string `protobuf:"bytes,1,opt,name=queue_name,json=queueName" json:"queue_name,omitempty"` - Domain string `protobuf:"bytes,2,opt,name=domain" json:"domain,omitempty"` - WorkerId string `protobuf:"bytes,3,opt,name=worker_id,json=workerId" json:"worker_id,omitempty"` - LastPollTime int64 `protobuf:"varint,4,opt,name=last_poll_time,json=lastPollTime" json:"last_poll_time,omitempty"` + QueueName string `protobuf:"bytes,1,opt,name=queue_name,json=queueName,proto3" json:"queue_name,omitempty"` + Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` + WorkerId string `protobuf:"bytes,3,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + LastPollTime int64 `protobuf:"varint,4,opt,name=last_poll_time,json=lastPollTime,proto3" json:"last_poll_time,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go b/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go index 2652f2ab07..5268688d53 100644 --- a/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go +++ b/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go @@ -20,11 +20,11 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type RerunWorkflowRequest struct { - ReRunFromWorkflowId string `protobuf:"bytes,1,opt,name=re_run_from_workflow_id,json=reRunFromWorkflowId" json:"re_run_from_workflow_id,omitempty"` - WorkflowInput map[string]*_struct.Value `protobuf:"bytes,2,rep,name=workflow_input,json=workflowInput" json:"workflow_input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - ReRunFromTaskId string `protobuf:"bytes,3,opt,name=re_run_from_task_id,json=reRunFromTaskId" json:"re_run_from_task_id,omitempty"` - TaskInput map[string]*_struct.Value `protobuf:"bytes,4,rep,name=task_input,json=taskInput" json:"task_input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - CorrelationId string `protobuf:"bytes,5,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` + ReRunFromWorkflowId string `protobuf:"bytes,1,opt,name=re_run_from_workflow_id,json=reRunFromWorkflowId,proto3" json:"re_run_from_workflow_id,omitempty"` + WorkflowInput map[string]*_struct.Value `protobuf:"bytes,2,rep,name=workflow_input,json=workflowInput,proto3" json:"workflow_input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ReRunFromTaskId string `protobuf:"bytes,3,opt,name=re_run_from_task_id,json=reRunFromTaskId,proto3" json:"re_run_from_task_id,omitempty"` + TaskInput map[string]*_struct.Value `protobuf:"bytes,4,rep,name=task_input,json=taskInput,proto3" json:"task_input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + CorrelationId string `protobuf:"bytes,5,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/skiptaskrequest.pb.go b/client/gogrpc/conductor/model/skiptaskrequest.pb.go index 6a937fa148..9d1e094d8e 100644 --- a/client/gogrpc/conductor/model/skiptaskrequest.pb.go +++ b/client/gogrpc/conductor/model/skiptaskrequest.pb.go @@ -21,10 +21,10 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type SkipTaskRequest struct { - TaskInput map[string]*_struct.Value `protobuf:"bytes,1,rep,name=task_input,json=taskInput" json:"task_input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - TaskOutput map[string]*_struct.Value `protobuf:"bytes,2,rep,name=task_output,json=taskOutput" json:"task_output,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - TaskInputMessage *any.Any `protobuf:"bytes,3,opt,name=task_input_message,json=taskInputMessage" json:"task_input_message,omitempty"` - TaskOutputMessage *any.Any `protobuf:"bytes,4,opt,name=task_output_message,json=taskOutputMessage" json:"task_output_message,omitempty"` + TaskInput map[string]*_struct.Value `protobuf:"bytes,1,rep,name=task_input,json=taskInput,proto3" json:"task_input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TaskOutput map[string]*_struct.Value `protobuf:"bytes,2,rep,name=task_output,json=taskOutput,proto3" json:"task_output,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TaskInputMessage *any.Any `protobuf:"bytes,3,opt,name=task_input_message,json=taskInputMessage,proto3" json:"task_input_message,omitempty"` + TaskOutputMessage *any.Any `protobuf:"bytes,4,opt,name=task_output_message,json=taskOutputMessage,proto3" json:"task_output_message,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/startworkflowrequest.pb.go b/client/gogrpc/conductor/model/startworkflowrequest.pb.go index dbc07d7d64..76ef278095 100644 --- a/client/gogrpc/conductor/model/startworkflowrequest.pb.go +++ b/client/gogrpc/conductor/model/startworkflowrequest.pb.go @@ -20,11 +20,12 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type StartWorkflowRequest struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"` - CorrelationId string `protobuf:"bytes,3,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - Input map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - TaskToDomain map[string]string `protobuf:"bytes,5,rep,name=task_to_domain,json=taskToDomain" json:"task_to_domain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` + CorrelationId string `protobuf:"bytes,3,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + Input map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input,proto3" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TaskToDomain map[string]string `protobuf:"bytes,5,rep,name=task_to_domain,json=taskToDomain,proto3" json:"task_to_domain,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + WorkflowDef *WorkflowDef `protobuf:"bytes,6,opt,name=workflow_def,json=workflowDef,proto3" json:"workflow_def,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -34,7 +35,7 @@ func (m *StartWorkflowRequest) Reset() { *m = StartWorkflowRequest{} } func (m *StartWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*StartWorkflowRequest) ProtoMessage() {} func (*StartWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_startworkflowrequest_76bb252c87e811af, []int{0} + return fileDescriptor_startworkflowrequest_3ab5c2434a152277, []int{0} } func (m *StartWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartWorkflowRequest.Unmarshal(m, b) @@ -89,6 +90,13 @@ func (m *StartWorkflowRequest) GetTaskToDomain() map[string]string { return nil } +func (m *StartWorkflowRequest) GetWorkflowDef() *WorkflowDef { + if m != nil { + return m.WorkflowDef + } + return nil +} + func init() { proto.RegisterType((*StartWorkflowRequest)(nil), "conductor.proto.StartWorkflowRequest") proto.RegisterMapType((map[string]*_struct.Value)(nil), "conductor.proto.StartWorkflowRequest.InputEntry") @@ -96,32 +104,34 @@ func init() { } func init() { - proto.RegisterFile("model/startworkflowrequest.proto", fileDescriptor_startworkflowrequest_76bb252c87e811af) -} - -var fileDescriptor_startworkflowrequest_76bb252c87e811af = []byte{ - // 360 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4b, 0xe3, 0x40, - 0x14, 0xc6, 0x49, 0xd3, 0xec, 0xd2, 0xe9, 0x6e, 0x77, 0x1d, 0x4a, 0x09, 0xd5, 0x43, 0x10, 0x84, - 0x1e, 0x64, 0x22, 0xf5, 0xa0, 0xf4, 0x22, 0x14, 0x15, 0x7a, 0x2b, 0xb1, 0x28, 0x08, 0x52, 0x92, - 0xc9, 0x34, 0x0e, 0x49, 0xe6, 0xb5, 0x93, 0x49, 0x6b, 0xff, 0x20, 0xff, 0x4f, 0xc9, 0x24, 0xd5, - 0x50, 0x7b, 0xf0, 0x36, 0xef, 0xcb, 0xfb, 0x7e, 0xef, 0xbd, 0x8f, 0x20, 0x27, 0x85, 0x90, 0x25, - 0x6e, 0xa6, 0x7c, 0xa9, 0x36, 0x20, 0xe3, 0x45, 0x02, 0x1b, 0xc9, 0x56, 0x39, 0xcb, 0x14, 0x59, - 0x4a, 0x50, 0x80, 0xff, 0x51, 0x10, 0x61, 0x4e, 0x15, 0xc8, 0x52, 0xe8, 0x9f, 0x44, 0x00, 0x51, - 0xc2, 0x5c, 0x5d, 0x05, 0xf9, 0xc2, 0xcd, 0x94, 0xcc, 0x69, 0xd5, 0x7e, 0xfa, 0x6e, 0xa2, 0xee, - 0x43, 0x41, 0x7b, 0xaa, 0x68, 0x5e, 0x49, 0xc3, 0x18, 0x35, 0x85, 0x9f, 0x32, 0xdb, 0x70, 0x8c, - 0x41, 0xcb, 0xd3, 0x6f, 0x6c, 0xa3, 0xdf, 0x6b, 0x26, 0x33, 0x0e, 0xc2, 0x6e, 0x38, 0xc6, 0xc0, - 0xf2, 0x76, 0x25, 0x3e, 0x43, 0x1d, 0x0a, 0x52, 0xb2, 0xc4, 0x57, 0x1c, 0xc4, 0x9c, 0x87, 0xb6, - 0xa9, 0x7d, 0x7f, 0x6b, 0xea, 0x24, 0xc4, 0xf7, 0xc8, 0xe2, 0x62, 0x99, 0x2b, 0xbb, 0xe9, 0x98, - 0x83, 0xf6, 0xf0, 0x82, 0xec, 0x2d, 0x4b, 0x0e, 0xad, 0x42, 0x26, 0x85, 0xe5, 0x4e, 0x28, 0xb9, - 0xf5, 0x4a, 0x3b, 0x7e, 0x41, 0x1d, 0xe5, 0x67, 0xf1, 0x5c, 0xc1, 0x3c, 0x84, 0xd4, 0xe7, 0xc2, - 0xb6, 0x34, 0xf0, 0xea, 0x67, 0xc0, 0x99, 0x9f, 0xc5, 0x33, 0xb8, 0xd5, 0xce, 0x92, 0xfb, 0x47, - 0xd5, 0xa4, 0xfe, 0x14, 0xa1, 0xaf, 0x99, 0xf8, 0x3f, 0x32, 0x63, 0xb6, 0xad, 0x82, 0x28, 0x9e, - 0xf8, 0x1c, 0x59, 0x6b, 0x3f, 0xc9, 0x99, 0x4e, 0xa1, 0x3d, 0xec, 0x91, 0x32, 0x62, 0xb2, 0x8b, - 0x98, 0x3c, 0x16, 0x5f, 0xbd, 0xb2, 0x69, 0xd4, 0xb8, 0x36, 0xfa, 0x37, 0xe8, 0xe8, 0xdb, 0xd0, - 0x03, 0xe0, 0x6e, 0x1d, 0xdc, 0xaa, 0x01, 0xc6, 0x2b, 0x74, 0x4c, 0x21, 0x25, 0x82, 0xa9, 0x45, - 0xc2, 0xdf, 0xf6, 0xcf, 0x1c, 0xf7, 0x0e, 0xdd, 0x39, 0x0d, 0x9e, 0x47, 0x11, 0x57, 0xaf, 0x79, - 0x40, 0x28, 0xa4, 0x6e, 0xe5, 0x75, 0x3f, 0xbd, 0x2e, 0x4d, 0x38, 0x13, 0xca, 0x8d, 0x20, 0x92, - 0x4b, 0x5a, 0xd3, 0xf5, 0x4f, 0x16, 0xfc, 0xd2, 0xe8, 0xcb, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x48, 0x61, 0x1b, 0x82, 0x74, 0x02, 0x00, 0x00, + proto.RegisterFile("model/startworkflowrequest.proto", fileDescriptor_startworkflowrequest_3ab5c2434a152277) +} + +var fileDescriptor_startworkflowrequest_3ab5c2434a152277 = []byte{ + // 396 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x51, 0xab, 0xd3, 0x30, + 0x14, 0x80, 0xe9, 0xed, 0xed, 0x95, 0x9b, 0x5e, 0xaf, 0x1a, 0x2e, 0xd7, 0x32, 0xf7, 0x50, 0x04, + 0xa1, 0x0f, 0x92, 0xca, 0x7c, 0x50, 0xf6, 0x32, 0x18, 0x53, 0xd8, 0xdb, 0xa8, 0x43, 0x41, 0x90, + 0xd2, 0xa6, 0x69, 0x0d, 0x6d, 0x73, 0xb6, 0x34, 0xdd, 0xdc, 0x1f, 0xf6, 0x77, 0x48, 0xd3, 0xd6, + 0x95, 0x6d, 0x0f, 0xf7, 0x2d, 0xe7, 0x24, 0xdf, 0x97, 0x93, 0x73, 0x82, 0xdc, 0x12, 0x12, 0x56, + 0xf8, 0x95, 0x8a, 0xa4, 0xda, 0x83, 0xcc, 0xd3, 0x02, 0xf6, 0x92, 0x6d, 0x6b, 0x56, 0x29, 0xb2, + 0x91, 0xa0, 0x00, 0xbf, 0xa0, 0x20, 0x92, 0x9a, 0x2a, 0x90, 0x6d, 0x62, 0xf4, 0xba, 0x45, 0xfa, + 0xd3, 0x09, 0x4b, 0xbb, 0x8d, 0x71, 0x06, 0x90, 0x15, 0xcc, 0xd7, 0x51, 0x5c, 0xa7, 0x7e, 0xa5, + 0x64, 0x4d, 0x3b, 0xcf, 0xdb, 0xbf, 0x26, 0x7a, 0xf8, 0xd6, 0x5c, 0xf3, 0xa3, 0x03, 0x83, 0xf6, + 0x1a, 0x8c, 0xd1, 0xb5, 0x88, 0x4a, 0xe6, 0x18, 0xae, 0xe1, 0xdd, 0x06, 0x7a, 0x8d, 0x1d, 0xf4, + 0x6c, 0xc7, 0x64, 0xc5, 0x41, 0x38, 0x57, 0xae, 0xe1, 0x59, 0x41, 0x1f, 0xe2, 0x77, 0xe8, 0x9e, + 0x82, 0x94, 0xac, 0x88, 0x14, 0x07, 0x11, 0xf2, 0xc4, 0x31, 0x35, 0xf7, 0x7c, 0x90, 0x5d, 0x26, + 0xf8, 0x2b, 0xb2, 0xb8, 0xd8, 0xd4, 0xca, 0xb9, 0x76, 0x4d, 0xcf, 0x9e, 0x7c, 0x20, 0x27, 0xaf, + 0x20, 0x97, 0x4a, 0x21, 0xcb, 0x06, 0xf9, 0x22, 0x94, 0x3c, 0x04, 0x2d, 0x8e, 0x7f, 0xa1, 0x7b, + 0x15, 0x55, 0x79, 0xa8, 0x20, 0x4c, 0xa0, 0x8c, 0xb8, 0x70, 0x2c, 0x2d, 0xfc, 0xf4, 0x34, 0xe1, + 0x3a, 0xaa, 0xf2, 0x35, 0x2c, 0x34, 0xd9, 0x7a, 0xef, 0xd4, 0x20, 0x85, 0x67, 0xe8, 0xae, 0xef, + 0x63, 0x98, 0xb0, 0xd4, 0xb9, 0x71, 0x0d, 0xcf, 0x9e, 0x8c, 0xcf, 0xe4, 0xbd, 0x77, 0xc1, 0xd2, + 0xc0, 0xde, 0x1f, 0x83, 0xd1, 0x0a, 0xa1, 0x63, 0xd1, 0xf8, 0x25, 0x32, 0x73, 0x76, 0xe8, 0x3a, + 0xd9, 0x2c, 0xf1, 0x7b, 0x64, 0xed, 0xa2, 0xa2, 0x66, 0xba, 0x8d, 0xf6, 0xe4, 0x91, 0xb4, 0x33, + 0x22, 0xfd, 0x8c, 0xc8, 0xf7, 0x66, 0x37, 0x68, 0x0f, 0x4d, 0xaf, 0x3e, 0x1b, 0xa3, 0x19, 0x7a, + 0x75, 0x56, 0xf5, 0x05, 0xf1, 0xc3, 0x50, 0x7c, 0x3b, 0x10, 0xcc, 0xb7, 0xe8, 0x0d, 0x85, 0x92, + 0x08, 0xa6, 0xd2, 0x82, 0xff, 0x39, 0x7d, 0xca, 0xfc, 0xf1, 0x52, 0xa3, 0x56, 0xf1, 0xcf, 0x69, + 0xc6, 0xd5, 0xef, 0x3a, 0x26, 0x14, 0x4a, 0xbf, 0x63, 0xfd, 0xff, 0xac, 0x4f, 0x0b, 0xce, 0x84, + 0xf2, 0x33, 0xc8, 0xe4, 0x86, 0x0e, 0xf2, 0xfa, 0x2f, 0xc6, 0x37, 0x5a, 0xfd, 0xf1, 0x5f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x26, 0x3f, 0xa7, 0x2d, 0xce, 0x02, 0x00, 0x00, } diff --git a/client/gogrpc/conductor/model/subworkflowparams.pb.go b/client/gogrpc/conductor/model/subworkflowparams.pb.go index cac96fa19f..3a331c4ff2 100644 --- a/client/gogrpc/conductor/model/subworkflowparams.pb.go +++ b/client/gogrpc/conductor/model/subworkflowparams.pb.go @@ -6,7 +6,6 @@ package model // import "github.com/netflix/conductor/client/gogrpc/conductor/mo import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import _struct "github.com/golang/protobuf/ptypes/struct" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,18 +19,18 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type SubWorkflowParams struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Version *_struct.Value `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SubWorkflowParams) Reset() { *m = SubWorkflowParams{} } func (m *SubWorkflowParams) String() string { return proto.CompactTextString(m) } func (*SubWorkflowParams) ProtoMessage() {} func (*SubWorkflowParams) Descriptor() ([]byte, []int) { - return fileDescriptor_subworkflowparams_182a77e44709d20f, []int{0} + return fileDescriptor_subworkflowparams_247aeccdfb62062e, []int{0} } func (m *SubWorkflowParams) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SubWorkflowParams.Unmarshal(m, b) @@ -58,11 +57,11 @@ func (m *SubWorkflowParams) GetName() string { return "" } -func (m *SubWorkflowParams) GetVersion() *_struct.Value { +func (m *SubWorkflowParams) GetVersion() int32 { if m != nil { return m.Version } - return nil + return 0 } func init() { @@ -70,23 +69,21 @@ func init() { } func init() { - proto.RegisterFile("model/subworkflowparams.proto", fileDescriptor_subworkflowparams_182a77e44709d20f) + proto.RegisterFile("model/subworkflowparams.proto", fileDescriptor_subworkflowparams_247aeccdfb62062e) } -var fileDescriptor_subworkflowparams_182a77e44709d20f = []byte{ - // 217 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x4f, 0x4b, 0xc4, 0x30, - 0x10, 0xc5, 0xa9, 0x88, 0x62, 0x3c, 0x88, 0x11, 0xa4, 0xf8, 0x07, 0x8a, 0xa7, 0x9e, 0x12, 0xd1, - 0x9b, 0xc7, 0x7e, 0x82, 0x52, 0x41, 0xd1, 0x5b, 0x92, 0xa6, 0x31, 0x98, 0x64, 0x4a, 0xfe, 0x6c, - 0xf7, 0xe3, 0x2f, 0xa4, 0xed, 0xb2, 0xec, 0xde, 0x66, 0xde, 0xcc, 0xfb, 0xcd, 0xf0, 0xd0, 0xb3, - 0x85, 0x5e, 0x1a, 0x1a, 0x12, 0x9f, 0xc0, 0xff, 0x0f, 0x06, 0xa6, 0x91, 0x79, 0x66, 0x03, 0x19, - 0x3d, 0x44, 0xc0, 0x37, 0x02, 0x5c, 0x9f, 0x44, 0x04, 0x3f, 0x0b, 0x0f, 0x4f, 0x0a, 0x40, 0x19, - 0x49, 0x73, 0xc7, 0xd3, 0x40, 0x43, 0xf4, 0x49, 0xc4, 0x79, 0xfa, 0xf2, 0x83, 0x6e, 0x3f, 0x13, - 0xff, 0x5e, 0x48, 0x6d, 0x26, 0x61, 0x8c, 0xce, 0x1d, 0xb3, 0xb2, 0x2c, 0xaa, 0xa2, 0xbe, 0xea, - 0x72, 0x8d, 0x5f, 0xd1, 0xe5, 0x46, 0xfa, 0xa0, 0xc1, 0x95, 0x67, 0x55, 0x51, 0x5f, 0xbf, 0xdd, - 0x93, 0x19, 0x4c, 0x56, 0x30, 0xf9, 0x62, 0x26, 0xc9, 0x6e, 0x5d, 0x6b, 0x1c, 0x7a, 0x14, 0x60, - 0x89, 0x93, 0x71, 0x30, 0x7a, 0x4b, 0x8e, 0xfe, 0x6a, 0xee, 0x4e, 0xee, 0xb6, 0xfc, 0xf7, 0x43, - 0xe9, 0xf8, 0x97, 0x38, 0x11, 0x60, 0xe9, 0x62, 0xa4, 0x7b, 0x23, 0x15, 0x46, 0x4b, 0x17, 0xa9, - 0x02, 0xe5, 0x47, 0x71, 0xa0, 0xe7, 0x44, 0xf8, 0x45, 0xe6, 0xbe, 0xef, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xab, 0x91, 0x1f, 0xb2, 0x21, 0x01, 0x00, 0x00, +var fileDescriptor_subworkflowparams_247aeccdfb62062e = []byte{ + // 183 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0xcd, 0x4f, 0x49, + 0xcd, 0xd1, 0x2f, 0x2e, 0x4d, 0x2a, 0xcf, 0x2f, 0xca, 0x4e, 0xcb, 0xc9, 0x2f, 0x2f, 0x48, 0x2c, + 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x4f, 0xce, 0xcf, 0x4b, 0x29, + 0x4d, 0x2e, 0xc9, 0x2f, 0x82, 0x08, 0x28, 0x39, 0x72, 0x09, 0x06, 0x97, 0x26, 0x85, 0x43, 0xd5, + 0x06, 0x80, 0xd5, 0x0a, 0x09, 0x71, 0xb1, 0xe4, 0x25, 0xe6, 0xa6, 0x4a, 0x30, 0x2a, 0x30, 0x6a, + 0x70, 0x06, 0x81, 0xd9, 0x42, 0x12, 0x5c, 0xec, 0x65, 0xa9, 0x45, 0xc5, 0x99, 0xf9, 0x79, 0x12, + 0x4c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x30, 0xae, 0x53, 0x1e, 0x97, 0x74, 0x72, 0x7e, 0xae, 0x5e, + 0x5e, 0x6a, 0x49, 0x5a, 0x4e, 0x66, 0x85, 0x1e, 0x9a, 0x0d, 0x4e, 0xc2, 0x18, 0xe6, 0x07, 0x24, + 0x45, 0x59, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x35, 0xea, + 0xc3, 0x35, 0xea, 0x27, 0xe7, 0x64, 0xa6, 0xe6, 0x95, 0xe8, 0xa7, 0xe7, 0xa7, 0x17, 0x15, 0x24, + 0x23, 0x89, 0x83, 0xfd, 0x96, 0xc4, 0x06, 0x36, 0xd7, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x52, + 0x9c, 0xc5, 0x01, 0xeb, 0x00, 0x00, 0x00, } diff --git a/client/gogrpc/conductor/model/task.pb.go b/client/gogrpc/conductor/model/task.pb.go index 156bdab5d1..5dc07ae9dd 100644 --- a/client/gogrpc/conductor/model/task.pb.go +++ b/client/gogrpc/conductor/model/task.pb.go @@ -64,40 +64,41 @@ func (x Task_Status) String() string { return proto.EnumName(Task_Status_name, int32(x)) } func (Task_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_task_7843d3d2fd8c2dc8, []int{0, 0} + return fileDescriptor_task_0f54bf88f0e3aec0, []int{0, 0} } type Task struct { - TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType" json:"task_type,omitempty"` - Status Task_Status `protobuf:"varint,2,opt,name=status,enum=conductor.proto.Task_Status" json:"status,omitempty"` - InputData map[string]*_struct.Value `protobuf:"bytes,3,rep,name=input_data,json=inputData" json:"input_data,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - ReferenceTaskName string `protobuf:"bytes,4,opt,name=reference_task_name,json=referenceTaskName" json:"reference_task_name,omitempty"` - RetryCount int32 `protobuf:"varint,5,opt,name=retry_count,json=retryCount" json:"retry_count,omitempty"` - Seq int32 `protobuf:"varint,6,opt,name=seq" json:"seq,omitempty"` - CorrelationId string `protobuf:"bytes,7,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - PollCount int32 `protobuf:"varint,8,opt,name=poll_count,json=pollCount" json:"poll_count,omitempty"` - TaskDefName string `protobuf:"bytes,9,opt,name=task_def_name,json=taskDefName" json:"task_def_name,omitempty"` - ScheduledTime int64 `protobuf:"varint,10,opt,name=scheduled_time,json=scheduledTime" json:"scheduled_time,omitempty"` - StartTime int64 `protobuf:"varint,11,opt,name=start_time,json=startTime" json:"start_time,omitempty"` - EndTime int64 `protobuf:"varint,12,opt,name=end_time,json=endTime" json:"end_time,omitempty"` - UpdateTime int64 `protobuf:"varint,13,opt,name=update_time,json=updateTime" json:"update_time,omitempty"` - StartDelayInSeconds int32 `protobuf:"varint,14,opt,name=start_delay_in_seconds,json=startDelayInSeconds" json:"start_delay_in_seconds,omitempty"` - RetriedTaskId string `protobuf:"bytes,15,opt,name=retried_task_id,json=retriedTaskId" json:"retried_task_id,omitempty"` - Retried bool `protobuf:"varint,16,opt,name=retried" json:"retried,omitempty"` - Executed bool `protobuf:"varint,17,opt,name=executed" json:"executed,omitempty"` - CallbackFromWorker bool `protobuf:"varint,18,opt,name=callback_from_worker,json=callbackFromWorker" json:"callback_from_worker,omitempty"` - ResponseTimeoutSeconds int32 `protobuf:"varint,19,opt,name=response_timeout_seconds,json=responseTimeoutSeconds" json:"response_timeout_seconds,omitempty"` - WorkflowInstanceId string `protobuf:"bytes,20,opt,name=workflow_instance_id,json=workflowInstanceId" json:"workflow_instance_id,omitempty"` - WorkflowType string `protobuf:"bytes,21,opt,name=workflow_type,json=workflowType" json:"workflow_type,omitempty"` - TaskId string `protobuf:"bytes,22,opt,name=task_id,json=taskId" json:"task_id,omitempty"` - ReasonForIncompletion string `protobuf:"bytes,23,opt,name=reason_for_incompletion,json=reasonForIncompletion" json:"reason_for_incompletion,omitempty"` - CallbackAfterSeconds int64 `protobuf:"varint,24,opt,name=callback_after_seconds,json=callbackAfterSeconds" json:"callback_after_seconds,omitempty"` - WorkerId string `protobuf:"bytes,25,opt,name=worker_id,json=workerId" json:"worker_id,omitempty"` - OutputData map[string]*_struct.Value `protobuf:"bytes,26,rep,name=output_data,json=outputData" json:"output_data,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - WorkflowTask *WorkflowTask `protobuf:"bytes,27,opt,name=workflow_task,json=workflowTask" json:"workflow_task,omitempty"` - Domain string `protobuf:"bytes,28,opt,name=domain" json:"domain,omitempty"` - InputMessage *any.Any `protobuf:"bytes,29,opt,name=input_message,json=inputMessage" json:"input_message,omitempty"` - OutputMessage *any.Any `protobuf:"bytes,30,opt,name=output_message,json=outputMessage" json:"output_message,omitempty"` + TaskType string `protobuf:"bytes,1,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` + Status Task_Status `protobuf:"varint,2,opt,name=status,proto3,enum=conductor.proto.Task_Status" json:"status,omitempty"` + InputData map[string]*_struct.Value `protobuf:"bytes,3,rep,name=input_data,json=inputData,proto3" json:"input_data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ReferenceTaskName string `protobuf:"bytes,4,opt,name=reference_task_name,json=referenceTaskName,proto3" json:"reference_task_name,omitempty"` + RetryCount int32 `protobuf:"varint,5,opt,name=retry_count,json=retryCount,proto3" json:"retry_count,omitempty"` + Seq int32 `protobuf:"varint,6,opt,name=seq,proto3" json:"seq,omitempty"` + CorrelationId string `protobuf:"bytes,7,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + PollCount int32 `protobuf:"varint,8,opt,name=poll_count,json=pollCount,proto3" json:"poll_count,omitempty"` + TaskDefName string `protobuf:"bytes,9,opt,name=task_def_name,json=taskDefName,proto3" json:"task_def_name,omitempty"` + ScheduledTime int64 `protobuf:"varint,10,opt,name=scheduled_time,json=scheduledTime,proto3" json:"scheduled_time,omitempty"` + StartTime int64 `protobuf:"varint,11,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + EndTime int64 `protobuf:"varint,12,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` + UpdateTime int64 `protobuf:"varint,13,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` + StartDelayInSeconds int32 `protobuf:"varint,14,opt,name=start_delay_in_seconds,json=startDelayInSeconds,proto3" json:"start_delay_in_seconds,omitempty"` + RetriedTaskId string `protobuf:"bytes,15,opt,name=retried_task_id,json=retriedTaskId,proto3" json:"retried_task_id,omitempty"` + Retried bool `protobuf:"varint,16,opt,name=retried,proto3" json:"retried,omitempty"` + Executed bool `protobuf:"varint,17,opt,name=executed,proto3" json:"executed,omitempty"` + CallbackFromWorker bool `protobuf:"varint,18,opt,name=callback_from_worker,json=callbackFromWorker,proto3" json:"callback_from_worker,omitempty"` + ResponseTimeoutSeconds int32 `protobuf:"varint,19,opt,name=response_timeout_seconds,json=responseTimeoutSeconds,proto3" json:"response_timeout_seconds,omitempty"` + WorkflowInstanceId string `protobuf:"bytes,20,opt,name=workflow_instance_id,json=workflowInstanceId,proto3" json:"workflow_instance_id,omitempty"` + WorkflowType string `protobuf:"bytes,21,opt,name=workflow_type,json=workflowType,proto3" json:"workflow_type,omitempty"` + TaskId string `protobuf:"bytes,22,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` + ReasonForIncompletion string `protobuf:"bytes,23,opt,name=reason_for_incompletion,json=reasonForIncompletion,proto3" json:"reason_for_incompletion,omitempty"` + CallbackAfterSeconds int64 `protobuf:"varint,24,opt,name=callback_after_seconds,json=callbackAfterSeconds,proto3" json:"callback_after_seconds,omitempty"` + WorkerId string `protobuf:"bytes,25,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + OutputData map[string]*_struct.Value `protobuf:"bytes,26,rep,name=output_data,json=outputData,proto3" json:"output_data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + WorkflowTask *WorkflowTask `protobuf:"bytes,27,opt,name=workflow_task,json=workflowTask,proto3" json:"workflow_task,omitempty"` + Domain string `protobuf:"bytes,28,opt,name=domain,proto3" json:"domain,omitempty"` + InputMessage *any.Any `protobuf:"bytes,29,opt,name=input_message,json=inputMessage,proto3" json:"input_message,omitempty"` + OutputMessage *any.Any `protobuf:"bytes,30,opt,name=output_message,json=outputMessage,proto3" json:"output_message,omitempty"` + RateLimitPerSecond int32 `protobuf:"varint,31,opt,name=rate_limit_per_second,json=rateLimitPerSecond,proto3" json:"rate_limit_per_second,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -107,7 +108,7 @@ func (m *Task) Reset() { *m = Task{} } func (m *Task) String() string { return proto.CompactTextString(m) } func (*Task) ProtoMessage() {} func (*Task) Descriptor() ([]byte, []int) { - return fileDescriptor_task_7843d3d2fd8c2dc8, []int{0} + return fileDescriptor_task_0f54bf88f0e3aec0, []int{0} } func (m *Task) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Task.Unmarshal(m, b) @@ -337,6 +338,13 @@ func (m *Task) GetOutputMessage() *any.Any { return nil } +func (m *Task) GetRateLimitPerSecond() int32 { + if m != nil { + return m.RateLimitPerSecond + } + return 0 +} + func init() { proto.RegisterType((*Task)(nil), "conductor.proto.Task") proto.RegisterMapType((map[string]*_struct.Value)(nil), "conductor.proto.Task.InputDataEntry") @@ -344,70 +352,71 @@ func init() { proto.RegisterEnum("conductor.proto.Task_Status", Task_Status_name, Task_Status_value) } -func init() { proto.RegisterFile("model/task.proto", fileDescriptor_task_7843d3d2fd8c2dc8) } - -var fileDescriptor_task_7843d3d2fd8c2dc8 = []byte{ - // 980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x6f, 0xdb, 0x36, - 0x14, 0x9d, 0xf3, 0xe1, 0x8f, 0xeb, 0xd8, 0x56, 0x99, 0xc4, 0x61, 0x9c, 0xa4, 0x35, 0xb2, 0x65, - 0xf0, 0xc3, 0x60, 0x17, 0x69, 0x31, 0x74, 0xdd, 0x93, 0x63, 0x2b, 0xab, 0xb0, 0x24, 0x0e, 0x64, - 0x67, 0xc1, 0xf6, 0x22, 0x30, 0x12, 0xed, 0x0a, 0x96, 0x48, 0x8f, 0xa2, 0xd6, 0xfa, 0xc7, 0xed, - 0x3f, 0xed, 0x27, 0x0c, 0x24, 0x25, 0x35, 0x4b, 0x8b, 0x3d, 0xf5, 0x8d, 0x3c, 0xe7, 0xdc, 0xe3, - 0x7b, 0xaf, 0x78, 0xaf, 0xc1, 0x8a, 0x79, 0x40, 0xa3, 0x81, 0x24, 0xc9, 0xb2, 0xbf, 0x12, 0x5c, - 0x72, 0xd4, 0xf2, 0x39, 0x0b, 0x52, 0x5f, 0x72, 0x61, 0x80, 0x0e, 0x36, 0x92, 0x0f, 0x5c, 0x2c, - 0xe7, 0x11, 0xff, 0xf0, 0x49, 0xda, 0x39, 0x5e, 0x70, 0xbe, 0x88, 0xe8, 0x40, 0xdf, 0x1e, 0xd2, - 0xf9, 0x20, 0x91, 0x22, 0xf5, 0x65, 0xc6, 0x1e, 0x3e, 0x65, 0x09, 0x5b, 0x1b, 0xea, 0xf4, 0x9f, - 0x1d, 0xd8, 0x9a, 0x91, 0x64, 0x89, 0x8e, 0xa0, 0xa6, 0xfc, 0x3c, 0xb9, 0x5e, 0x51, 0x5c, 0xea, - 0x96, 0x7a, 0x35, 0xb7, 0xaa, 0x80, 0xd9, 0x7a, 0x45, 0xd1, 0x6b, 0x28, 0x27, 0x92, 0xc8, 0x34, - 0xc1, 0x1b, 0xdd, 0x52, 0xaf, 0x79, 0x7e, 0xdc, 0x7f, 0x92, 0x5a, 0x5f, 0x79, 0xf4, 0xa7, 0x5a, - 0xe3, 0x66, 0x5a, 0x34, 0x02, 0x08, 0xd9, 0x2a, 0x95, 0x5e, 0x40, 0x24, 0xc1, 0x9b, 0xdd, 0xcd, - 0x5e, 0xfd, 0xfc, 0xbb, 0x2f, 0x47, 0x3a, 0x4a, 0x37, 0x26, 0x92, 0xd8, 0x4c, 0x8a, 0xb5, 0x5b, - 0x0b, 0xf3, 0x3b, 0xea, 0xc3, 0xae, 0xa0, 0x73, 0x2a, 0x28, 0xf3, 0xa9, 0xa7, 0x33, 0x64, 0x24, - 0xa6, 0x78, 0x4b, 0x67, 0xf8, 0xac, 0xa0, 0x94, 0xcb, 0x0d, 0x89, 0x29, 0x7a, 0x01, 0x75, 0x41, - 0xa5, 0x58, 0x7b, 0x3e, 0x4f, 0x99, 0xc4, 0xdb, 0xdd, 0x52, 0x6f, 0xdb, 0x05, 0x0d, 0x8d, 0x14, - 0x82, 0x2c, 0xd8, 0x4c, 0xe8, 0x9f, 0xb8, 0xac, 0x09, 0x75, 0x44, 0x67, 0xd0, 0xf4, 0xb9, 0x10, - 0x34, 0x22, 0x32, 0xe4, 0xcc, 0x0b, 0x03, 0x5c, 0xd1, 0xee, 0x8d, 0x47, 0xa8, 0x13, 0xa0, 0x13, - 0x80, 0x15, 0x8f, 0xa2, 0xcc, 0xb8, 0xaa, 0xe3, 0x6b, 0x0a, 0x31, 0xbe, 0xa7, 0xd0, 0xd0, 0xe9, - 0x05, 0x74, 0x6e, 0x52, 0xac, 0x69, 0x93, 0xba, 0x02, 0xc7, 0x74, 0xae, 0x93, 0x3b, 0x83, 0x66, - 0xe2, 0xbf, 0xa7, 0x41, 0x1a, 0xd1, 0xc0, 0x93, 0x61, 0x4c, 0x31, 0x74, 0x4b, 0xbd, 0x4d, 0xb7, - 0x51, 0xa0, 0xb3, 0x30, 0xa6, 0xea, 0x97, 0x12, 0x49, 0x84, 0x34, 0x92, 0xba, 0x96, 0xd4, 0x34, - 0xa2, 0xe9, 0x43, 0xa8, 0x52, 0x96, 0xc5, 0xef, 0x68, 0xb2, 0x42, 0x99, 0x89, 0x7c, 0x01, 0xf5, - 0x74, 0x15, 0x10, 0x49, 0x0d, 0xdb, 0xd0, 0x2c, 0x18, 0x48, 0x0b, 0x5e, 0x41, 0xdb, 0x58, 0x07, - 0x34, 0x22, 0x6b, 0x2f, 0x64, 0x5e, 0x42, 0xd5, 0x17, 0x49, 0x70, 0x53, 0x17, 0xb4, 0xab, 0xd9, - 0xb1, 0x22, 0x1d, 0x36, 0x35, 0x14, 0xfa, 0x1e, 0x5a, 0xaa, 0x81, 0xa1, 0x4a, 0x5a, 0x95, 0x18, - 0x06, 0xb8, 0x65, 0x3a, 0x94, 0xc1, 0xaa, 0xfb, 0x4e, 0x80, 0x30, 0x54, 0x32, 0x00, 0x5b, 0xdd, - 0x52, 0xaf, 0xea, 0xe6, 0x57, 0xd4, 0x81, 0x2a, 0xfd, 0x48, 0xfd, 0x54, 0xd2, 0x00, 0x3f, 0xd3, - 0x54, 0x71, 0x47, 0x2f, 0x61, 0xcf, 0x27, 0x51, 0xf4, 0x40, 0xfc, 0xa5, 0x37, 0x17, 0x3c, 0xf6, - 0xd4, 0xfb, 0xa6, 0x02, 0x23, 0xad, 0x43, 0x39, 0x77, 0x29, 0x78, 0x7c, 0xaf, 0x19, 0xf4, 0x06, - 0xb0, 0xa0, 0xc9, 0x8a, 0xb3, 0xc4, 0xd4, 0xc9, 0x53, 0x59, 0x94, 0xb1, 0xab, 0xcb, 0x68, 0xe7, - 0xfc, 0xcc, 0xd0, 0x79, 0x25, 0x2f, 0x61, 0x2f, 0x9f, 0x1e, 0x2f, 0x64, 0x89, 0x24, 0xea, 0x55, - 0x85, 0x01, 0xde, 0xd3, 0xe5, 0xa0, 0x9c, 0x73, 0x32, 0xca, 0x09, 0xd0, 0xb7, 0xd0, 0x28, 0x22, - 0xf4, 0x6c, 0xec, 0x6b, 0xe9, 0x4e, 0x0e, 0xea, 0xf9, 0x38, 0x80, 0x4a, 0xde, 0x98, 0xb6, 0xa6, - 0xcb, 0xd2, 0x74, 0xe4, 0x47, 0x38, 0x10, 0x94, 0x24, 0x9c, 0x79, 0x73, 0x2e, 0xbc, 0x90, 0xf9, - 0x3c, 0x5e, 0x45, 0x54, 0x3d, 0x28, 0x7c, 0xa0, 0x85, 0xfb, 0x86, 0xbe, 0xe4, 0xc2, 0x79, 0x44, - 0xa2, 0xd7, 0xd0, 0x2e, 0x7a, 0x42, 0xe6, 0x92, 0x8a, 0xa2, 0x3e, 0xac, 0x3f, 0x69, 0xd1, 0xb1, - 0xa1, 0x22, 0xf3, 0xea, 0x8e, 0xa0, 0x66, 0x7a, 0xa7, 0x12, 0x39, 0x34, 0x33, 0x6c, 0x00, 0x27, - 0x40, 0x97, 0x50, 0xe7, 0xa9, 0x2c, 0xc6, 0xb1, 0xa3, 0xc7, 0xf1, 0xec, 0xcb, 0xe3, 0x38, 0xd1, - 0xc2, 0x4f, 0xf3, 0x08, 0xbc, 0x00, 0xd0, 0xc5, 0xe3, 0x86, 0x90, 0x64, 0x89, 0x8f, 0xba, 0xa5, - 0x5e, 0xfd, 0xfc, 0xe4, 0x33, 0xa7, 0xfb, 0xbc, 0x43, 0x24, 0x59, 0x3e, 0xea, 0x97, 0x5a, 0x36, - 0x6d, 0x28, 0x07, 0x3c, 0x26, 0x21, 0xc3, 0xc7, 0xa6, 0x5d, 0xe6, 0x86, 0x7e, 0x82, 0x86, 0xd9, - 0x18, 0x31, 0x4d, 0x12, 0xb2, 0xa0, 0xf8, 0x44, 0x7b, 0xef, 0xf5, 0xcd, 0x02, 0xeb, 0xe7, 0x0b, - 0xac, 0x3f, 0x64, 0x6b, 0x77, 0x47, 0x4b, 0xaf, 0x8d, 0x12, 0xfd, 0x0c, 0xcd, 0xac, 0xbc, 0x3c, - 0xf6, 0xf9, 0xff, 0xc4, 0x36, 0x8c, 0x36, 0x0b, 0xee, 0xcc, 0xa0, 0xf9, 0xdf, 0x0d, 0xa4, 0xb6, - 0xc4, 0x92, 0xae, 0xb3, 0x45, 0xa8, 0x8e, 0xe8, 0x07, 0xd8, 0xfe, 0x8b, 0x44, 0x29, 0xd5, 0x2b, - 0xb0, 0x7e, 0xde, 0xfe, 0xcc, 0xf7, 0x37, 0xc5, 0xba, 0x46, 0xf4, 0x76, 0xe3, 0x4d, 0xa9, 0x73, - 0x07, 0xad, 0x27, 0x8d, 0xfc, 0x1a, 0xb6, 0xa7, 0x7f, 0x97, 0xa0, 0x6c, 0x36, 0x2d, 0x6a, 0x41, - 0xdd, 0xb9, 0xf1, 0x6e, 0xdd, 0xc9, 0x2f, 0xae, 0x3d, 0x9d, 0x5a, 0xdf, 0xa0, 0x1d, 0xa8, 0x8e, - 0x86, 0x37, 0x23, 0xfb, 0xca, 0x1e, 0x5b, 0x25, 0x04, 0x50, 0xbe, 0x1c, 0x3a, 0xea, 0xbc, 0x81, - 0x9e, 0x43, 0xc7, 0x9c, 0xbd, 0x7b, 0x67, 0xf6, 0xce, 0x9b, 0xd9, 0xee, 0xb5, 0x73, 0x33, 0xbc, - 0xf2, 0x6c, 0xd7, 0x9d, 0xb8, 0xd6, 0x26, 0x6a, 0x40, 0x6d, 0x34, 0xb9, 0xbe, 0xbd, 0xb2, 0x67, - 0xf6, 0xd8, 0xda, 0x42, 0x87, 0xb0, 0x5f, 0x5c, 0x4d, 0x84, 0x16, 0x4e, 0xad, 0x6d, 0xa5, 0x9c, - 0x8e, 0xde, 0xd9, 0xe3, 0x3b, 0x65, 0x5c, 0x56, 0xd7, 0x99, 0x73, 0x6d, 0x8f, 0xbd, 0xc9, 0xdd, - 0xcc, 0xaa, 0xa0, 0x5d, 0x68, 0xb9, 0xf6, 0x70, 0xfc, 0xbb, 0x77, 0x39, 0x71, 0x3d, 0xd7, 0x76, - 0xef, 0x6e, 0xac, 0x2a, 0xaa, 0x43, 0x65, 0xfa, 0xab, 0x73, 0x7b, 0x6b, 0x8f, 0xad, 0xda, 0x05, - 0x81, 0x23, 0x9f, 0xc7, 0x7d, 0x46, 0xe5, 0x3c, 0x0a, 0x3f, 0x3e, 0x7d, 0x36, 0x17, 0x65, 0xf5, - 0x42, 0x6e, 0x1f, 0xfe, 0x78, 0xbb, 0x08, 0xe5, 0xfb, 0xf4, 0xa1, 0xef, 0xf3, 0x78, 0x90, 0x69, - 0x07, 0x85, 0x76, 0xe0, 0x47, 0x21, 0x65, 0x72, 0xb0, 0xe0, 0x0b, 0xb1, 0xf2, 0x1f, 0xe1, 0xfa, - 0x1f, 0xf2, 0xa1, 0xac, 0xad, 0x5e, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x54, 0xf9, 0x20, 0xc1, - 0x54, 0x07, 0x00, 0x00, +func init() { proto.RegisterFile("model/task.proto", fileDescriptor_task_0f54bf88f0e3aec0) } + +var fileDescriptor_task_0f54bf88f0e3aec0 = []byte{ + // 1004 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x73, 0xda, 0x46, + 0x14, 0x2d, 0xb1, 0xcd, 0xc7, 0xc5, 0x80, 0xb2, 0xb6, 0xf1, 0x1a, 0xdb, 0x31, 0xe3, 0xd6, 0x1d, + 0x1e, 0x3a, 0x90, 0x3a, 0x99, 0x4e, 0x9a, 0x3e, 0x61, 0x90, 0x1b, 0x4d, 0x6d, 0xc3, 0x08, 0x5c, + 0x4f, 0xfb, 0xb2, 0xb3, 0x96, 0x16, 0xa2, 0x41, 0xd2, 0xd2, 0xd5, 0xaa, 0x09, 0xbf, 0xa7, 0xbf, + 0xa3, 0xff, 0xad, 0xb3, 0xbb, 0x48, 0xa1, 0x4e, 0xa6, 0x4f, 0x7d, 0xdb, 0x3d, 0xe7, 0xdc, 0xcb, + 0xbd, 0x47, 0x7b, 0x2f, 0x60, 0x45, 0xdc, 0x67, 0x61, 0x4f, 0xd2, 0x64, 0xd1, 0x5d, 0x0a, 0x2e, + 0x39, 0x6a, 0x78, 0x3c, 0xf6, 0x53, 0x4f, 0x72, 0x61, 0x80, 0x16, 0x36, 0x92, 0x0f, 0x5c, 0x2c, + 0x66, 0x21, 0xff, 0xf0, 0x49, 0xda, 0x3a, 0x99, 0x73, 0x3e, 0x0f, 0x59, 0x4f, 0xdf, 0x1e, 0xd3, + 0x59, 0x2f, 0x91, 0x22, 0xf5, 0xe4, 0x9a, 0x3d, 0x7a, 0xca, 0xd2, 0x78, 0x65, 0xa8, 0xf3, 0xbf, + 0x6a, 0xb0, 0x3d, 0xa5, 0xc9, 0x02, 0x1d, 0x43, 0x45, 0xe5, 0x23, 0x72, 0xb5, 0x64, 0xb8, 0xd0, + 0x2e, 0x74, 0x2a, 0x6e, 0x59, 0x01, 0xd3, 0xd5, 0x92, 0xa1, 0xd7, 0x50, 0x4c, 0x24, 0x95, 0x69, + 0x82, 0x9f, 0xb5, 0x0b, 0x9d, 0xfa, 0xe5, 0x49, 0xf7, 0x49, 0x69, 0x5d, 0x95, 0xa3, 0x3b, 0xd1, + 0x1a, 0x77, 0xad, 0x45, 0x03, 0x80, 0x20, 0x5e, 0xa6, 0x92, 0xf8, 0x54, 0x52, 0xbc, 0xd5, 0xde, + 0xea, 0x54, 0x2f, 0xbf, 0xf9, 0x72, 0xa4, 0xa3, 0x74, 0x43, 0x2a, 0xa9, 0x1d, 0x4b, 0xb1, 0x72, + 0x2b, 0x41, 0x76, 0x47, 0x5d, 0xd8, 0x13, 0x6c, 0xc6, 0x04, 0x8b, 0x3d, 0x46, 0x74, 0x85, 0x31, + 0x8d, 0x18, 0xde, 0xd6, 0x15, 0x3e, 0xcf, 0x29, 0x95, 0xe5, 0x8e, 0x46, 0x0c, 0x9d, 0x41, 0x55, + 0x30, 0x29, 0x56, 0xc4, 0xe3, 0x69, 0x2c, 0xf1, 0x4e, 0xbb, 0xd0, 0xd9, 0x71, 0x41, 0x43, 0x03, + 0x85, 0x20, 0x0b, 0xb6, 0x12, 0xf6, 0x07, 0x2e, 0x6a, 0x42, 0x1d, 0xd1, 0x05, 0xd4, 0x3d, 0x2e, + 0x04, 0x0b, 0xa9, 0x0c, 0x78, 0x4c, 0x02, 0x1f, 0x97, 0x74, 0xf6, 0xda, 0x06, 0xea, 0xf8, 0xe8, + 0x14, 0x60, 0xc9, 0xc3, 0x70, 0x9d, 0xb8, 0xac, 0xe3, 0x2b, 0x0a, 0x31, 0x79, 0xcf, 0xa1, 0xa6, + 0xcb, 0xf3, 0xd9, 0xcc, 0x94, 0x58, 0xd1, 0x49, 0xaa, 0x0a, 0x1c, 0xb2, 0x99, 0x2e, 0xee, 0x02, + 0xea, 0x89, 0xf7, 0x9e, 0xf9, 0x69, 0xc8, 0x7c, 0x22, 0x83, 0x88, 0x61, 0x68, 0x17, 0x3a, 0x5b, + 0x6e, 0x2d, 0x47, 0xa7, 0x41, 0xc4, 0xd4, 0x2f, 0x25, 0x92, 0x0a, 0x69, 0x24, 0x55, 0x2d, 0xa9, + 0x68, 0x44, 0xd3, 0x47, 0x50, 0x66, 0xf1, 0x3a, 0x7e, 0x57, 0x93, 0x25, 0x16, 0x9b, 0xc8, 0x33, + 0xa8, 0xa6, 0x4b, 0x9f, 0x4a, 0x66, 0xd8, 0x9a, 0x66, 0xc1, 0x40, 0x5a, 0xf0, 0x0a, 0x9a, 0x26, + 0xb5, 0xcf, 0x42, 0xba, 0x22, 0x41, 0x4c, 0x12, 0xa6, 0xbe, 0x48, 0x82, 0xeb, 0xba, 0xa1, 0x3d, + 0xcd, 0x0e, 0x15, 0xe9, 0xc4, 0x13, 0x43, 0xa1, 0x6f, 0xa1, 0xa1, 0x0c, 0x0c, 0x54, 0xd1, 0xaa, + 0xc5, 0xc0, 0xc7, 0x0d, 0xe3, 0xd0, 0x1a, 0x56, 0xee, 0x3b, 0x3e, 0xc2, 0x50, 0x5a, 0x03, 0xd8, + 0x6a, 0x17, 0x3a, 0x65, 0x37, 0xbb, 0xa2, 0x16, 0x94, 0xd9, 0x47, 0xe6, 0xa5, 0x92, 0xf9, 0xf8, + 0xb9, 0xa6, 0xf2, 0x3b, 0x7a, 0x09, 0xfb, 0x1e, 0x0d, 0xc3, 0x47, 0xea, 0x2d, 0xc8, 0x4c, 0xf0, + 0x88, 0xa8, 0xf7, 0xcd, 0x04, 0x46, 0x5a, 0x87, 0x32, 0xee, 0x5a, 0xf0, 0xe8, 0x41, 0x33, 0xe8, + 0x0d, 0x60, 0xc1, 0x92, 0x25, 0x8f, 0x13, 0xd3, 0x27, 0x4f, 0x65, 0xde, 0xc6, 0x9e, 0x6e, 0xa3, + 0x99, 0xf1, 0x53, 0x43, 0x67, 0x9d, 0xbc, 0x84, 0xfd, 0x6c, 0x7a, 0x48, 0x10, 0x27, 0x92, 0xaa, + 0x57, 0x15, 0xf8, 0x78, 0x5f, 0xb7, 0x83, 0x32, 0xce, 0x59, 0x53, 0x8e, 0x8f, 0xbe, 0x86, 0x5a, + 0x1e, 0xa1, 0x67, 0xe3, 0x40, 0x4b, 0x77, 0x33, 0x50, 0xcf, 0xc7, 0x21, 0x94, 0x32, 0x63, 0x9a, + 0x9a, 0x2e, 0x4a, 0xe3, 0xc8, 0x0f, 0x70, 0x28, 0x18, 0x4d, 0x78, 0x4c, 0x66, 0x5c, 0x90, 0x20, + 0xf6, 0x78, 0xb4, 0x0c, 0x99, 0x7a, 0x50, 0xf8, 0x50, 0x0b, 0x0f, 0x0c, 0x7d, 0xcd, 0x85, 0xb3, + 0x41, 0xa2, 0xd7, 0xd0, 0xcc, 0x3d, 0xa1, 0x33, 0xc9, 0x44, 0xde, 0x1f, 0xd6, 0x9f, 0x34, 0x77, + 0xac, 0xaf, 0xc8, 0xac, 0xbb, 0x63, 0xa8, 0x18, 0xef, 0x54, 0x21, 0x47, 0x66, 0x86, 0x0d, 0xe0, + 0xf8, 0xe8, 0x1a, 0xaa, 0x3c, 0x95, 0xf9, 0x38, 0xb6, 0xf4, 0x38, 0x5e, 0x7c, 0x79, 0x1c, 0x47, + 0x5a, 0xf8, 0x69, 0x1e, 0x81, 0xe7, 0x00, 0xba, 0xda, 0x34, 0x84, 0x26, 0x0b, 0x7c, 0xdc, 0x2e, + 0x74, 0xaa, 0x97, 0xa7, 0x9f, 0x65, 0x7a, 0xc8, 0x1c, 0xa2, 0xc9, 0x62, 0xc3, 0x2f, 0xb5, 0x6c, + 0x9a, 0x50, 0xf4, 0x79, 0x44, 0x83, 0x18, 0x9f, 0x18, 0xbb, 0xcc, 0x0d, 0xfd, 0x08, 0x35, 0xb3, + 0x31, 0x22, 0x96, 0x24, 0x74, 0xce, 0xf0, 0xa9, 0xce, 0xbd, 0xdf, 0x35, 0x0b, 0xac, 0x9b, 0x2d, + 0xb0, 0x6e, 0x3f, 0x5e, 0xb9, 0xbb, 0x5a, 0x7a, 0x6b, 0x94, 0xe8, 0x27, 0xa8, 0xaf, 0xdb, 0xcb, + 0x62, 0x5f, 0xfc, 0x47, 0x6c, 0xcd, 0x68, 0xb3, 0xe0, 0xef, 0xe1, 0x40, 0xa8, 0xa1, 0x09, 0x83, + 0x28, 0x90, 0x64, 0x99, 0xdb, 0x8d, 0xcf, 0xf4, 0x6b, 0x42, 0x8a, 0xbc, 0x51, 0xdc, 0x38, 0x33, + 0xbb, 0x35, 0x85, 0xfa, 0xbf, 0x97, 0x96, 0x5a, 0x2c, 0x0b, 0xb6, 0x5a, 0xef, 0x4e, 0x75, 0x44, + 0xdf, 0xc1, 0xce, 0x9f, 0x34, 0x4c, 0x99, 0xde, 0x9a, 0xd5, 0xcb, 0xe6, 0x67, 0xa5, 0xfc, 0xaa, + 0x58, 0xd7, 0x88, 0xde, 0x3e, 0x7b, 0x53, 0x68, 0xdd, 0x43, 0xe3, 0x89, 0xf7, 0xff, 0x47, 0xda, + 0xf3, 0xbf, 0x0b, 0x50, 0x34, 0xcb, 0x19, 0x35, 0xa0, 0xea, 0xdc, 0x91, 0xb1, 0x3b, 0xfa, 0xd9, + 0xb5, 0x27, 0x13, 0xeb, 0x2b, 0xb4, 0x0b, 0xe5, 0x41, 0xff, 0x6e, 0x60, 0xdf, 0xd8, 0x43, 0xab, + 0x80, 0x00, 0x8a, 0xd7, 0x7d, 0x47, 0x9d, 0x9f, 0xa1, 0x17, 0xd0, 0x32, 0x67, 0xf2, 0xe0, 0x4c, + 0xdf, 0x91, 0xa9, 0xed, 0xde, 0x3a, 0x77, 0xfd, 0x1b, 0x62, 0xbb, 0xee, 0xc8, 0xb5, 0xb6, 0x50, + 0x0d, 0x2a, 0x83, 0xd1, 0xed, 0xf8, 0xc6, 0x9e, 0xda, 0x43, 0x6b, 0x1b, 0x1d, 0xc1, 0x41, 0x7e, + 0x35, 0x11, 0x5a, 0x38, 0xb1, 0x76, 0x94, 0x72, 0x32, 0x78, 0x67, 0x0f, 0xef, 0x55, 0xe2, 0xa2, + 0xba, 0x4e, 0x9d, 0x5b, 0x7b, 0x48, 0x46, 0xf7, 0x53, 0xab, 0x84, 0xf6, 0xa0, 0xe1, 0xda, 0xfd, + 0xe1, 0x6f, 0xe4, 0x7a, 0xe4, 0x12, 0xd7, 0x76, 0xef, 0xef, 0xac, 0x32, 0xaa, 0x42, 0x69, 0xf2, + 0x8b, 0x33, 0x1e, 0xdb, 0x43, 0xab, 0x72, 0x45, 0xe1, 0xd8, 0xe3, 0x51, 0x37, 0x66, 0x72, 0x16, + 0x06, 0x1f, 0x9f, 0xbe, 0xb4, 0xab, 0xa2, 0x7a, 0x54, 0xe3, 0xc7, 0xdf, 0xdf, 0xce, 0x03, 0xf9, + 0x3e, 0x7d, 0xec, 0x7a, 0x3c, 0xea, 0xad, 0xb5, 0xbd, 0x5c, 0xdb, 0xf3, 0xc2, 0x80, 0xc5, 0xb2, + 0x37, 0xe7, 0x73, 0xb1, 0xf4, 0x36, 0x70, 0xfd, 0xa7, 0xfa, 0x58, 0xd4, 0xa9, 0x5e, 0xfd, 0x13, + 0x00, 0x00, 0xff, 0xff, 0xe9, 0xb6, 0x2c, 0x87, 0x87, 0x07, 0x00, 0x00, } diff --git a/client/gogrpc/conductor/model/taskdef.pb.go b/client/gogrpc/conductor/model/taskdef.pb.go index 8b07c0eb1e..a51239e06e 100644 --- a/client/gogrpc/conductor/model/taskdef.pb.go +++ b/client/gogrpc/conductor/model/taskdef.pb.go @@ -39,7 +39,7 @@ func (x TaskDef_RetryLogic) String() string { return proto.EnumName(TaskDef_RetryLogic_name, int32(x)) } func (TaskDef_RetryLogic) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_taskdef_34514f3248f44dc2, []int{0, 0} + return fileDescriptor_taskdef_dbc1866a3715b3e8, []int{0, 0} } type TaskDef_TimeoutPolicy int32 @@ -65,22 +65,23 @@ func (x TaskDef_TimeoutPolicy) String() string { return proto.EnumName(TaskDef_TimeoutPolicy_name, int32(x)) } func (TaskDef_TimeoutPolicy) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_taskdef_34514f3248f44dc2, []int{0, 1} + return fileDescriptor_taskdef_dbc1866a3715b3e8, []int{0, 1} } type TaskDef struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"` - RetryCount int32 `protobuf:"varint,3,opt,name=retry_count,json=retryCount" json:"retry_count,omitempty"` - TimeoutSeconds int64 `protobuf:"varint,4,opt,name=timeout_seconds,json=timeoutSeconds" json:"timeout_seconds,omitempty"` - InputKeys []string `protobuf:"bytes,5,rep,name=input_keys,json=inputKeys" json:"input_keys,omitempty"` - OutputKeys []string `protobuf:"bytes,6,rep,name=output_keys,json=outputKeys" json:"output_keys,omitempty"` - TimeoutPolicy TaskDef_TimeoutPolicy `protobuf:"varint,7,opt,name=timeout_policy,json=timeoutPolicy,enum=conductor.proto.TaskDef_TimeoutPolicy" json:"timeout_policy,omitempty"` - RetryLogic TaskDef_RetryLogic `protobuf:"varint,8,opt,name=retry_logic,json=retryLogic,enum=conductor.proto.TaskDef_RetryLogic" json:"retry_logic,omitempty"` - RetryDelaySeconds int32 `protobuf:"varint,9,opt,name=retry_delay_seconds,json=retryDelaySeconds" json:"retry_delay_seconds,omitempty"` - ResponseTimeoutSeconds int32 `protobuf:"varint,10,opt,name=response_timeout_seconds,json=responseTimeoutSeconds" json:"response_timeout_seconds,omitempty"` - ConcurrentExecLimit int32 `protobuf:"varint,11,opt,name=concurrent_exec_limit,json=concurrentExecLimit" json:"concurrent_exec_limit,omitempty"` - InputTemplate map[string]*_struct.Value `protobuf:"bytes,12,rep,name=input_template,json=inputTemplate" json:"input_template,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + RetryCount int32 `protobuf:"varint,3,opt,name=retry_count,json=retryCount,proto3" json:"retry_count,omitempty"` + TimeoutSeconds int64 `protobuf:"varint,4,opt,name=timeout_seconds,json=timeoutSeconds,proto3" json:"timeout_seconds,omitempty"` + InputKeys []string `protobuf:"bytes,5,rep,name=input_keys,json=inputKeys,proto3" json:"input_keys,omitempty"` + OutputKeys []string `protobuf:"bytes,6,rep,name=output_keys,json=outputKeys,proto3" json:"output_keys,omitempty"` + TimeoutPolicy TaskDef_TimeoutPolicy `protobuf:"varint,7,opt,name=timeout_policy,json=timeoutPolicy,proto3,enum=conductor.proto.TaskDef_TimeoutPolicy" json:"timeout_policy,omitempty"` + RetryLogic TaskDef_RetryLogic `protobuf:"varint,8,opt,name=retry_logic,json=retryLogic,proto3,enum=conductor.proto.TaskDef_RetryLogic" json:"retry_logic,omitempty"` + RetryDelaySeconds int32 `protobuf:"varint,9,opt,name=retry_delay_seconds,json=retryDelaySeconds,proto3" json:"retry_delay_seconds,omitempty"` + ResponseTimeoutSeconds int32 `protobuf:"varint,10,opt,name=response_timeout_seconds,json=responseTimeoutSeconds,proto3" json:"response_timeout_seconds,omitempty"` + ConcurrentExecLimit int32 `protobuf:"varint,11,opt,name=concurrent_exec_limit,json=concurrentExecLimit,proto3" json:"concurrent_exec_limit,omitempty"` + InputTemplate map[string]*_struct.Value `protobuf:"bytes,12,rep,name=input_template,json=inputTemplate,proto3" json:"input_template,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + RateLimitPerSecond int32 `protobuf:"varint,13,opt,name=rate_limit_per_second,json=rateLimitPerSecond,proto3" json:"rate_limit_per_second,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -90,7 +91,7 @@ func (m *TaskDef) Reset() { *m = TaskDef{} } func (m *TaskDef) String() string { return proto.CompactTextString(m) } func (*TaskDef) ProtoMessage() {} func (*TaskDef) Descriptor() ([]byte, []int) { - return fileDescriptor_taskdef_34514f3248f44dc2, []int{0} + return fileDescriptor_taskdef_dbc1866a3715b3e8, []int{0} } func (m *TaskDef) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskDef.Unmarshal(m, b) @@ -194,6 +195,13 @@ func (m *TaskDef) GetInputTemplate() map[string]*_struct.Value { return nil } +func (m *TaskDef) GetRateLimitPerSecond() int32 { + if m != nil { + return m.RateLimitPerSecond + } + return 0 +} + func init() { proto.RegisterType((*TaskDef)(nil), "conductor.proto.TaskDef") proto.RegisterMapType((map[string]*_struct.Value)(nil), "conductor.proto.TaskDef.InputTemplateEntry") @@ -201,44 +209,46 @@ func init() { proto.RegisterEnum("conductor.proto.TaskDef_TimeoutPolicy", TaskDef_TimeoutPolicy_name, TaskDef_TimeoutPolicy_value) } -func init() { proto.RegisterFile("model/taskdef.proto", fileDescriptor_taskdef_34514f3248f44dc2) } - -var fileDescriptor_taskdef_34514f3248f44dc2 = []byte{ - // 568 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0x61, 0x4f, 0x9b, 0x5e, - 0x14, 0xc6, 0xc5, 0x5a, 0xfd, 0xf7, 0xf4, 0x6f, 0xed, 0x6e, 0x33, 0x47, 0xdc, 0x96, 0x11, 0x97, - 0x6c, 0x24, 0x5b, 0x60, 0xe9, 0xde, 0x18, 0xf7, 0x4a, 0x2d, 0x4d, 0x1a, 0xab, 0x35, 0x77, 0x6c, - 0xd3, 0xbd, 0x21, 0xf4, 0x72, 0xca, 0x6e, 0x0a, 0x5c, 0x02, 0x97, 0x45, 0x3e, 0xca, 0xbe, 0xed, - 0xc2, 0x85, 0x6a, 0x75, 0xf1, 0xdd, 0xbd, 0xcf, 0xf3, 0x3b, 0x07, 0xce, 0xc3, 0x01, 0x06, 0xb1, - 0x08, 0x30, 0xb2, 0xa5, 0x9f, 0x2f, 0x03, 0x5c, 0x58, 0x69, 0x26, 0xa4, 0x20, 0x7b, 0x4c, 0x24, - 0x41, 0xc1, 0xa4, 0xc8, 0x6a, 0xe1, 0xe0, 0x55, 0x28, 0x44, 0x18, 0xa1, 0xad, 0x6e, 0xf3, 0x62, - 0x61, 0xe7, 0x32, 0x2b, 0x98, 0xac, 0xdd, 0xc3, 0x3f, 0xdb, 0xb0, 0xe3, 0xfa, 0xf9, 0x72, 0x84, - 0x0b, 0x42, 0x60, 0x2b, 0xf1, 0x63, 0xd4, 0x35, 0x43, 0x33, 0x3b, 0x54, 0x9d, 0x89, 0x01, 0xdd, - 0x00, 0x73, 0x96, 0xf1, 0x54, 0x72, 0x91, 0xe8, 0x9b, 0xca, 0x5a, 0x97, 0xc8, 0x1b, 0xe8, 0x66, - 0x28, 0xb3, 0xd2, 0x63, 0xa2, 0x48, 0xa4, 0xde, 0x32, 0x34, 0xb3, 0x4d, 0x41, 0x49, 0x67, 0x95, - 0x42, 0xde, 0xc3, 0x9e, 0xe4, 0x31, 0x8a, 0x42, 0x7a, 0x39, 0x56, 0x6f, 0x97, 0xeb, 0x5b, 0x86, - 0x66, 0xb6, 0x68, 0xaf, 0x91, 0xbf, 0xd6, 0x2a, 0x79, 0x0d, 0xc0, 0x93, 0xb4, 0x90, 0xde, 0x12, - 0xcb, 0x5c, 0x6f, 0x1b, 0x2d, 0xb3, 0x43, 0x3b, 0x4a, 0x39, 0xc7, 0x32, 0xaf, 0x1e, 0x24, 0x0a, - 0x79, 0xe7, 0x6f, 0x2b, 0x1f, 0x6a, 0x49, 0x01, 0x17, 0xb0, 0xea, 0xe8, 0xa5, 0x22, 0xe2, 0xac, - 0xd4, 0x77, 0x0c, 0xcd, 0xec, 0x0d, 0xdf, 0x59, 0x8f, 0x32, 0xb1, 0x9a, 0x89, 0x2d, 0xb7, 0xc6, - 0xaf, 0x14, 0x4d, 0x77, 0xe5, 0xfa, 0x95, 0x8c, 0x56, 0x83, 0x45, 0x22, 0xe4, 0x4c, 0xff, 0x4f, - 0xf5, 0x7a, 0xfb, 0x64, 0x2f, 0x5a, 0xb1, 0xd3, 0x0a, 0x6d, 0xa6, 0x57, 0x67, 0x62, 0xc1, 0xa0, - 0xee, 0x12, 0x60, 0xe4, 0x97, 0x77, 0x09, 0x74, 0x54, 0x4c, 0xcf, 0x94, 0x35, 0xaa, 0x9c, 0x55, - 0x08, 0x47, 0xa0, 0x67, 0x98, 0xa7, 0x22, 0xc9, 0xd1, 0x7b, 0x1c, 0x1b, 0xa8, 0xa2, 0xfd, 0x95, - 0xef, 0x3e, 0x8c, 0x6f, 0x08, 0xcf, 0x99, 0x48, 0x58, 0x91, 0x65, 0x98, 0x48, 0x0f, 0x6f, 0x91, - 0x79, 0x11, 0x8f, 0xb9, 0xd4, 0xbb, 0xaa, 0x6c, 0x70, 0x6f, 0x3a, 0xb7, 0xc8, 0xa6, 0x95, 0x45, - 0x28, 0xf4, 0xea, 0xc8, 0x25, 0xc6, 0x69, 0xe4, 0x4b, 0xd4, 0xff, 0x37, 0x5a, 0x66, 0x77, 0xf8, - 0xe1, 0xc9, 0x31, 0x27, 0x15, 0xee, 0x36, 0xb4, 0x93, 0xc8, 0xac, 0xa4, 0xbb, 0x7c, 0x5d, 0x3b, - 0xb8, 0x06, 0xf2, 0x2f, 0x44, 0xfa, 0xd0, 0x5a, 0x62, 0xd9, 0xec, 0x56, 0x75, 0x24, 0x1f, 0xa1, - 0xfd, 0xdb, 0x8f, 0x0a, 0x54, 0x4b, 0xd5, 0x1d, 0xee, 0x5b, 0xf5, 0xa2, 0x5a, 0xab, 0x45, 0xb5, - 0xbe, 0x57, 0x2e, 0xad, 0xa1, 0xe3, 0xcd, 0x23, 0xed, 0xf0, 0x13, 0xc0, 0x7d, 0xca, 0xa4, 0x03, - 0xed, 0xf1, 0xe4, 0xda, 0x19, 0xf5, 0x37, 0xc8, 0x0b, 0x18, 0x38, 0xd7, 0x57, 0xb3, 0x4b, 0xe7, - 0xd2, 0x9d, 0x9c, 0x4c, 0xbd, 0xd3, 0x93, 0xb3, 0xf3, 0xd9, 0x78, 0xdc, 0xd7, 0x0e, 0xbf, 0xc0, - 0xee, 0x83, 0x6f, 0x5c, 0x15, 0x51, 0xc7, 0xa5, 0x37, 0xfd, 0x0d, 0xb2, 0x07, 0x5d, 0x77, 0x72, - 0xe1, 0x78, 0xb3, 0x6f, 0xae, 0xf7, 0x63, 0xdc, 0xd7, 0x48, 0x0f, 0xe0, 0x64, 0xea, 0x50, 0xd7, - 0x9b, 0x5d, 0x4e, 0x6f, 0xfa, 0x9b, 0xa7, 0x01, 0xbc, 0x64, 0x22, 0xb6, 0x12, 0x94, 0x8b, 0x88, - 0xdf, 0x3e, 0x4e, 0xe4, 0xb4, 0xd3, 0x44, 0x72, 0x35, 0xff, 0x79, 0x1c, 0x72, 0xf9, 0xab, 0x98, - 0x5b, 0x4c, 0xc4, 0x76, 0x83, 0xdb, 0x77, 0xb8, 0xcd, 0x22, 0x8e, 0x89, 0xb4, 0x43, 0x11, 0x66, - 0x29, 0x5b, 0xd3, 0xd5, 0xef, 0x3b, 0xdf, 0x56, 0xdd, 0x3e, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, - 0xb1, 0xb3, 0xea, 0x13, 0xce, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("model/taskdef.proto", fileDescriptor_taskdef_dbc1866a3715b3e8) } + +var fileDescriptor_taskdef_dbc1866a3715b3e8 = []byte{ + // 593 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0x51, 0x6f, 0xd3, 0x4c, + 0x10, 0xac, 0x9b, 0xa6, 0xfd, 0xb2, 0xf9, 0x92, 0x86, 0x8b, 0x5a, 0xac, 0x02, 0xc2, 0x2a, 0x12, + 0x44, 0x02, 0xd9, 0x10, 0x5e, 0xaa, 0xf2, 0xd4, 0x36, 0x8e, 0x14, 0x35, 0x6d, 0x22, 0x63, 0xa0, + 0xe5, 0xc5, 0x72, 0x2e, 0x1b, 0x63, 0xc5, 0xf6, 0x59, 0xe7, 0x33, 0xaa, 0xff, 0x23, 0x3f, 0x0a, + 0xdd, 0xd9, 0x69, 0xd3, 0xa0, 0xbe, 0xdd, 0xcd, 0xcc, 0xcd, 0xee, 0x8e, 0xd7, 0xd0, 0x8d, 0xd9, + 0x1c, 0x23, 0x4b, 0xf8, 0xd9, 0x72, 0x8e, 0x0b, 0x33, 0xe5, 0x4c, 0x30, 0xb2, 0x4f, 0x59, 0x32, + 0xcf, 0xa9, 0x60, 0xbc, 0x04, 0x8e, 0x5e, 0x06, 0x8c, 0x05, 0x11, 0x5a, 0xea, 0x36, 0xcb, 0x17, + 0x56, 0x26, 0x78, 0x4e, 0x45, 0xc9, 0x1e, 0xff, 0xd9, 0x85, 0x3d, 0xd7, 0xcf, 0x96, 0x03, 0x5c, + 0x10, 0x02, 0x3b, 0x89, 0x1f, 0xa3, 0xae, 0x19, 0x5a, 0xaf, 0xe1, 0xa8, 0x33, 0x31, 0xa0, 0x39, + 0xc7, 0x8c, 0xf2, 0x30, 0x15, 0x21, 0x4b, 0xf4, 0x6d, 0x45, 0xad, 0x43, 0xe4, 0x35, 0x34, 0x39, + 0x0a, 0x5e, 0x78, 0x94, 0xe5, 0x89, 0xd0, 0x6b, 0x86, 0xd6, 0xab, 0x3b, 0xa0, 0xa0, 0x0b, 0x89, + 0x90, 0x77, 0xb0, 0x2f, 0xc2, 0x18, 0x59, 0x2e, 0xbc, 0x0c, 0x65, 0x77, 0x99, 0xbe, 0x63, 0x68, + 0xbd, 0x9a, 0xd3, 0xae, 0xe0, 0xaf, 0x25, 0x4a, 0x5e, 0x01, 0x84, 0x49, 0x9a, 0x0b, 0x6f, 0x89, + 0x45, 0xa6, 0xd7, 0x8d, 0x5a, 0xaf, 0xe1, 0x34, 0x14, 0x72, 0x89, 0x45, 0x26, 0x0b, 0xb1, 0x5c, + 0xdc, 0xf3, 0xbb, 0x8a, 0x87, 0x12, 0x52, 0x82, 0x2b, 0x58, 0x39, 0x7a, 0x29, 0x8b, 0x42, 0x5a, + 0xe8, 0x7b, 0x86, 0xd6, 0x6b, 0xf7, 0xdf, 0x9a, 0x1b, 0x99, 0x98, 0xd5, 0xc4, 0xa6, 0x5b, 0xca, + 0xa7, 0x4a, 0xed, 0xb4, 0xc4, 0xfa, 0x95, 0x0c, 0x56, 0x83, 0x45, 0x2c, 0x08, 0xa9, 0xfe, 0x9f, + 0xf2, 0x7a, 0xf3, 0xa4, 0x97, 0x23, 0xb5, 0x63, 0x29, 0xad, 0xa6, 0x57, 0x67, 0x62, 0x42, 0xb7, + 0x74, 0x99, 0x63, 0xe4, 0x17, 0xf7, 0x09, 0x34, 0x54, 0x4c, 0xcf, 0x14, 0x35, 0x90, 0xcc, 0x2a, + 0x84, 0x13, 0xd0, 0x39, 0x66, 0x29, 0x4b, 0x32, 0xf4, 0x36, 0x63, 0x03, 0xf5, 0xe8, 0x70, 0xc5, + 0xbb, 0x8f, 0xe3, 0xeb, 0xc3, 0x01, 0x65, 0x09, 0xcd, 0x39, 0xc7, 0x44, 0x78, 0x78, 0x87, 0xd4, + 0x8b, 0xc2, 0x38, 0x14, 0x7a, 0x53, 0x3d, 0xeb, 0x3e, 0x90, 0xf6, 0x1d, 0xd2, 0xb1, 0xa4, 0x88, + 0x03, 0xed, 0x32, 0x72, 0x81, 0x71, 0x1a, 0xf9, 0x02, 0xf5, 0xff, 0x8d, 0x5a, 0xaf, 0xd9, 0x7f, + 0xff, 0xe4, 0x98, 0x23, 0x29, 0x77, 0x2b, 0xb5, 0x9d, 0x08, 0x5e, 0x38, 0xad, 0x70, 0x1d, 0x23, + 0x9f, 0xe0, 0x80, 0xfb, 0x02, 0xcb, 0xe2, 0x5e, 0x8a, 0xbc, 0xea, 0x5f, 0x6f, 0xa9, 0x3e, 0x88, + 0x24, 0x55, 0xf5, 0x29, 0xf2, 0xb2, 0xf7, 0xa3, 0x1b, 0x20, 0xff, 0xfa, 0x92, 0x0e, 0xd4, 0x96, + 0x58, 0x54, 0xeb, 0x28, 0x8f, 0xe4, 0x03, 0xd4, 0x7f, 0xfb, 0x51, 0x8e, 0x6a, 0x0f, 0x9b, 0xfd, + 0x43, 0xb3, 0xdc, 0x6d, 0x73, 0xb5, 0xdb, 0xe6, 0x77, 0xc9, 0x3a, 0xa5, 0xe8, 0x74, 0xfb, 0x44, + 0x3b, 0xfe, 0x08, 0xf0, 0xf0, 0x61, 0x48, 0x03, 0xea, 0xc3, 0xd1, 0x8d, 0x3d, 0xe8, 0x6c, 0x91, + 0xe7, 0xd0, 0xb5, 0x6f, 0xa6, 0x93, 0x6b, 0xfb, 0xda, 0x1d, 0x9d, 0x8d, 0xbd, 0xf3, 0xb3, 0x8b, + 0xcb, 0xc9, 0x70, 0xd8, 0xd1, 0x8e, 0xbf, 0x40, 0xeb, 0xd1, 0x5a, 0xc8, 0x47, 0x8e, 0xed, 0x3a, + 0xb7, 0x9d, 0x2d, 0xb2, 0x0f, 0x4d, 0x77, 0x74, 0x65, 0x7b, 0x93, 0x6f, 0xae, 0xf7, 0x63, 0xd8, + 0xd1, 0x48, 0x1b, 0xe0, 0x6c, 0x6c, 0x3b, 0xae, 0x37, 0xb9, 0x1e, 0xdf, 0x76, 0xb6, 0xcf, 0xe7, + 0xf0, 0x82, 0xb2, 0xd8, 0x4c, 0x50, 0x2c, 0xa2, 0xf0, 0x6e, 0x33, 0xc4, 0xf3, 0x46, 0x95, 0xe2, + 0x74, 0xf6, 0xf3, 0x34, 0x08, 0xc5, 0xaf, 0x7c, 0x66, 0x52, 0x16, 0x5b, 0x95, 0xdc, 0xba, 0x97, + 0x5b, 0x34, 0x0a, 0x31, 0x11, 0x56, 0xc0, 0x02, 0x9e, 0xd2, 0x35, 0x5c, 0xfd, 0xf1, 0xb3, 0x5d, + 0xe5, 0xf6, 0xf9, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0xd8, 0x2b, 0x35, 0x01, 0x04, 0x00, + 0x00, } diff --git a/client/gogrpc/conductor/model/taskexeclog.pb.go b/client/gogrpc/conductor/model/taskexeclog.pb.go index d62a8be72b..f8c999074d 100644 --- a/client/gogrpc/conductor/model/taskexeclog.pb.go +++ b/client/gogrpc/conductor/model/taskexeclog.pb.go @@ -19,9 +19,9 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type TaskExecLog struct { - Log string `protobuf:"bytes,1,opt,name=log" json:"log,omitempty"` - TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId" json:"task_id,omitempty"` - CreatedTime int64 `protobuf:"varint,3,opt,name=created_time,json=createdTime" json:"created_time,omitempty"` + Log string `protobuf:"bytes,1,opt,name=log,proto3" json:"log,omitempty"` + TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` + CreatedTime int64 `protobuf:"varint,3,opt,name=created_time,json=createdTime,proto3" json:"created_time,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/taskresult.pb.go b/client/gogrpc/conductor/model/taskresult.pb.go index 25846d54fa..26eb4017f9 100644 --- a/client/gogrpc/conductor/model/taskresult.pb.go +++ b/client/gogrpc/conductor/model/taskresult.pb.go @@ -53,14 +53,14 @@ func (TaskResult_Status) EnumDescriptor() ([]byte, []int) { } type TaskResult struct { - WorkflowInstanceId string `protobuf:"bytes,1,opt,name=workflow_instance_id,json=workflowInstanceId" json:"workflow_instance_id,omitempty"` - TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId" json:"task_id,omitempty"` - ReasonForIncompletion string `protobuf:"bytes,3,opt,name=reason_for_incompletion,json=reasonForIncompletion" json:"reason_for_incompletion,omitempty"` - CallbackAfterSeconds int64 `protobuf:"varint,4,opt,name=callback_after_seconds,json=callbackAfterSeconds" json:"callback_after_seconds,omitempty"` - WorkerId string `protobuf:"bytes,5,opt,name=worker_id,json=workerId" json:"worker_id,omitempty"` - Status TaskResult_Status `protobuf:"varint,6,opt,name=status,enum=conductor.proto.TaskResult_Status" json:"status,omitempty"` - OutputData map[string]*_struct.Value `protobuf:"bytes,7,rep,name=output_data,json=outputData" json:"output_data,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - OutputMessage *any.Any `protobuf:"bytes,8,opt,name=output_message,json=outputMessage" json:"output_message,omitempty"` + WorkflowInstanceId string `protobuf:"bytes,1,opt,name=workflow_instance_id,json=workflowInstanceId,proto3" json:"workflow_instance_id,omitempty"` + TaskId string `protobuf:"bytes,2,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` + ReasonForIncompletion string `protobuf:"bytes,3,opt,name=reason_for_incompletion,json=reasonForIncompletion,proto3" json:"reason_for_incompletion,omitempty"` + CallbackAfterSeconds int64 `protobuf:"varint,4,opt,name=callback_after_seconds,json=callbackAfterSeconds,proto3" json:"callback_after_seconds,omitempty"` + WorkerId string `protobuf:"bytes,5,opt,name=worker_id,json=workerId,proto3" json:"worker_id,omitempty"` + Status TaskResult_Status `protobuf:"varint,6,opt,name=status,proto3,enum=conductor.proto.TaskResult_Status" json:"status,omitempty"` + OutputData map[string]*_struct.Value `protobuf:"bytes,7,rep,name=output_data,json=outputData,proto3" json:"output_data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + OutputMessage *any.Any `protobuf:"bytes,8,opt,name=output_message,json=outputMessage,proto3" json:"output_message,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/tasksummary.pb.go b/client/gogrpc/conductor/model/tasksummary.pb.go index abdeaab07e..0127dd8f70 100644 --- a/client/gogrpc/conductor/model/tasksummary.pb.go +++ b/client/gogrpc/conductor/model/tasksummary.pb.go @@ -19,22 +19,22 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type TaskSummary struct { - WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - WorkflowType string `protobuf:"bytes,2,opt,name=workflow_type,json=workflowType" json:"workflow_type,omitempty"` - CorrelationId string `protobuf:"bytes,3,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - ScheduledTime string `protobuf:"bytes,4,opt,name=scheduled_time,json=scheduledTime" json:"scheduled_time,omitempty"` - StartTime string `protobuf:"bytes,5,opt,name=start_time,json=startTime" json:"start_time,omitempty"` - UpdateTime string `protobuf:"bytes,6,opt,name=update_time,json=updateTime" json:"update_time,omitempty"` - EndTime string `protobuf:"bytes,7,opt,name=end_time,json=endTime" json:"end_time,omitempty"` - Status Task_Status `protobuf:"varint,8,opt,name=status,enum=conductor.proto.Task_Status" json:"status,omitempty"` - ReasonForIncompletion string `protobuf:"bytes,9,opt,name=reason_for_incompletion,json=reasonForIncompletion" json:"reason_for_incompletion,omitempty"` - ExecutionTime int64 `protobuf:"varint,10,opt,name=execution_time,json=executionTime" json:"execution_time,omitempty"` - QueueWaitTime int64 `protobuf:"varint,11,opt,name=queue_wait_time,json=queueWaitTime" json:"queue_wait_time,omitempty"` - TaskDefName string `protobuf:"bytes,12,opt,name=task_def_name,json=taskDefName" json:"task_def_name,omitempty"` - TaskType string `protobuf:"bytes,13,opt,name=task_type,json=taskType" json:"task_type,omitempty"` - Input string `protobuf:"bytes,14,opt,name=input" json:"input,omitempty"` - Output string `protobuf:"bytes,15,opt,name=output" json:"output,omitempty"` - TaskId string `protobuf:"bytes,16,opt,name=task_id,json=taskId" json:"task_id,omitempty"` + WorkflowId string `protobuf:"bytes,1,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + WorkflowType string `protobuf:"bytes,2,opt,name=workflow_type,json=workflowType,proto3" json:"workflow_type,omitempty"` + CorrelationId string `protobuf:"bytes,3,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + ScheduledTime string `protobuf:"bytes,4,opt,name=scheduled_time,json=scheduledTime,proto3" json:"scheduled_time,omitempty"` + StartTime string `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + UpdateTime string `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` + EndTime string `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` + Status Task_Status `protobuf:"varint,8,opt,name=status,proto3,enum=conductor.proto.Task_Status" json:"status,omitempty"` + ReasonForIncompletion string `protobuf:"bytes,9,opt,name=reason_for_incompletion,json=reasonForIncompletion,proto3" json:"reason_for_incompletion,omitempty"` + ExecutionTime int64 `protobuf:"varint,10,opt,name=execution_time,json=executionTime,proto3" json:"execution_time,omitempty"` + QueueWaitTime int64 `protobuf:"varint,11,opt,name=queue_wait_time,json=queueWaitTime,proto3" json:"queue_wait_time,omitempty"` + TaskDefName string `protobuf:"bytes,12,opt,name=task_def_name,json=taskDefName,proto3" json:"task_def_name,omitempty"` + TaskType string `protobuf:"bytes,13,opt,name=task_type,json=taskType,proto3" json:"task_type,omitempty"` + Input string `protobuf:"bytes,14,opt,name=input,proto3" json:"input,omitempty"` + Output string `protobuf:"bytes,15,opt,name=output,proto3" json:"output,omitempty"` + TaskId string `protobuf:"bytes,16,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/workflow.pb.go b/client/gogrpc/conductor/model/workflow.pb.go index 9588282808..d0c963b5a9 100644 --- a/client/gogrpc/conductor/model/workflow.pb.go +++ b/client/gogrpc/conductor/model/workflow.pb.go @@ -51,27 +51,28 @@ func (x Workflow_WorkflowStatus) String() string { return proto.EnumName(Workflow_WorkflowStatus_name, int32(x)) } func (Workflow_WorkflowStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_workflow_ccfaf06783966538, []int{0, 0} + return fileDescriptor_workflow_d126dd6e3df866dc, []int{0, 0} } type Workflow struct { - Status Workflow_WorkflowStatus `protobuf:"varint,1,opt,name=status,enum=conductor.proto.Workflow_WorkflowStatus" json:"status,omitempty"` - EndTime int64 `protobuf:"varint,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"` - WorkflowId string `protobuf:"bytes,3,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - ParentWorkflowId string `protobuf:"bytes,4,opt,name=parent_workflow_id,json=parentWorkflowId" json:"parent_workflow_id,omitempty"` - ParentWorkflowTaskId string `protobuf:"bytes,5,opt,name=parent_workflow_task_id,json=parentWorkflowTaskId" json:"parent_workflow_task_id,omitempty"` - Tasks []*Task `protobuf:"bytes,6,rep,name=tasks" json:"tasks,omitempty"` - Input map[string]*_struct.Value `protobuf:"bytes,8,rep,name=input" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Output map[string]*_struct.Value `protobuf:"bytes,9,rep,name=output" json:"output,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - WorkflowType string `protobuf:"bytes,10,opt,name=workflow_type,json=workflowType" json:"workflow_type,omitempty"` - Version int32 `protobuf:"varint,11,opt,name=version" json:"version,omitempty"` - CorrelationId string `protobuf:"bytes,12,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - ReRunFromWorkflowId string `protobuf:"bytes,13,opt,name=re_run_from_workflow_id,json=reRunFromWorkflowId" json:"re_run_from_workflow_id,omitempty"` - ReasonForIncompletion string `protobuf:"bytes,14,opt,name=reason_for_incompletion,json=reasonForIncompletion" json:"reason_for_incompletion,omitempty"` - SchemaVersion int32 `protobuf:"varint,15,opt,name=schema_version,json=schemaVersion" json:"schema_version,omitempty"` - Event string `protobuf:"bytes,16,opt,name=event" json:"event,omitempty"` - TaskToDomain map[string]string `protobuf:"bytes,17,rep,name=task_to_domain,json=taskToDomain" json:"task_to_domain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - FailedReferenceTaskNames []string `protobuf:"bytes,18,rep,name=failed_reference_task_names,json=failedReferenceTaskNames" json:"failed_reference_task_names,omitempty"` + Status Workflow_WorkflowStatus `protobuf:"varint,1,opt,name=status,proto3,enum=conductor.proto.Workflow_WorkflowStatus" json:"status,omitempty"` + EndTime int64 `protobuf:"varint,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` + WorkflowId string `protobuf:"bytes,3,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + ParentWorkflowId string `protobuf:"bytes,4,opt,name=parent_workflow_id,json=parentWorkflowId,proto3" json:"parent_workflow_id,omitempty"` + ParentWorkflowTaskId string `protobuf:"bytes,5,opt,name=parent_workflow_task_id,json=parentWorkflowTaskId,proto3" json:"parent_workflow_task_id,omitempty"` + Tasks []*Task `protobuf:"bytes,6,rep,name=tasks,proto3" json:"tasks,omitempty"` + Input map[string]*_struct.Value `protobuf:"bytes,8,rep,name=input,proto3" json:"input,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Output map[string]*_struct.Value `protobuf:"bytes,9,rep,name=output,proto3" json:"output,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + WorkflowType string `protobuf:"bytes,10,opt,name=workflow_type,json=workflowType,proto3" json:"workflow_type,omitempty"` + Version int32 `protobuf:"varint,11,opt,name=version,proto3" json:"version,omitempty"` + CorrelationId string `protobuf:"bytes,12,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + ReRunFromWorkflowId string `protobuf:"bytes,13,opt,name=re_run_from_workflow_id,json=reRunFromWorkflowId,proto3" json:"re_run_from_workflow_id,omitempty"` + ReasonForIncompletion string `protobuf:"bytes,14,opt,name=reason_for_incompletion,json=reasonForIncompletion,proto3" json:"reason_for_incompletion,omitempty"` + SchemaVersion int32 `protobuf:"varint,15,opt,name=schema_version,json=schemaVersion,proto3" json:"schema_version,omitempty"` + Event string `protobuf:"bytes,16,opt,name=event,proto3" json:"event,omitempty"` + TaskToDomain map[string]string `protobuf:"bytes,17,rep,name=task_to_domain,json=taskToDomain,proto3" json:"task_to_domain,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FailedReferenceTaskNames []string `protobuf:"bytes,18,rep,name=failed_reference_task_names,json=failedReferenceTaskNames,proto3" json:"failed_reference_task_names,omitempty"` + WorkflowDefinition *WorkflowDef `protobuf:"bytes,19,opt,name=workflow_definition,json=workflowDefinition,proto3" json:"workflow_definition,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -81,7 +82,7 @@ func (m *Workflow) Reset() { *m = Workflow{} } func (m *Workflow) String() string { return proto.CompactTextString(m) } func (*Workflow) ProtoMessage() {} func (*Workflow) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_ccfaf06783966538, []int{0} + return fileDescriptor_workflow_d126dd6e3df866dc, []int{0} } func (m *Workflow) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Workflow.Unmarshal(m, b) @@ -220,6 +221,13 @@ func (m *Workflow) GetFailedReferenceTaskNames() []string { return nil } +func (m *Workflow) GetWorkflowDefinition() *WorkflowDef { + if m != nil { + return m.WorkflowDefinition + } + return nil +} + func init() { proto.RegisterType((*Workflow)(nil), "conductor.proto.Workflow") proto.RegisterMapType((map[string]*_struct.Value)(nil), "conductor.proto.Workflow.InputEntry") @@ -228,51 +236,54 @@ func init() { proto.RegisterEnum("conductor.proto.Workflow_WorkflowStatus", Workflow_WorkflowStatus_name, Workflow_WorkflowStatus_value) } -func init() { proto.RegisterFile("model/workflow.proto", fileDescriptor_workflow_ccfaf06783966538) } - -var fileDescriptor_workflow_ccfaf06783966538 = []byte{ - // 688 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xdf, 0x4f, 0xdb, 0x48, - 0x10, 0xc7, 0x2f, 0x84, 0x04, 0x32, 0x21, 0xc1, 0xec, 0x85, 0xc3, 0x07, 0x27, 0x5d, 0x44, 0x8b, - 0x14, 0x09, 0xe4, 0x48, 0xf4, 0x87, 0x2a, 0x24, 0xd4, 0x42, 0x63, 0x2a, 0x4b, 0x10, 0x82, 0x31, - 0x20, 0xf5, 0xc5, 0x72, 0xec, 0x75, 0xb0, 0x62, 0xef, 0x5a, 0xeb, 0x35, 0x34, 0xcf, 0xfd, 0xc7, - 0xab, 0xdd, 0x8d, 0xc1, 0x40, 0x79, 0xeb, 0x9b, 0x77, 0xe6, 0xf3, 0xfd, 0x6a, 0x76, 0x66, 0xc7, - 0xd0, 0x49, 0x68, 0x80, 0xe3, 0xfe, 0x3d, 0x65, 0xd3, 0x30, 0xa6, 0xf7, 0x46, 0xca, 0x28, 0xa7, - 0x68, 0xd5, 0xa7, 0x24, 0xc8, 0x7d, 0x4e, 0x99, 0x0a, 0x6c, 0x6a, 0x0a, 0xe3, 0x5e, 0x36, 0x9d, - 0x47, 0xfe, 0x9b, 0x50, 0x3a, 0x89, 0x71, 0x5f, 0x9e, 0xc6, 0x79, 0xd8, 0xcf, 0x38, 0xcb, 0x7d, - 0xae, 0xb2, 0xdb, 0x3f, 0x1b, 0xb0, 0x7c, 0x33, 0xf7, 0x44, 0x5f, 0xa0, 0x9e, 0x71, 0x8f, 0xe7, - 0x99, 0x5e, 0xe9, 0x56, 0x7a, 0xed, 0xfd, 0x9e, 0xf1, 0xcc, 0xde, 0x28, 0xd0, 0x87, 0x8f, 0x4b, - 0xc9, 0xdb, 0x73, 0x1d, 0xfa, 0x17, 0x96, 0x31, 0x09, 0x5c, 0x1e, 0x25, 0x58, 0x5f, 0xe8, 0x56, - 0x7a, 0x55, 0x7b, 0x09, 0x93, 0xc0, 0x89, 0x12, 0x8c, 0xfe, 0x87, 0x66, 0x51, 0xbc, 0x1b, 0x05, - 0x7a, 0xb5, 0x5b, 0xe9, 0x35, 0x6c, 0x28, 0x42, 0x56, 0x80, 0xf6, 0x00, 0xa5, 0x1e, 0xc3, 0x84, - 0xbb, 0x65, 0x6e, 0x51, 0x72, 0x9a, 0xca, 0xdc, 0x3c, 0xd2, 0x1f, 0x60, 0xe3, 0x39, 0x2d, 0x2e, - 0x2d, 0x24, 0x35, 0x29, 0xe9, 0x3c, 0x95, 0x38, 0x5e, 0x36, 0xb5, 0x02, 0xb4, 0x0b, 0x35, 0x81, - 0x65, 0x7a, 0xbd, 0x5b, 0xed, 0x35, 0xf7, 0xd7, 0x5f, 0xdc, 0x50, 0x70, 0xb6, 0x62, 0xd0, 0x01, - 0xd4, 0x22, 0x92, 0xe6, 0x5c, 0x5f, 0x96, 0xf0, 0xdb, 0xd7, 0xdb, 0x61, 0x09, 0xcc, 0x24, 0x9c, - 0xcd, 0x6c, 0x25, 0x41, 0x87, 0x50, 0xa7, 0x39, 0x17, 0xe2, 0x86, 0x14, 0xef, 0xbc, 0x2e, 0x3e, - 0x97, 0x9c, 0x52, 0xcf, 0x45, 0xe8, 0x0d, 0xb4, 0x1e, 0xef, 0x35, 0x4b, 0xb1, 0x0e, 0xf2, 0x52, - 0x2b, 0x45, 0xd0, 0x99, 0xa5, 0x18, 0xe9, 0xb0, 0x74, 0x87, 0x59, 0x16, 0x51, 0xa2, 0x37, 0xbb, - 0x95, 0x5e, 0xcd, 0x2e, 0x8e, 0x68, 0x07, 0xda, 0x3e, 0x65, 0x0c, 0xc7, 0x1e, 0x8f, 0x28, 0x11, - 0x4d, 0x59, 0x91, 0xfa, 0x56, 0x29, 0x6a, 0x05, 0xe8, 0x3d, 0x6c, 0x30, 0xec, 0xb2, 0x9c, 0xb8, - 0x21, 0xa3, 0xc9, 0x93, 0xbe, 0xb7, 0x24, 0xff, 0x37, 0xc3, 0x76, 0x4e, 0x4e, 0x18, 0x4d, 0x4a, - 0xad, 0xff, 0x28, 0x54, 0x5e, 0x46, 0x89, 0x1b, 0x52, 0xe6, 0x46, 0xc4, 0xa7, 0x49, 0x1a, 0x63, - 0x61, 0xa9, 0xb7, 0xa5, 0x6a, 0x5d, 0xa5, 0x4f, 0x28, 0xb3, 0x4a, 0x49, 0x51, 0x54, 0xe6, 0xdf, - 0xe2, 0xc4, 0x73, 0x8b, 0xaa, 0x57, 0x65, 0xd5, 0x2d, 0x15, 0xbd, 0x9e, 0xd7, 0xde, 0x81, 0x1a, - 0xbe, 0xc3, 0x84, 0xeb, 0x9a, 0x34, 0x53, 0x07, 0x74, 0x01, 0x6d, 0x39, 0x5f, 0x4e, 0xdd, 0x80, - 0x26, 0x5e, 0x44, 0xf4, 0x35, 0xd9, 0xd7, 0xdd, 0xd7, 0xfb, 0x2a, 0x46, 0xe9, 0xd0, 0x81, 0xa4, - 0x55, 0x77, 0x57, 0x78, 0x29, 0x84, 0x0e, 0x61, 0x2b, 0xf4, 0xa2, 0x18, 0x07, 0x2e, 0xc3, 0x21, - 0x66, 0x98, 0xf8, 0x58, 0xbd, 0x21, 0xe2, 0x25, 0x38, 0xd3, 0x51, 0xb7, 0xda, 0x6b, 0xd8, 0xba, - 0x42, 0xec, 0x82, 0x10, 0xa6, 0x43, 0x91, 0xdf, 0x1c, 0x01, 0x3c, 0x8e, 0x1d, 0x69, 0x50, 0x9d, - 0xe2, 0x99, 0x5c, 0x9c, 0x86, 0x2d, 0x3e, 0xd1, 0x1e, 0xd4, 0xee, 0xbc, 0x38, 0x57, 0x8b, 0xd0, - 0xdc, 0xff, 0xc7, 0x50, 0x8b, 0x68, 0x14, 0x8b, 0x68, 0x5c, 0x8b, 0xac, 0xad, 0xa0, 0x83, 0x85, - 0x4f, 0x95, 0xcd, 0x0b, 0x68, 0x96, 0xde, 0xc2, 0x1f, 0xb1, 0xfc, 0x0c, 0x6b, 0x2f, 0xda, 0xf0, - 0x1b, 0xe3, 0x4e, 0xd9, 0xb8, 0x51, 0x32, 0xd8, 0xf6, 0xa1, 0xfd, 0x74, 0xd7, 0x51, 0x13, 0x96, - 0xec, 0xab, 0xe1, 0xd0, 0x1a, 0x7e, 0xd3, 0xfe, 0x42, 0x2d, 0x68, 0x7c, 0x3d, 0x3f, 0x1b, 0x9d, - 0x9a, 0x8e, 0x39, 0xd0, 0x2a, 0x08, 0xa0, 0x7e, 0x72, 0x64, 0x9d, 0x9a, 0x03, 0x6d, 0x41, 0xa4, - 0x1c, 0xeb, 0xcc, 0x1c, 0xb8, 0xe7, 0x57, 0x8e, 0x56, 0x45, 0x6d, 0x00, 0xc7, 0xb4, 0xcf, 0xac, - 0xe1, 0x91, 0x40, 0x17, 0x05, 0x3a, 0x3a, 0xba, 0xba, 0x34, 0x07, 0x5a, 0xed, 0x18, 0xc3, 0x96, - 0x4f, 0x13, 0x83, 0x60, 0x1e, 0xc6, 0xd1, 0x8f, 0xe7, 0x13, 0x3d, 0x86, 0xa2, 0x82, 0xd1, 0xf8, - 0xfb, 0xc1, 0x24, 0xe2, 0xb7, 0xf9, 0xd8, 0xf0, 0x69, 0xd2, 0x9f, 0xf3, 0xfd, 0x07, 0xbe, 0xef, - 0xc7, 0x11, 0x26, 0xbc, 0x3f, 0xa1, 0x13, 0x96, 0xfa, 0xa5, 0xb8, 0xfc, 0x2b, 0x8e, 0xeb, 0xd2, - 0xee, 0xdd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x27, 0xe7, 0x4f, 0x4c, 0x05, 0x00, 0x00, +func init() { proto.RegisterFile("model/workflow.proto", fileDescriptor_workflow_d126dd6e3df866dc) } + +var fileDescriptor_workflow_d126dd6e3df866dc = []byte{ + // 727 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x5f, 0x4f, 0xe3, 0x46, + 0x14, 0xc5, 0x6b, 0xb2, 0x09, 0xe4, 0x86, 0x64, 0xbd, 0x43, 0xb6, 0xb8, 0xec, 0x4a, 0x8d, 0xb6, + 0x5d, 0xc9, 0xd2, 0x22, 0x47, 0x4a, 0xff, 0xa8, 0x42, 0x42, 0x2d, 0x34, 0xa1, 0xb2, 0x44, 0x42, + 0x30, 0x06, 0xa4, 0xbe, 0x58, 0x8e, 0x3d, 0x0e, 0x56, 0xec, 0x99, 0x68, 0x3c, 0x86, 0xe6, 0x6b, + 0xf6, 0x13, 0x55, 0x33, 0x63, 0x13, 0x07, 0x9a, 0xb7, 0x7d, 0xcb, 0xdc, 0xfb, 0x3b, 0x27, 0x77, + 0xce, 0xcc, 0x18, 0xba, 0x29, 0x0d, 0x71, 0xd2, 0x7f, 0xa2, 0x6c, 0x11, 0x25, 0xf4, 0xc9, 0x5a, + 0x32, 0xca, 0x29, 0x7a, 0x1b, 0x50, 0x12, 0xe6, 0x01, 0xa7, 0x4c, 0x15, 0x8e, 0x0e, 0x37, 0xb1, + 0x10, 0x47, 0x45, 0x43, 0x57, 0x0d, 0xee, 0x67, 0x8b, 0xa2, 0xf2, 0x71, 0x4e, 0xe9, 0x3c, 0xc1, + 0x7d, 0xb9, 0x9a, 0xe5, 0x51, 0x3f, 0xe3, 0x2c, 0x0f, 0xb8, 0xea, 0x7e, 0xfa, 0xb7, 0x09, 0x7b, + 0xf7, 0x85, 0x0b, 0xfa, 0x03, 0x1a, 0x19, 0xf7, 0x79, 0x9e, 0x19, 0x5a, 0x4f, 0x33, 0x3b, 0x03, + 0xd3, 0x7a, 0xf1, 0xbf, 0x56, 0x89, 0x3e, 0xff, 0xb8, 0x91, 0xbc, 0x53, 0xe8, 0xd0, 0x77, 0xb0, + 0x87, 0x49, 0xe8, 0xf1, 0x38, 0xc5, 0xc6, 0x4e, 0x4f, 0x33, 0x6b, 0xce, 0x2e, 0x26, 0xa1, 0x1b, + 0xa7, 0x18, 0x7d, 0x0f, 0xad, 0x72, 0x5c, 0x2f, 0x0e, 0x8d, 0x5a, 0x4f, 0x33, 0x9b, 0x0e, 0x94, + 0x25, 0x3b, 0x44, 0xc7, 0x80, 0x96, 0x3e, 0xc3, 0x84, 0x7b, 0x55, 0xee, 0x8d, 0xe4, 0x74, 0xd5, + 0xb9, 0x5f, 0xd3, 0xbf, 0xc0, 0xe1, 0x4b, 0x5a, 0x6c, 0x5a, 0x48, 0xea, 0x52, 0xd2, 0xdd, 0x94, + 0xb8, 0x7e, 0xb6, 0xb0, 0x43, 0xf4, 0x05, 0xea, 0x02, 0xcb, 0x8c, 0x46, 0xaf, 0x66, 0xb6, 0x06, + 0xef, 0x5f, 0xed, 0x50, 0x70, 0x8e, 0x62, 0xd0, 0x09, 0xd4, 0x63, 0xb2, 0xcc, 0xb9, 0xb1, 0x27, + 0xe1, 0x1f, 0xb7, 0xc7, 0x61, 0x0b, 0x6c, 0x44, 0x38, 0x5b, 0x39, 0x4a, 0x82, 0x4e, 0xa1, 0x41, + 0x73, 0x2e, 0xc4, 0x4d, 0x29, 0xfe, 0xbc, 0x5d, 0x7c, 0x25, 0x39, 0xa5, 0x2e, 0x44, 0xe8, 0x07, + 0x68, 0xaf, 0xf7, 0xb5, 0x5a, 0x62, 0x03, 0xe4, 0xa6, 0xf6, 0xcb, 0xa2, 0xbb, 0x5a, 0x62, 0x64, + 0xc0, 0xee, 0x23, 0x66, 0x59, 0x4c, 0x89, 0xd1, 0xea, 0x69, 0x66, 0xdd, 0x29, 0x97, 0xe8, 0x33, + 0x74, 0x02, 0xca, 0x18, 0x4e, 0x7c, 0x1e, 0x53, 0x22, 0x42, 0xd9, 0x97, 0xfa, 0x76, 0xa5, 0x6a, + 0x87, 0xe8, 0x67, 0x38, 0x64, 0xd8, 0x63, 0x39, 0xf1, 0x22, 0x46, 0xd3, 0x8d, 0xdc, 0xdb, 0x92, + 0x3f, 0x60, 0xd8, 0xc9, 0xc9, 0x05, 0xa3, 0x69, 0x25, 0xfa, 0x5f, 0x85, 0xca, 0xcf, 0x28, 0xf1, + 0x22, 0xca, 0xbc, 0x98, 0x04, 0x34, 0x5d, 0x26, 0x58, 0x58, 0x1a, 0x1d, 0xa9, 0x7a, 0xaf, 0xda, + 0x17, 0x94, 0xd9, 0x95, 0xa6, 0x18, 0x2a, 0x0b, 0x1e, 0x70, 0xea, 0x7b, 0xe5, 0xd4, 0x6f, 0xe5, + 0xd4, 0x6d, 0x55, 0xbd, 0x2b, 0x66, 0xef, 0x42, 0x1d, 0x3f, 0x62, 0xc2, 0x0d, 0x5d, 0x9a, 0xa9, + 0x05, 0xba, 0x86, 0x8e, 0x3c, 0x5f, 0x4e, 0xbd, 0x90, 0xa6, 0x7e, 0x4c, 0x8c, 0x77, 0x32, 0xd7, + 0x2f, 0xdb, 0x73, 0x15, 0x47, 0xe9, 0xd2, 0xa1, 0xa4, 0x55, 0xba, 0xfb, 0xbc, 0x52, 0x42, 0xa7, + 0xf0, 0x21, 0xf2, 0xe3, 0x04, 0x87, 0x1e, 0xc3, 0x11, 0x66, 0x98, 0x04, 0x58, 0xdd, 0x21, 0xe2, + 0xa7, 0x38, 0x33, 0x50, 0xaf, 0x66, 0x36, 0x1d, 0x43, 0x21, 0x4e, 0x49, 0x08, 0xd3, 0x89, 0xe8, + 0xa3, 0x31, 0x1c, 0x3c, 0x07, 0x16, 0xe2, 0x28, 0x26, 0xb1, 0x8c, 0xe0, 0xa0, 0xa7, 0x99, 0xad, + 0xc1, 0xc7, 0xad, 0x63, 0x0d, 0x71, 0xe4, 0xa0, 0xa7, 0xf5, 0xa2, 0xd0, 0x1d, 0x4d, 0x01, 0xd6, + 0xb7, 0x08, 0xe9, 0x50, 0x5b, 0xe0, 0x95, 0x7c, 0x87, 0x4d, 0x47, 0xfc, 0x44, 0xc7, 0x50, 0x7f, + 0xf4, 0x93, 0x5c, 0xbd, 0xab, 0xd6, 0xe0, 0x5b, 0x4b, 0xbd, 0x6b, 0xab, 0x7c, 0xd7, 0xd6, 0x9d, + 0xe8, 0x3a, 0x0a, 0x3a, 0xd9, 0xf9, 0x4d, 0x3b, 0xba, 0x86, 0x56, 0xe5, 0x6a, 0x7d, 0x15, 0xcb, + 0xdf, 0xe1, 0xdd, 0xab, 0x54, 0xff, 0xc7, 0xb8, 0x5b, 0x35, 0x6e, 0x56, 0x0c, 0x3e, 0x05, 0xd0, + 0xd9, 0xfc, 0x74, 0xa0, 0x16, 0xec, 0x3a, 0xb7, 0x93, 0x89, 0x3d, 0xf9, 0x4b, 0xff, 0x06, 0xb5, + 0xa1, 0xf9, 0xe7, 0xd5, 0x78, 0x7a, 0x39, 0x72, 0x47, 0x43, 0x5d, 0x43, 0x00, 0x8d, 0x8b, 0x33, + 0xfb, 0x72, 0x34, 0xd4, 0x77, 0x44, 0xcb, 0xb5, 0xc7, 0xa3, 0xa1, 0x77, 0x75, 0xeb, 0xea, 0x35, + 0xd4, 0x01, 0x70, 0x47, 0xce, 0xd8, 0x9e, 0x9c, 0x09, 0xf4, 0x8d, 0x40, 0xa7, 0x67, 0xb7, 0x37, + 0xa3, 0xa1, 0x5e, 0x3f, 0xc7, 0xf0, 0x21, 0xa0, 0xa9, 0x45, 0x30, 0x8f, 0x92, 0xf8, 0x9f, 0x97, + 0x27, 0x71, 0x0e, 0xe5, 0x04, 0xd3, 0xd9, 0xdf, 0x27, 0xf3, 0x98, 0x3f, 0xe4, 0x33, 0x2b, 0xa0, + 0x69, 0xbf, 0xe0, 0xfb, 0xcf, 0x7c, 0x3f, 0x48, 0x62, 0x4c, 0x78, 0x7f, 0x4e, 0xe7, 0x6c, 0x19, + 0x54, 0xea, 0xf2, 0x23, 0x3b, 0x6b, 0x48, 0xbb, 0x9f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x1f, + 0xe2, 0x8d, 0x7f, 0xb4, 0x05, 0x00, 0x00, } diff --git a/client/gogrpc/conductor/model/workflowdef.pb.go b/client/gogrpc/conductor/model/workflowdef.pb.go index 1be3a0cac5..ed8cfe2a7e 100644 --- a/client/gogrpc/conductor/model/workflowdef.pb.go +++ b/client/gogrpc/conductor/model/workflowdef.pb.go @@ -20,15 +20,15 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type WorkflowDef struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"` - Version int32 `protobuf:"varint,3,opt,name=version" json:"version,omitempty"` - Tasks []*WorkflowTask `protobuf:"bytes,4,rep,name=tasks" json:"tasks,omitempty"` - InputParameters []string `protobuf:"bytes,5,rep,name=input_parameters,json=inputParameters" json:"input_parameters,omitempty"` - OutputParameters map[string]*_struct.Value `protobuf:"bytes,6,rep,name=output_parameters,json=outputParameters" json:"output_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - FailureWorkflow string `protobuf:"bytes,7,opt,name=failure_workflow,json=failureWorkflow" json:"failure_workflow,omitempty"` - SchemaVersion int32 `protobuf:"varint,8,opt,name=schema_version,json=schemaVersion" json:"schema_version,omitempty"` - Restartable bool `protobuf:"varint,9,opt,name=restartable" json:"restartable,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + Version int32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` + Tasks []*WorkflowTask `protobuf:"bytes,4,rep,name=tasks,proto3" json:"tasks,omitempty"` + InputParameters []string `protobuf:"bytes,5,rep,name=input_parameters,json=inputParameters,proto3" json:"input_parameters,omitempty"` + OutputParameters map[string]*_struct.Value `protobuf:"bytes,6,rep,name=output_parameters,json=outputParameters,proto3" json:"output_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FailureWorkflow string `protobuf:"bytes,7,opt,name=failure_workflow,json=failureWorkflow,proto3" json:"failure_workflow,omitempty"` + SchemaVersion int32 `protobuf:"varint,8,opt,name=schema_version,json=schemaVersion,proto3" json:"schema_version,omitempty"` + Restartable bool `protobuf:"varint,9,opt,name=restartable,proto3" json:"restartable,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/workflowsummary.pb.go b/client/gogrpc/conductor/model/workflowsummary.pb.go index 8d1a794f5c..06837d555e 100644 --- a/client/gogrpc/conductor/model/workflowsummary.pb.go +++ b/client/gogrpc/conductor/model/workflowsummary.pb.go @@ -19,20 +19,20 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type WorkflowSummary struct { - WorkflowType string `protobuf:"bytes,1,opt,name=workflow_type,json=workflowType" json:"workflow_type,omitempty"` - Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"` - WorkflowId string `protobuf:"bytes,3,opt,name=workflow_id,json=workflowId" json:"workflow_id,omitempty"` - CorrelationId string `protobuf:"bytes,4,opt,name=correlation_id,json=correlationId" json:"correlation_id,omitempty"` - StartTime string `protobuf:"bytes,5,opt,name=start_time,json=startTime" json:"start_time,omitempty"` - UpdateTime string `protobuf:"bytes,6,opt,name=update_time,json=updateTime" json:"update_time,omitempty"` - EndTime string `protobuf:"bytes,7,opt,name=end_time,json=endTime" json:"end_time,omitempty"` - Status Workflow_WorkflowStatus `protobuf:"varint,8,opt,name=status,enum=conductor.proto.Workflow_WorkflowStatus" json:"status,omitempty"` - Input string `protobuf:"bytes,9,opt,name=input" json:"input,omitempty"` - Output string `protobuf:"bytes,10,opt,name=output" json:"output,omitempty"` - ReasonForIncompletion string `protobuf:"bytes,11,opt,name=reason_for_incompletion,json=reasonForIncompletion" json:"reason_for_incompletion,omitempty"` - ExecutionTime int64 `protobuf:"varint,12,opt,name=execution_time,json=executionTime" json:"execution_time,omitempty"` - Event string `protobuf:"bytes,13,opt,name=event" json:"event,omitempty"` - FailedReferenceTaskNames string `protobuf:"bytes,14,opt,name=failed_reference_task_names,json=failedReferenceTaskNames" json:"failed_reference_task_names,omitempty"` + WorkflowType string `protobuf:"bytes,1,opt,name=workflow_type,json=workflowType,proto3" json:"workflow_type,omitempty"` + Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` + WorkflowId string `protobuf:"bytes,3,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` + CorrelationId string `protobuf:"bytes,4,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty"` + StartTime string `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + UpdateTime string `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` + EndTime string `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` + Status Workflow_WorkflowStatus `protobuf:"varint,8,opt,name=status,proto3,enum=conductor.proto.Workflow_WorkflowStatus" json:"status,omitempty"` + Input string `protobuf:"bytes,9,opt,name=input,proto3" json:"input,omitempty"` + Output string `protobuf:"bytes,10,opt,name=output,proto3" json:"output,omitempty"` + ReasonForIncompletion string `protobuf:"bytes,11,opt,name=reason_for_incompletion,json=reasonForIncompletion,proto3" json:"reason_for_incompletion,omitempty"` + ExecutionTime int64 `protobuf:"varint,12,opt,name=execution_time,json=executionTime,proto3" json:"execution_time,omitempty"` + Event string `protobuf:"bytes,13,opt,name=event,proto3" json:"event,omitempty"` + FailedReferenceTaskNames string `protobuf:"bytes,14,opt,name=failed_reference_task_names,json=failedReferenceTaskNames,proto3" json:"failed_reference_task_names,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/client/gogrpc/conductor/model/workflowtask.pb.go b/client/gogrpc/conductor/model/workflowtask.pb.go index 9176ece14b..4146afad9c 100644 --- a/client/gogrpc/conductor/model/workflowtask.pb.go +++ b/client/gogrpc/conductor/model/workflowtask.pb.go @@ -19,72 +19,26 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package -type WorkflowTask_Type int32 - -const ( - WorkflowTask_SIMPLE WorkflowTask_Type = 0 - WorkflowTask_DYNAMIC WorkflowTask_Type = 1 - WorkflowTask_FORK_JOIN WorkflowTask_Type = 2 - WorkflowTask_FORK_JOIN_DYNAMIC WorkflowTask_Type = 3 - WorkflowTask_DECISION WorkflowTask_Type = 4 - WorkflowTask_JOIN WorkflowTask_Type = 5 - WorkflowTask_SUB_WORKFLOW WorkflowTask_Type = 6 - WorkflowTask_EVENT WorkflowTask_Type = 7 - WorkflowTask_WAIT WorkflowTask_Type = 8 - WorkflowTask_USER_DEFINED WorkflowTask_Type = 9 -) - -var WorkflowTask_Type_name = map[int32]string{ - 0: "SIMPLE", - 1: "DYNAMIC", - 2: "FORK_JOIN", - 3: "FORK_JOIN_DYNAMIC", - 4: "DECISION", - 5: "JOIN", - 6: "SUB_WORKFLOW", - 7: "EVENT", - 8: "WAIT", - 9: "USER_DEFINED", -} -var WorkflowTask_Type_value = map[string]int32{ - "SIMPLE": 0, - "DYNAMIC": 1, - "FORK_JOIN": 2, - "FORK_JOIN_DYNAMIC": 3, - "DECISION": 4, - "JOIN": 5, - "SUB_WORKFLOW": 6, - "EVENT": 7, - "WAIT": 8, - "USER_DEFINED": 9, -} - -func (x WorkflowTask_Type) String() string { - return proto.EnumName(WorkflowTask_Type_name, int32(x)) -} -func (WorkflowTask_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_workflowtask_9c377873af38ad2e, []int{0, 0} -} - type WorkflowTask struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - TaskReferenceName string `protobuf:"bytes,2,opt,name=task_reference_name,json=taskReferenceName" json:"task_reference_name,omitempty"` - Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"` - InputParameters map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input_parameters,json=inputParameters" json:"input_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Type string `protobuf:"bytes,5,opt,name=type" json:"type,omitempty"` - DynamicTaskNameParam string `protobuf:"bytes,6,opt,name=dynamic_task_name_param,json=dynamicTaskNameParam" json:"dynamic_task_name_param,omitempty"` - CaseValueParam string `protobuf:"bytes,7,opt,name=case_value_param,json=caseValueParam" json:"case_value_param,omitempty"` - CaseExpression string `protobuf:"bytes,8,opt,name=case_expression,json=caseExpression" json:"case_expression,omitempty"` - DecisionCases map[string]*WorkflowTask_WorkflowTaskList `protobuf:"bytes,9,rep,name=decision_cases,json=decisionCases" json:"decision_cases,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - DynamicForkTasksParam string `protobuf:"bytes,10,opt,name=dynamic_fork_tasks_param,json=dynamicForkTasksParam" json:"dynamic_fork_tasks_param,omitempty"` - DynamicForkTasksInputParamName string `protobuf:"bytes,11,opt,name=dynamic_fork_tasks_input_param_name,json=dynamicForkTasksInputParamName" json:"dynamic_fork_tasks_input_param_name,omitempty"` - DefaultCase []*WorkflowTask `protobuf:"bytes,12,rep,name=default_case,json=defaultCase" json:"default_case,omitempty"` - ForkTasks []*WorkflowTask_WorkflowTaskList `protobuf:"bytes,13,rep,name=fork_tasks,json=forkTasks" json:"fork_tasks,omitempty"` - StartDelay int32 `protobuf:"varint,14,opt,name=start_delay,json=startDelay" json:"start_delay,omitempty"` - SubWorkflowParam *SubWorkflowParams `protobuf:"bytes,15,opt,name=sub_workflow_param,json=subWorkflowParam" json:"sub_workflow_param,omitempty"` - JoinOn []string `protobuf:"bytes,16,rep,name=join_on,json=joinOn" json:"join_on,omitempty"` - Sink string `protobuf:"bytes,17,opt,name=sink" json:"sink,omitempty"` - Optional bool `protobuf:"varint,18,opt,name=optional" json:"optional,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + TaskReferenceName string `protobuf:"bytes,2,opt,name=task_reference_name,json=taskReferenceName,proto3" json:"task_reference_name,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + InputParameters map[string]*_struct.Value `protobuf:"bytes,4,rep,name=input_parameters,json=inputParameters,proto3" json:"input_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"` + DynamicTaskNameParam string `protobuf:"bytes,6,opt,name=dynamic_task_name_param,json=dynamicTaskNameParam,proto3" json:"dynamic_task_name_param,omitempty"` + CaseValueParam string `protobuf:"bytes,7,opt,name=case_value_param,json=caseValueParam,proto3" json:"case_value_param,omitempty"` + CaseExpression string `protobuf:"bytes,8,opt,name=case_expression,json=caseExpression,proto3" json:"case_expression,omitempty"` + DecisionCases map[string]*WorkflowTask_WorkflowTaskList `protobuf:"bytes,9,rep,name=decision_cases,json=decisionCases,proto3" json:"decision_cases,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + DynamicForkTasksParam string `protobuf:"bytes,10,opt,name=dynamic_fork_tasks_param,json=dynamicForkTasksParam,proto3" json:"dynamic_fork_tasks_param,omitempty"` + DynamicForkTasksInputParamName string `protobuf:"bytes,11,opt,name=dynamic_fork_tasks_input_param_name,json=dynamicForkTasksInputParamName,proto3" json:"dynamic_fork_tasks_input_param_name,omitempty"` + DefaultCase []*WorkflowTask `protobuf:"bytes,12,rep,name=default_case,json=defaultCase,proto3" json:"default_case,omitempty"` + ForkTasks []*WorkflowTask_WorkflowTaskList `protobuf:"bytes,13,rep,name=fork_tasks,json=forkTasks,proto3" json:"fork_tasks,omitempty"` + StartDelay int32 `protobuf:"varint,14,opt,name=start_delay,json=startDelay,proto3" json:"start_delay,omitempty"` + SubWorkflowParam *SubWorkflowParams `protobuf:"bytes,15,opt,name=sub_workflow_param,json=subWorkflowParam,proto3" json:"sub_workflow_param,omitempty"` + JoinOn []string `protobuf:"bytes,16,rep,name=join_on,json=joinOn,proto3" json:"join_on,omitempty"` + Sink string `protobuf:"bytes,17,opt,name=sink,proto3" json:"sink,omitempty"` + Optional bool `protobuf:"varint,18,opt,name=optional,proto3" json:"optional,omitempty"` + TaskDefinition *TaskDef `protobuf:"bytes,19,opt,name=task_definition,json=taskDefinition,proto3" json:"task_definition,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -94,7 +48,7 @@ func (m *WorkflowTask) Reset() { *m = WorkflowTask{} } func (m *WorkflowTask) String() string { return proto.CompactTextString(m) } func (*WorkflowTask) ProtoMessage() {} func (*WorkflowTask) Descriptor() ([]byte, []int) { - return fileDescriptor_workflowtask_9c377873af38ad2e, []int{0} + return fileDescriptor_workflowtask_db933374415937fc, []int{0} } func (m *WorkflowTask) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowTask.Unmarshal(m, b) @@ -240,8 +194,15 @@ func (m *WorkflowTask) GetOptional() bool { return false } +func (m *WorkflowTask) GetTaskDefinition() *TaskDef { + if m != nil { + return m.TaskDefinition + } + return nil +} + type WorkflowTask_WorkflowTaskList struct { - Tasks []*WorkflowTask `protobuf:"bytes,1,rep,name=tasks" json:"tasks,omitempty"` + Tasks []*WorkflowTask `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -251,7 +212,7 @@ func (m *WorkflowTask_WorkflowTaskList) Reset() { *m = WorkflowTask_Work func (m *WorkflowTask_WorkflowTaskList) String() string { return proto.CompactTextString(m) } func (*WorkflowTask_WorkflowTaskList) ProtoMessage() {} func (*WorkflowTask_WorkflowTaskList) Descriptor() ([]byte, []int) { - return fileDescriptor_workflowtask_9c377873af38ad2e, []int{0, 0} + return fileDescriptor_workflowtask_db933374415937fc, []int{0, 0} } func (m *WorkflowTask_WorkflowTaskList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowTask_WorkflowTaskList.Unmarshal(m, b) @@ -283,62 +244,55 @@ func init() { proto.RegisterMapType((map[string]*WorkflowTask_WorkflowTaskList)(nil), "conductor.proto.WorkflowTask.DecisionCasesEntry") proto.RegisterMapType((map[string]*_struct.Value)(nil), "conductor.proto.WorkflowTask.InputParametersEntry") proto.RegisterType((*WorkflowTask_WorkflowTaskList)(nil), "conductor.proto.WorkflowTask.WorkflowTaskList") - proto.RegisterEnum("conductor.proto.WorkflowTask_Type", WorkflowTask_Type_name, WorkflowTask_Type_value) } func init() { - proto.RegisterFile("model/workflowtask.proto", fileDescriptor_workflowtask_9c377873af38ad2e) -} - -var fileDescriptor_workflowtask_9c377873af38ad2e = []byte{ - // 771 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x6f, 0xda, 0x48, - 0x14, 0x5d, 0x87, 0xef, 0x0b, 0x01, 0x67, 0x36, 0xd9, 0x58, 0xec, 0x66, 0x17, 0x65, 0x1f, 0x96, - 0x87, 0x95, 0xa9, 0x88, 0xaa, 0x56, 0x79, 0x6a, 0x12, 0x4c, 0xe5, 0x26, 0x01, 0x64, 0x48, 0x50, - 0x23, 0x55, 0x96, 0xb1, 0x07, 0xea, 0x62, 0x3c, 0x96, 0x67, 0xdc, 0x84, 0x3f, 0xd2, 0x7f, 0xd5, - 0xff, 0x54, 0xcd, 0xd8, 0x06, 0x42, 0xa2, 0xa8, 0x7d, 0x9b, 0x39, 0xf7, 0x9c, 0x3b, 0xf7, 0xcc, - 0xdc, 0x3b, 0xa0, 0x2c, 0x88, 0x83, 0xbd, 0xd6, 0x3d, 0x09, 0xe7, 0x53, 0x8f, 0xdc, 0x33, 0x8b, - 0xce, 0xd5, 0x20, 0x24, 0x8c, 0xa0, 0x9a, 0x4d, 0x7c, 0x27, 0xb2, 0x19, 0x09, 0x63, 0xa0, 0x7e, - 0x14, 0x53, 0x69, 0x34, 0x49, 0xd9, 0x81, 0x15, 0x5a, 0x0b, 0x9a, 0x84, 0xff, 0x9a, 0x11, 0x32, - 0xf3, 0x70, 0x4b, 0xec, 0x26, 0xd1, 0xb4, 0x45, 0x59, 0x18, 0xd9, 0x2c, 0x8e, 0x1e, 0x7f, 0x07, - 0xa8, 0x8c, 0x13, 0xd9, 0xc8, 0xa2, 0x73, 0x84, 0x20, 0xeb, 0x5b, 0x0b, 0xac, 0x48, 0x0d, 0xa9, - 0x59, 0x32, 0xc4, 0x1a, 0xa9, 0xf0, 0x3b, 0x2f, 0xc0, 0x0c, 0xf1, 0x14, 0x87, 0xd8, 0xb7, 0xb1, - 0x29, 0x28, 0x3b, 0x82, 0xb2, 0xc7, 0x43, 0x46, 0x1a, 0xe9, 0x71, 0x7e, 0x03, 0xca, 0x0e, 0xa6, - 0x76, 0xe8, 0x06, 0xcc, 0x25, 0xbe, 0x92, 0x11, 0xbc, 0x4d, 0x08, 0x7d, 0x02, 0xd9, 0xf5, 0x83, - 0x88, 0x99, 0xa2, 0x54, 0xcc, 0x70, 0x48, 0x95, 0x6c, 0x23, 0xd3, 0x2c, 0xb7, 0xdb, 0xea, 0x96, - 0x3f, 0x75, 0xb3, 0x3c, 0x55, 0xe7, 0xaa, 0xc1, 0x4a, 0xa4, 0xf9, 0x2c, 0x5c, 0x1a, 0x35, 0xf7, - 0x31, 0xca, 0x4d, 0xb0, 0x65, 0x80, 0x95, 0x5c, 0x6c, 0x82, 0xaf, 0xd1, 0x6b, 0x38, 0x74, 0x96, - 0xbe, 0xb5, 0x70, 0x6d, 0x53, 0x98, 0xe1, 0x16, 0xe2, 0xe3, 0x95, 0xbc, 0xa0, 0xed, 0x27, 0x61, - 0x7e, 0x0e, 0xb7, 0x21, 0xf2, 0xa1, 0x26, 0xc8, 0xb6, 0x45, 0xb1, 0xf9, 0xd5, 0xf2, 0xa2, 0x94, - 0x5f, 0x10, 0xfc, 0x2a, 0xc7, 0x6f, 0x39, 0x1c, 0x33, 0xff, 0x83, 0x9a, 0x60, 0xe2, 0x87, 0x20, - 0xc4, 0x94, 0x72, 0xe7, 0xc5, 0x35, 0x51, 0x5b, 0xa1, 0x68, 0x0c, 0x55, 0x07, 0xdb, 0x2e, 0x5f, - 0x9b, 0x3c, 0x44, 0x95, 0x92, 0xb0, 0xfe, 0xea, 0x65, 0xeb, 0x9d, 0x44, 0x73, 0xc1, 0x25, 0xb1, - 0xf1, 0x5d, 0x67, 0x13, 0x43, 0x6f, 0x40, 0x49, 0x2d, 0x4e, 0x49, 0x38, 0x17, 0x3e, 0x69, 0x52, - 0x33, 0x88, 0x52, 0x0e, 0x92, 0x78, 0x97, 0x84, 0x73, 0x9e, 0x94, 0xc6, 0xa5, 0x5f, 0xc2, 0xbf, - 0xcf, 0x08, 0x37, 0x5e, 0x28, 0x7e, 0xf0, 0xb2, 0xc8, 0xf1, 0xf7, 0x76, 0x8e, 0xf5, 0x9b, 0x88, - 0xd7, 0x7f, 0x07, 0x15, 0x07, 0x4f, 0xad, 0xc8, 0x63, 0xc2, 0x9d, 0x52, 0x11, 0xe6, 0x8e, 0x5e, - 0x34, 0xc7, 0xbb, 0x43, 0x48, 0xb8, 0x11, 0x74, 0x0d, 0xb0, 0x2e, 0x43, 0xd9, 0x15, 0x7a, 0xf5, - 0xe5, 0xcb, 0xd9, 0xdc, 0x5c, 0xb9, 0x94, 0x19, 0xa5, 0x69, 0x5a, 0x1e, 0xfa, 0x07, 0xca, 0x94, - 0x59, 0x21, 0x33, 0x1d, 0xec, 0x59, 0x4b, 0xa5, 0xda, 0x90, 0x9a, 0x39, 0x03, 0x04, 0xd4, 0xe1, - 0x08, 0x1a, 0x00, 0xa2, 0xd1, 0xc4, 0x4c, 0xc7, 0x27, 0xb9, 0xb1, 0x5a, 0x43, 0x6a, 0x96, 0xdb, - 0xc7, 0x4f, 0xce, 0x1d, 0x46, 0x93, 0xf4, 0x34, 0x61, 0x9a, 0x1a, 0x32, 0xdd, 0x82, 0xd0, 0x21, - 0x14, 0xbe, 0x10, 0xd7, 0x37, 0x89, 0xaf, 0xc8, 0x8d, 0x4c, 0xb3, 0x64, 0xe4, 0xf9, 0xb6, 0xef, - 0xf3, 0xce, 0xa4, 0xae, 0x3f, 0x57, 0xf6, 0xe2, 0xce, 0xe4, 0x6b, 0x54, 0x87, 0x22, 0x11, 0x63, - 0x61, 0x79, 0x0a, 0x6a, 0x48, 0xcd, 0xa2, 0xb1, 0xda, 0xd7, 0xdf, 0x83, 0xbc, 0x6d, 0x0d, 0x9d, - 0x40, 0x2e, 0xbe, 0x19, 0xe9, 0x67, 0x6e, 0x36, 0xe6, 0xd6, 0xef, 0x60, 0xff, 0xb9, 0xd9, 0x41, - 0x32, 0x64, 0xe6, 0x78, 0x99, 0x8c, 0x3b, 0x5f, 0xa2, 0xff, 0x21, 0x27, 0x9a, 0x5d, 0xcc, 0x77, - 0xb9, 0xfd, 0x87, 0x1a, 0x7f, 0x20, 0x6a, 0xfa, 0x81, 0xa8, 0xa2, 0xe7, 0x8d, 0x98, 0x74, 0xba, - 0xf3, 0x56, 0xaa, 0x07, 0x80, 0x9e, 0x36, 0xe7, 0x33, 0x99, 0x3b, 0x8f, 0x33, 0xff, 0xea, 0x93, - 0xae, 0x4f, 0x3c, 0xfe, 0x26, 0x41, 0x76, 0xc4, 0xa7, 0x1a, 0x20, 0x3f, 0xd4, 0xaf, 0x07, 0x57, - 0x9a, 0xfc, 0x1b, 0x2a, 0x43, 0xa1, 0xf3, 0xb1, 0x77, 0x76, 0xad, 0x5f, 0xc8, 0x12, 0xda, 0x85, - 0x52, 0xb7, 0x6f, 0x5c, 0x9a, 0x1f, 0xfa, 0x7a, 0x4f, 0xde, 0x41, 0x07, 0xb0, 0xb7, 0xda, 0x9a, - 0x29, 0x2b, 0x83, 0x2a, 0x50, 0xec, 0x68, 0x17, 0xfa, 0x50, 0xef, 0xf7, 0xe4, 0x2c, 0x2a, 0x42, - 0x56, 0xd0, 0x73, 0x48, 0x86, 0xca, 0xf0, 0xe6, 0xdc, 0x1c, 0xf7, 0x8d, 0xcb, 0xee, 0x55, 0x7f, - 0x2c, 0xe7, 0x51, 0x09, 0x72, 0xda, 0xad, 0xd6, 0x1b, 0xc9, 0x05, 0x4e, 0x1b, 0x9f, 0xe9, 0x23, - 0xb9, 0xc8, 0x69, 0x37, 0x43, 0xcd, 0x30, 0x3b, 0x5a, 0x57, 0xef, 0x69, 0x1d, 0xb9, 0x74, 0xee, - 0xc2, 0x9f, 0x36, 0x59, 0xa8, 0x3e, 0x66, 0x53, 0xcf, 0x7d, 0xd8, 0x36, 0x78, 0x5e, 0xdd, 0x34, - 0x35, 0x98, 0xdc, 0x9d, 0xce, 0x5c, 0xf6, 0x39, 0x9a, 0xa8, 0x36, 0x59, 0xb4, 0x12, 0x4d, 0x6b, - 0xa5, 0x69, 0xd9, 0x9e, 0x8b, 0x7d, 0xd6, 0x9a, 0x91, 0x59, 0x18, 0xd8, 0x1b, 0xb8, 0xf8, 0xf0, - 0x27, 0x79, 0x91, 0xf2, 0xe4, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x28, 0xc2, 0xb6, 0x19, 0x2b, - 0x06, 0x00, 0x00, + proto.RegisterFile("model/workflowtask.proto", fileDescriptor_workflowtask_db933374415937fc) +} + +var fileDescriptor_workflowtask_db933374415937fc = []byte{ + // 688 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdf, 0x4f, 0x1b, 0x39, + 0x10, 0x56, 0x08, 0x01, 0x32, 0x81, 0x24, 0x18, 0xee, 0xb0, 0x72, 0xc7, 0x5d, 0x44, 0x1f, 0x9a, + 0x87, 0x6a, 0x53, 0x05, 0x55, 0xad, 0x78, 0x6a, 0x69, 0x68, 0x55, 0xf5, 0x17, 0xda, 0x56, 0x45, + 0x42, 0xaa, 0x56, 0x9b, 0x5d, 0x6f, 0xea, 0x66, 0x63, 0xaf, 0x6c, 0x6f, 0x21, 0x7f, 0x79, 0x5f, + 0x2b, 0x8f, 0x77, 0x93, 0x10, 0x10, 0x6a, 0xdf, 0xc6, 0xdf, 0x7c, 0xf3, 0xe3, 0xb3, 0x67, 0x0c, + 0x74, 0x2a, 0x63, 0x96, 0xf6, 0xaf, 0xa4, 0x9a, 0x24, 0xa9, 0xbc, 0x32, 0xa1, 0x9e, 0x78, 0x99, + 0x92, 0x46, 0x92, 0x56, 0x24, 0x45, 0x9c, 0x47, 0x46, 0x2a, 0x07, 0x74, 0xf6, 0x1c, 0xd5, 0x52, + 0x62, 0x96, 0x14, 0xe0, 0xa1, 0x03, 0x75, 0x3e, 0x2a, 0x53, 0x64, 0xa1, 0x0a, 0xa7, 0xba, 0x70, + 0xff, 0x3b, 0x96, 0x72, 0x9c, 0xb2, 0x3e, 0x9e, 0x46, 0x79, 0xd2, 0xd7, 0x46, 0xe5, 0x91, 0x71, + 0xde, 0xa3, 0x9f, 0x75, 0xd8, 0xbe, 0x28, 0xc2, 0x3e, 0x87, 0x7a, 0x42, 0x08, 0xac, 0x8b, 0x70, + 0xca, 0x68, 0xa5, 0x5b, 0xe9, 0xd5, 0x7d, 0xb4, 0x89, 0x07, 0x7b, 0xb6, 0x64, 0xa0, 0x58, 0xc2, + 0x14, 0x13, 0x11, 0x0b, 0x90, 0xb2, 0x86, 0x94, 0x5d, 0xeb, 0xf2, 0x4b, 0xcf, 0x07, 0xcb, 0xef, + 0x42, 0x23, 0x66, 0x3a, 0x52, 0x3c, 0x33, 0x5c, 0x0a, 0x5a, 0x45, 0xde, 0x32, 0x44, 0xbe, 0x42, + 0x9b, 0x8b, 0x2c, 0x37, 0x01, 0xb6, 0xca, 0x0c, 0x53, 0x9a, 0xae, 0x77, 0xab, 0xbd, 0xc6, 0x60, + 0xe0, 0xad, 0x88, 0xf6, 0x96, 0xdb, 0xf3, 0xde, 0xd8, 0xa8, 0xf3, 0x79, 0xd0, 0x99, 0x30, 0x6a, + 0xe6, 0xb7, 0xf8, 0x4d, 0xd4, 0x8a, 0x30, 0xb3, 0x8c, 0xd1, 0x9a, 0x13, 0x61, 0x6d, 0xf2, 0x04, + 0x0e, 0xe2, 0x99, 0x08, 0xa7, 0x3c, 0x0a, 0x50, 0x8c, 0x95, 0xe0, 0xca, 0xd3, 0x0d, 0xa4, 0xed, + 0x17, 0x6e, 0x5b, 0xc7, 0xca, 0xc0, 0x7c, 0xa4, 0x07, 0xed, 0x28, 0xd4, 0x2c, 0xf8, 0x11, 0xa6, + 0x79, 0xc9, 0xdf, 0x44, 0x7e, 0xd3, 0xe2, 0x5f, 0x2c, 0xec, 0x98, 0x0f, 0xa1, 0x85, 0x4c, 0x76, + 0x9d, 0x29, 0xa6, 0xb5, 0x55, 0xbe, 0xb5, 0x20, 0x9e, 0xcd, 0x51, 0x72, 0x01, 0xcd, 0x98, 0x45, + 0xdc, 0xda, 0x81, 0x75, 0x69, 0x5a, 0x47, 0xe9, 0x8f, 0xef, 0x97, 0x3e, 0x2c, 0x62, 0x5e, 0xda, + 0x10, 0x27, 0x7c, 0x27, 0x5e, 0xc6, 0xc8, 0x53, 0xa0, 0xa5, 0xc4, 0x44, 0xaa, 0x09, 0xea, 0xd4, + 0x45, 0xcf, 0x80, 0xad, 0xfc, 0x55, 0xf8, 0x5f, 0x49, 0x35, 0xb1, 0x49, 0xb5, 0x6b, 0xfd, 0x2d, + 0x3c, 0xb8, 0x23, 0x70, 0xe9, 0x85, 0xdc, 0x83, 0x37, 0x30, 0xc7, 0x7f, 0xab, 0x39, 0x16, 0x6f, + 0x82, 0xaf, 0xff, 0x1c, 0xb6, 0x63, 0x96, 0x84, 0x79, 0x6a, 0x50, 0x1d, 0xdd, 0x46, 0x71, 0x87, + 0xf7, 0x8a, 0xb3, 0xd3, 0x81, 0x21, 0x56, 0x08, 0x79, 0x0f, 0xb0, 0x68, 0x83, 0xee, 0x60, 0xbc, + 0x77, 0xff, 0xe5, 0x2c, 0x1f, 0xde, 0x71, 0x6d, 0xfc, 0x7a, 0x52, 0xb6, 0x47, 0xfe, 0x87, 0x86, + 0x36, 0xa1, 0x32, 0x41, 0xcc, 0xd2, 0x70, 0x46, 0x9b, 0xdd, 0x4a, 0xaf, 0xe6, 0x03, 0x42, 0x43, + 0x8b, 0x90, 0x73, 0x20, 0x3a, 0x1f, 0x05, 0xe5, 0xfa, 0x14, 0x37, 0xd6, 0xea, 0x56, 0x7a, 0x8d, + 0xc1, 0xd1, 0xad, 0xba, 0x9f, 0xf2, 0x51, 0x59, 0x0d, 0x45, 0x6b, 0xbf, 0xad, 0x57, 0x20, 0x72, + 0x00, 0x9b, 0xdf, 0x25, 0x17, 0x81, 0x14, 0xb4, 0xdd, 0xad, 0xf6, 0xea, 0xfe, 0x86, 0x3d, 0x7e, + 0x14, 0x76, 0x32, 0x35, 0x17, 0x13, 0xba, 0xeb, 0x26, 0xd3, 0xda, 0xa4, 0x03, 0x5b, 0x12, 0xd7, + 0x22, 0x4c, 0x29, 0xe9, 0x56, 0x7a, 0x5b, 0xfe, 0xfc, 0x4c, 0x5e, 0x40, 0x0b, 0xa7, 0x35, 0x66, + 0x09, 0x17, 0x1c, 0xd7, 0x69, 0x0f, 0xfb, 0xa2, 0xb7, 0xfa, 0xb2, 0x62, 0x87, 0x2c, 0xf1, 0x9b, + 0xc6, 0x19, 0x05, 0xbf, 0xf3, 0x1a, 0xda, 0xab, 0xb7, 0x43, 0x8e, 0xa1, 0xe6, 0x2e, 0xb7, 0xf2, + 0x3b, 0x8f, 0xe3, 0xb8, 0x9d, 0x4b, 0xd8, 0xbf, 0x6b, 0xfd, 0x48, 0x1b, 0xaa, 0x13, 0x36, 0x2b, + 0x7e, 0x0c, 0x6b, 0x92, 0x47, 0x50, 0xc3, 0x7d, 0xc1, 0x2f, 0xa2, 0x31, 0xf8, 0xdb, 0x73, 0x7f, + 0x90, 0x57, 0xfe, 0x41, 0x1e, 0xae, 0x8d, 0xef, 0x48, 0x27, 0x6b, 0xcf, 0x2a, 0x9d, 0x0c, 0xc8, + 0xed, 0xf9, 0xbe, 0x23, 0xf3, 0xf0, 0x66, 0xe6, 0x3f, 0x9d, 0x8a, 0x45, 0xc5, 0x53, 0x0e, 0xff, + 0x44, 0x72, 0xea, 0x09, 0x66, 0x92, 0x94, 0x5f, 0xaf, 0xe6, 0x39, 0x6d, 0x2e, 0xc7, 0x9e, 0x8f, + 0x2e, 0x4f, 0xc6, 0xdc, 0x7c, 0xcb, 0x47, 0x5e, 0x24, 0xa7, 0xfd, 0x22, 0xa6, 0x3f, 0x8f, 0xe9, + 0x47, 0x29, 0x67, 0xc2, 0xf4, 0xc7, 0x72, 0xac, 0xb2, 0x68, 0x09, 0xc7, 0xaf, 0x79, 0xb4, 0x81, + 0x29, 0x8f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xea, 0x4c, 0x04, 0xea, 0x05, 0x00, 0x00, } diff --git a/client/gogrpc/go.mod b/client/gogrpc/go.mod index 0816d05e74..ff2ebf1cfb 100644 --- a/client/gogrpc/go.mod +++ b/client/gogrpc/go.mod @@ -1,14 +1,6 @@ module github.com/netflix/conductor/client/gogrpc require ( - github.com/davecgh/go-spew v1.1.0 - github.com/golang/protobuf v1.1.0 - github.com/pmezard/go-difflib v1.0.0 - github.com/square/goprotowrap v0.0.0-20180504135057-6f414ea4a80c // indirect github.com/stretchr/testify v1.2.1 - golang.org/x/net v0.0.0-20180826012351-8a410e7b638d - golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 // indirect - golang.org/x/text v0.3.0 // indirect - google.golang.org/genproto v0.0.0-20180831171423-11092d34479b // indirect - google.golang.org/grpc v1.14.0 + google.golang.org/grpc v1.15.0 ) From 6915a85451a339b5e7b6be71bf53ce09abc2aae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Fri, 14 Sep 2018 10:08:02 -0700 Subject: [PATCH 14/29] Updated pinned dependencies for gogrpc client --- client/gogrpc/Gopkg.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/client/gogrpc/Gopkg.lock b/client/gogrpc/Gopkg.lock index e86460aad9..870521170f 100644 --- a/client/gogrpc/Gopkg.lock +++ b/client/gogrpc/Gopkg.lock @@ -2,15 +2,15 @@ [[projects]] - digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" + digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" name = "github.com/davecgh/go-spew" packages = ["spew"] pruneopts = "NUT" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" [[projects]] - digest = "1:7a38683af7fc3662a7c85a0795c638c8598cbee808b2246b7f3f16e3f5b302c2" + digest = "1:68496943b027f697647279f48129c75a65cd816a6a95fc6bb7b8b039ea050f1d" name = "github.com/golang/protobuf" packages = [ "jsonpb", @@ -30,8 +30,8 @@ "ptypes/wrappers", ] pruneopts = "NUT" - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" + revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + version = "v1.2.0" [[projects]] digest = "1:406338ad39ab2e37b7f4452906442a3dbf0eb3379dd1f06aafb5c07e769a5fbb" @@ -101,16 +101,16 @@ revision = "6f414ea4a80cc23c26725b193215be2a0d85d6e1" [[projects]] - digest = "1:a852b1ad03ca063d2c57866d9f94dcb1cb2e111415c5902ce0586fc2d207221b" + digest = "1:bacb8b590716ab7c33f2277240972c9582d389593ee8d66fc10074e0508b8126" name = "github.com/stretchr/testify" packages = ["assert"] pruneopts = "NUT" - revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" - version = "v1.2.1" + revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" + version = "v1.2.2" [[projects]] branch = "master" - digest = "1:d0f20c081d47c012952ec7c153e3f3c751aaaf16608fcc5de77dab7ce67470b5" + digest = "1:a2707daa031e6db5fcaae8a9b30eaa503a0d7d8aa72cd50b27fa394ef6c3f7fe" name = "golang.org/x/net" packages = [ "context", @@ -122,7 +122,7 @@ "trace", ] pruneopts = "NUT" - revision = "dfa909b99c79129e1100513e5cd36307665e5723" + revision = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2" [[projects]] branch = "master" @@ -157,14 +157,14 @@ [[projects]] branch = "master" - digest = "1:3b771528df2dc447e06c130b3131e6c4d0e5093b8a2c44868b7f3d45af517efe" + digest = "1:9b295ec121babd2b209d9d52115f839f2ea4f8165977f4e446326b875434ab7b" name = "google.golang.org/genproto" packages = [ "googleapis/rpc/errdetails", "googleapis/rpc/status", ] pruneopts = "NUT" - revision = "694d95ba50e67b2e363f3483057db5d4910c18f9" + revision = "5a2fd4cab2d6d4a18e70c34937662526cd0c4bd1" [[projects]] digest = "1:827de0295c937025afe1896edd20b56aa9be42840818c194cf0eee6ab7d27e43" From 71604a670c6b051fff575c927e4f68f0c72d9476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Fri, 14 Sep 2018 10:36:11 -0700 Subject: [PATCH 15/29] Cleaning up previous files disregarded for current approach - Dockerfile deleted as we will use external image - Updated README.md with instructions to run the go gRPC client generation --- client/gogrpc/.gitignore | 3 +-- client/gogrpc/README.md | 5 ++--- client/gogrpc/docker/Dockerfile | 13 ------------- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 client/gogrpc/docker/Dockerfile diff --git a/client/gogrpc/.gitignore b/client/gogrpc/.gitignore index ae4ffe4983..49ce3c193f 100644 --- a/client/gogrpc/.gitignore +++ b/client/gogrpc/.gitignore @@ -1,2 +1 @@ -/vendor -/generated \ No newline at end of file +/vendor \ No newline at end of file diff --git a/client/gogrpc/README.md b/client/gogrpc/README.md index c20fc75158..e57b61235d 100644 --- a/client/gogrpc/README.md +++ b/client/gogrpc/README.md @@ -2,7 +2,6 @@ At the moment, the generation of the go client is manual. In order to generate the Go gRPC client, run: ``` -make generateClient +make proto ``` -This should create a folder under `/client/gogrpc/generated`. If there are changes on your proto files, -you will probably need to review these changes under `generated` and commit them. \ No newline at end of file +This should update the folder `client/gogrpc/conductor` if any changes. diff --git a/client/gogrpc/docker/Dockerfile b/client/gogrpc/docker/Dockerfile deleted file mode 100644 index 73f52d60e3..0000000000 --- a/client/gogrpc/docker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM golang:1.11-stretch as builder - -RUN apt-get update && apt-get install unzip - -WORKDIR /go/src/github.com/netflix/conductor - -ADD ./client ./client -ADD ./grpc ./grpc - -ENV GO111MODULE on -RUN cd client/gogrpc && make bootstrap proto test - -ENTRYPOINT ["cp", "-r", "client/gogrpc/conductor/grpc", "client/gogrpc/conductor/model", "/generated"] From c68f3357c65dfdd5acaad093e07bdbaeaca56e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20David=20Baena?= Date: Wed, 26 Sep 2018 12:15:37 -0700 Subject: [PATCH 16/29] Generation of gogRPC client after merging all changes from upstream - In case of missing attributes --- .../conductor/grpc/events/event_service.pb.go | 34 +++--- .../grpc/metadata/metadata_service.pb.go | 32 ++--- .../gogrpc/conductor/grpc/search/search.pb.go | 6 +- .../conductor/grpc/tasks/task_service.pb.go | 58 ++++----- .../grpc/workflows/workflow_service.pb.go | 60 +++++----- .../conductor/model/dynamicforkjointask.pb.go | 6 +- .../model/dynamicforkjointasklist.pb.go | 6 +- .../conductor/model/eventexecution.pb.go | 8 +- .../gogrpc/conductor/model/eventhandler.pb.go | 14 +-- client/gogrpc/conductor/model/polldata.pb.go | 6 +- .../model/rerunworkflowrequest.pb.go | 6 +- .../conductor/model/skiptaskrequest.pb.go | 6 +- .../gogrpc/conductor/model/taskexeclog.pb.go | 6 +- .../gogrpc/conductor/model/taskresult.pb.go | 8 +- .../gogrpc/conductor/model/tasksummary.pb.go | 6 +- .../gogrpc/conductor/model/workflowdef.pb.go | 6 +- .../conductor/model/workflowsummary.pb.go | 6 +- .../gogrpc/conductor/model/workflowtask.pb.go | 110 ++++++++++-------- 18 files changed, 197 insertions(+), 187 deletions(-) diff --git a/client/gogrpc/conductor/grpc/events/event_service.pb.go b/client/gogrpc/conductor/grpc/events/event_service.pb.go index 46b19b0231..6972471586 100644 --- a/client/gogrpc/conductor/grpc/events/event_service.pb.go +++ b/client/gogrpc/conductor/grpc/events/event_service.pb.go @@ -35,7 +35,7 @@ func (m *AddEventHandlerRequest) Reset() { *m = AddEventHandlerRequest{} func (m *AddEventHandlerRequest) String() string { return proto.CompactTextString(m) } func (*AddEventHandlerRequest) ProtoMessage() {} func (*AddEventHandlerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{0} + return fileDescriptor_event_service_913a1fde08d4f277, []int{0} } func (m *AddEventHandlerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddEventHandlerRequest.Unmarshal(m, b) @@ -72,7 +72,7 @@ func (m *AddEventHandlerResponse) Reset() { *m = AddEventHandlerResponse func (m *AddEventHandlerResponse) String() string { return proto.CompactTextString(m) } func (*AddEventHandlerResponse) ProtoMessage() {} func (*AddEventHandlerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{1} + return fileDescriptor_event_service_913a1fde08d4f277, []int{1} } func (m *AddEventHandlerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddEventHandlerResponse.Unmarshal(m, b) @@ -103,7 +103,7 @@ func (m *UpdateEventHandlerRequest) Reset() { *m = UpdateEventHandlerReq func (m *UpdateEventHandlerRequest) String() string { return proto.CompactTextString(m) } func (*UpdateEventHandlerRequest) ProtoMessage() {} func (*UpdateEventHandlerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{2} + return fileDescriptor_event_service_913a1fde08d4f277, []int{2} } func (m *UpdateEventHandlerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateEventHandlerRequest.Unmarshal(m, b) @@ -140,7 +140,7 @@ func (m *UpdateEventHandlerResponse) Reset() { *m = UpdateEventHandlerRe func (m *UpdateEventHandlerResponse) String() string { return proto.CompactTextString(m) } func (*UpdateEventHandlerResponse) ProtoMessage() {} func (*UpdateEventHandlerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{3} + return fileDescriptor_event_service_913a1fde08d4f277, []int{3} } func (m *UpdateEventHandlerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateEventHandlerResponse.Unmarshal(m, b) @@ -171,7 +171,7 @@ func (m *RemoveEventHandlerRequest) Reset() { *m = RemoveEventHandlerReq func (m *RemoveEventHandlerRequest) String() string { return proto.CompactTextString(m) } func (*RemoveEventHandlerRequest) ProtoMessage() {} func (*RemoveEventHandlerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{4} + return fileDescriptor_event_service_913a1fde08d4f277, []int{4} } func (m *RemoveEventHandlerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveEventHandlerRequest.Unmarshal(m, b) @@ -208,7 +208,7 @@ func (m *RemoveEventHandlerResponse) Reset() { *m = RemoveEventHandlerRe func (m *RemoveEventHandlerResponse) String() string { return proto.CompactTextString(m) } func (*RemoveEventHandlerResponse) ProtoMessage() {} func (*RemoveEventHandlerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{5} + return fileDescriptor_event_service_913a1fde08d4f277, []int{5} } func (m *RemoveEventHandlerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveEventHandlerResponse.Unmarshal(m, b) @@ -238,7 +238,7 @@ func (m *GetEventHandlersRequest) Reset() { *m = GetEventHandlersRequest func (m *GetEventHandlersRequest) String() string { return proto.CompactTextString(m) } func (*GetEventHandlersRequest) ProtoMessage() {} func (*GetEventHandlersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{6} + return fileDescriptor_event_service_913a1fde08d4f277, []int{6} } func (m *GetEventHandlersRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetEventHandlersRequest.Unmarshal(m, b) @@ -270,7 +270,7 @@ func (m *GetEventHandlersForEventRequest) Reset() { *m = GetEventHandler func (m *GetEventHandlersForEventRequest) String() string { return proto.CompactTextString(m) } func (*GetEventHandlersForEventRequest) ProtoMessage() {} func (*GetEventHandlersForEventRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{7} + return fileDescriptor_event_service_913a1fde08d4f277, []int{7} } func (m *GetEventHandlersForEventRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetEventHandlersForEventRequest.Unmarshal(m, b) @@ -314,7 +314,7 @@ func (m *GetQueuesRequest) Reset() { *m = GetQueuesRequest{} } func (m *GetQueuesRequest) String() string { return proto.CompactTextString(m) } func (*GetQueuesRequest) ProtoMessage() {} func (*GetQueuesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{8} + return fileDescriptor_event_service_913a1fde08d4f277, []int{8} } func (m *GetQueuesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueuesRequest.Unmarshal(m, b) @@ -345,7 +345,7 @@ func (m *GetQueuesResponse) Reset() { *m = GetQueuesResponse{} } func (m *GetQueuesResponse) String() string { return proto.CompactTextString(m) } func (*GetQueuesResponse) ProtoMessage() {} func (*GetQueuesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{9} + return fileDescriptor_event_service_913a1fde08d4f277, []int{9} } func (m *GetQueuesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueuesResponse.Unmarshal(m, b) @@ -382,7 +382,7 @@ func (m *GetQueueSizesRequest) Reset() { *m = GetQueueSizesRequest{} } func (m *GetQueueSizesRequest) String() string { return proto.CompactTextString(m) } func (*GetQueueSizesRequest) ProtoMessage() {} func (*GetQueueSizesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{10} + return fileDescriptor_event_service_913a1fde08d4f277, []int{10} } func (m *GetQueueSizesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueueSizesRequest.Unmarshal(m, b) @@ -413,7 +413,7 @@ func (m *GetQueueSizesResponse) Reset() { *m = GetQueueSizesResponse{} } func (m *GetQueueSizesResponse) String() string { return proto.CompactTextString(m) } func (*GetQueueSizesResponse) ProtoMessage() {} func (*GetQueueSizesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{11} + return fileDescriptor_event_service_913a1fde08d4f277, []int{11} } func (m *GetQueueSizesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueueSizesResponse.Unmarshal(m, b) @@ -451,7 +451,7 @@ func (m *GetQueueSizesResponse_QueueInfo) Reset() { *m = GetQueueSizesRe func (m *GetQueueSizesResponse_QueueInfo) String() string { return proto.CompactTextString(m) } func (*GetQueueSizesResponse_QueueInfo) ProtoMessage() {} func (*GetQueueSizesResponse_QueueInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{11, 0} + return fileDescriptor_event_service_913a1fde08d4f277, []int{11, 0} } func (m *GetQueueSizesResponse_QueueInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueueSizesResponse_QueueInfo.Unmarshal(m, b) @@ -488,7 +488,7 @@ func (m *GetQueueProvidersRequest) Reset() { *m = GetQueueProvidersReque func (m *GetQueueProvidersRequest) String() string { return proto.CompactTextString(m) } func (*GetQueueProvidersRequest) ProtoMessage() {} func (*GetQueueProvidersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{12} + return fileDescriptor_event_service_913a1fde08d4f277, []int{12} } func (m *GetQueueProvidersRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueueProvidersRequest.Unmarshal(m, b) @@ -519,7 +519,7 @@ func (m *GetQueueProvidersResponse) Reset() { *m = GetQueueProvidersResp func (m *GetQueueProvidersResponse) String() string { return proto.CompactTextString(m) } func (*GetQueueProvidersResponse) ProtoMessage() {} func (*GetQueueProvidersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_event_service_30d3c8d74d6840aa, []int{13} + return fileDescriptor_event_service_913a1fde08d4f277, []int{13} } func (m *GetQueueProvidersResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetQueueProvidersResponse.Unmarshal(m, b) @@ -940,10 +940,10 @@ var _EventService_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("grpc/event_service.proto", fileDescriptor_event_service_30d3c8d74d6840aa) + proto.RegisterFile("grpc/event_service.proto", fileDescriptor_event_service_913a1fde08d4f277) } -var fileDescriptor_event_service_30d3c8d74d6840aa = []byte{ +var fileDescriptor_event_service_913a1fde08d4f277 = []byte{ // 687 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5d, 0x6f, 0xd3, 0x3c, 0x18, 0x55, 0xd6, 0xf7, 0x65, 0xf4, 0x29, 0xb0, 0x61, 0xf6, 0x91, 0x5a, 0x43, 0x9b, 0x7a, 0x43, diff --git a/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go b/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go index 0d431bc56b..daf353165f 100644 --- a/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go +++ b/client/gogrpc/conductor/grpc/metadata/metadata_service.pb.go @@ -35,7 +35,7 @@ func (m *CreateWorkflowRequest) Reset() { *m = CreateWorkflowRequest{} } func (m *CreateWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*CreateWorkflowRequest) ProtoMessage() {} func (*CreateWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{0} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{0} } func (m *CreateWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateWorkflowRequest.Unmarshal(m, b) @@ -72,7 +72,7 @@ func (m *CreateWorkflowResponse) Reset() { *m = CreateWorkflowResponse{} func (m *CreateWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*CreateWorkflowResponse) ProtoMessage() {} func (*CreateWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{1} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{1} } func (m *CreateWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateWorkflowResponse.Unmarshal(m, b) @@ -103,7 +103,7 @@ func (m *UpdateWorkflowsRequest) Reset() { *m = UpdateWorkflowsRequest{} func (m *UpdateWorkflowsRequest) String() string { return proto.CompactTextString(m) } func (*UpdateWorkflowsRequest) ProtoMessage() {} func (*UpdateWorkflowsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{2} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{2} } func (m *UpdateWorkflowsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateWorkflowsRequest.Unmarshal(m, b) @@ -140,7 +140,7 @@ func (m *UpdateWorkflowsResponse) Reset() { *m = UpdateWorkflowsResponse func (m *UpdateWorkflowsResponse) String() string { return proto.CompactTextString(m) } func (*UpdateWorkflowsResponse) ProtoMessage() {} func (*UpdateWorkflowsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{3} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{3} } func (m *UpdateWorkflowsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateWorkflowsResponse.Unmarshal(m, b) @@ -172,7 +172,7 @@ func (m *GetWorkflowRequest) Reset() { *m = GetWorkflowRequest{} } func (m *GetWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*GetWorkflowRequest) ProtoMessage() {} func (*GetWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{4} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{4} } func (m *GetWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowRequest.Unmarshal(m, b) @@ -217,7 +217,7 @@ func (m *GetWorkflowResponse) Reset() { *m = GetWorkflowResponse{} } func (m *GetWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*GetWorkflowResponse) ProtoMessage() {} func (*GetWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{5} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{5} } func (m *GetWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowResponse.Unmarshal(m, b) @@ -255,7 +255,7 @@ func (m *CreateTasksRequest) Reset() { *m = CreateTasksRequest{} } func (m *CreateTasksRequest) String() string { return proto.CompactTextString(m) } func (*CreateTasksRequest) ProtoMessage() {} func (*CreateTasksRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{6} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{6} } func (m *CreateTasksRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTasksRequest.Unmarshal(m, b) @@ -292,7 +292,7 @@ func (m *CreateTasksResponse) Reset() { *m = CreateTasksResponse{} } func (m *CreateTasksResponse) String() string { return proto.CompactTextString(m) } func (*CreateTasksResponse) ProtoMessage() {} func (*CreateTasksResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{7} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{7} } func (m *CreateTasksResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTasksResponse.Unmarshal(m, b) @@ -323,7 +323,7 @@ func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } func (m *UpdateTaskRequest) String() string { return proto.CompactTextString(m) } func (*UpdateTaskRequest) ProtoMessage() {} func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{8} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{8} } func (m *UpdateTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateTaskRequest.Unmarshal(m, b) @@ -360,7 +360,7 @@ func (m *UpdateTaskResponse) Reset() { *m = UpdateTaskResponse{} } func (m *UpdateTaskResponse) String() string { return proto.CompactTextString(m) } func (*UpdateTaskResponse) ProtoMessage() {} func (*UpdateTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{9} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{9} } func (m *UpdateTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateTaskResponse.Unmarshal(m, b) @@ -391,7 +391,7 @@ func (m *GetTaskRequest) Reset() { *m = GetTaskRequest{} } func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) } func (*GetTaskRequest) ProtoMessage() {} func (*GetTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{10} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{10} } func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b) @@ -429,7 +429,7 @@ func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} } func (m *GetTaskResponse) String() string { return proto.CompactTextString(m) } func (*GetTaskResponse) ProtoMessage() {} func (*GetTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{11} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{11} } func (m *GetTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTaskResponse.Unmarshal(m, b) @@ -467,7 +467,7 @@ func (m *DeleteTaskRequest) Reset() { *m = DeleteTaskRequest{} } func (m *DeleteTaskRequest) String() string { return proto.CompactTextString(m) } func (*DeleteTaskRequest) ProtoMessage() {} func (*DeleteTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{12} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{12} } func (m *DeleteTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteTaskRequest.Unmarshal(m, b) @@ -504,7 +504,7 @@ func (m *DeleteTaskResponse) Reset() { *m = DeleteTaskResponse{} } func (m *DeleteTaskResponse) String() string { return proto.CompactTextString(m) } func (*DeleteTaskResponse) ProtoMessage() {} func (*DeleteTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metadata_service_aad2a84548370e06, []int{13} + return fileDescriptor_metadata_service_4778cc9d199e5aef, []int{13} } func (m *DeleteTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteTaskResponse.Unmarshal(m, b) @@ -826,10 +826,10 @@ var _MetadataService_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("grpc/metadata_service.proto", fileDescriptor_metadata_service_aad2a84548370e06) + proto.RegisterFile("grpc/metadata_service.proto", fileDescriptor_metadata_service_4778cc9d199e5aef) } -var fileDescriptor_metadata_service_aad2a84548370e06 = []byte{ +var fileDescriptor_metadata_service_4778cc9d199e5aef = []byte{ // 526 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xdf, 0x6b, 0xd3, 0x50, 0x18, 0xa5, 0xba, 0xb9, 0xed, 0x1b, 0xac, 0xf4, 0x76, 0x5b, 0x63, 0xe6, 0x43, 0xc9, 0x8b, 0xc5, diff --git a/client/gogrpc/conductor/grpc/search/search.pb.go b/client/gogrpc/conductor/grpc/search/search.pb.go index cdf1557c30..2a5710156d 100644 --- a/client/gogrpc/conductor/grpc/search/search.pb.go +++ b/client/gogrpc/conductor/grpc/search/search.pb.go @@ -33,7 +33,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_search_a50e745244da0fb1, []int{0} + return fileDescriptor_search_855a611014aa2143, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Request.Unmarshal(m, b) @@ -92,9 +92,9 @@ func init() { proto.RegisterType((*Request)(nil), "conductor.grpc.search.Request") } -func init() { proto.RegisterFile("grpc/search.proto", fileDescriptor_search_a50e745244da0fb1) } +func init() { proto.RegisterFile("grpc/search.proto", fileDescriptor_search_855a611014aa2143) } -var fileDescriptor_search_a50e745244da0fb1 = []byte{ +var fileDescriptor_search_855a611014aa2143 = []byte{ // 212 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xc1, 0x4a, 0xc4, 0x30, 0x10, 0x86, 0xa9, 0x6e, 0x75, 0x37, 0x37, 0x83, 0x42, 0xd0, 0xcb, 0xe2, 0x69, 0x4f, 0xc9, 0xc1, diff --git a/client/gogrpc/conductor/grpc/tasks/task_service.pb.go b/client/gogrpc/conductor/grpc/tasks/task_service.pb.go index f6a6dbc0dd..eabcf3ae1a 100644 --- a/client/gogrpc/conductor/grpc/tasks/task_service.pb.go +++ b/client/gogrpc/conductor/grpc/tasks/task_service.pb.go @@ -37,7 +37,7 @@ func (m *PollRequest) Reset() { *m = PollRequest{} } func (m *PollRequest) String() string { return proto.CompactTextString(m) } func (*PollRequest) ProtoMessage() {} func (*PollRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{0} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{0} } func (m *PollRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PollRequest.Unmarshal(m, b) @@ -89,7 +89,7 @@ func (m *PollResponse) Reset() { *m = PollResponse{} } func (m *PollResponse) String() string { return proto.CompactTextString(m) } func (*PollResponse) ProtoMessage() {} func (*PollResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{1} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{1} } func (m *PollResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PollResponse.Unmarshal(m, b) @@ -131,7 +131,7 @@ func (m *BatchPollRequest) Reset() { *m = BatchPollRequest{} } func (m *BatchPollRequest) String() string { return proto.CompactTextString(m) } func (*BatchPollRequest) ProtoMessage() {} func (*BatchPollRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{2} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{2} } func (m *BatchPollRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BatchPollRequest.Unmarshal(m, b) @@ -199,7 +199,7 @@ func (m *TasksInProgressRequest) Reset() { *m = TasksInProgressRequest{} func (m *TasksInProgressRequest) String() string { return proto.CompactTextString(m) } func (*TasksInProgressRequest) ProtoMessage() {} func (*TasksInProgressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{3} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{3} } func (m *TasksInProgressRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TasksInProgressRequest.Unmarshal(m, b) @@ -251,7 +251,7 @@ func (m *TasksInProgressResponse) Reset() { *m = TasksInProgressResponse func (m *TasksInProgressResponse) String() string { return proto.CompactTextString(m) } func (*TasksInProgressResponse) ProtoMessage() {} func (*TasksInProgressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{4} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{4} } func (m *TasksInProgressResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TasksInProgressResponse.Unmarshal(m, b) @@ -290,7 +290,7 @@ func (m *PendingTaskRequest) Reset() { *m = PendingTaskRequest{} } func (m *PendingTaskRequest) String() string { return proto.CompactTextString(m) } func (*PendingTaskRequest) ProtoMessage() {} func (*PendingTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{5} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{5} } func (m *PendingTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PendingTaskRequest.Unmarshal(m, b) @@ -335,7 +335,7 @@ func (m *PendingTaskResponse) Reset() { *m = PendingTaskResponse{} } func (m *PendingTaskResponse) String() string { return proto.CompactTextString(m) } func (*PendingTaskResponse) ProtoMessage() {} func (*PendingTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{6} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{6} } func (m *PendingTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PendingTaskResponse.Unmarshal(m, b) @@ -373,7 +373,7 @@ func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } func (m *UpdateTaskRequest) String() string { return proto.CompactTextString(m) } func (*UpdateTaskRequest) ProtoMessage() {} func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{7} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{7} } func (m *UpdateTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateTaskRequest.Unmarshal(m, b) @@ -411,7 +411,7 @@ func (m *UpdateTaskResponse) Reset() { *m = UpdateTaskResponse{} } func (m *UpdateTaskResponse) String() string { return proto.CompactTextString(m) } func (*UpdateTaskResponse) ProtoMessage() {} func (*UpdateTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{8} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{8} } func (m *UpdateTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateTaskResponse.Unmarshal(m, b) @@ -450,7 +450,7 @@ func (m *AckTaskRequest) Reset() { *m = AckTaskRequest{} } func (m *AckTaskRequest) String() string { return proto.CompactTextString(m) } func (*AckTaskRequest) ProtoMessage() {} func (*AckTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{9} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{9} } func (m *AckTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AckTaskRequest.Unmarshal(m, b) @@ -495,7 +495,7 @@ func (m *AckTaskResponse) Reset() { *m = AckTaskResponse{} } func (m *AckTaskResponse) String() string { return proto.CompactTextString(m) } func (*AckTaskResponse) ProtoMessage() {} func (*AckTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{10} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{10} } func (m *AckTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AckTaskResponse.Unmarshal(m, b) @@ -534,7 +534,7 @@ func (m *AddLogRequest) Reset() { *m = AddLogRequest{} } func (m *AddLogRequest) String() string { return proto.CompactTextString(m) } func (*AddLogRequest) ProtoMessage() {} func (*AddLogRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{11} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{11} } func (m *AddLogRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddLogRequest.Unmarshal(m, b) @@ -578,7 +578,7 @@ func (m *AddLogResponse) Reset() { *m = AddLogResponse{} } func (m *AddLogResponse) String() string { return proto.CompactTextString(m) } func (*AddLogResponse) ProtoMessage() {} func (*AddLogResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{12} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{12} } func (m *AddLogResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddLogResponse.Unmarshal(m, b) @@ -609,7 +609,7 @@ func (m *GetTaskLogsRequest) Reset() { *m = GetTaskLogsRequest{} } func (m *GetTaskLogsRequest) String() string { return proto.CompactTextString(m) } func (*GetTaskLogsRequest) ProtoMessage() {} func (*GetTaskLogsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{13} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{13} } func (m *GetTaskLogsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTaskLogsRequest.Unmarshal(m, b) @@ -647,7 +647,7 @@ func (m *GetTaskLogsResponse) Reset() { *m = GetTaskLogsResponse{} } func (m *GetTaskLogsResponse) String() string { return proto.CompactTextString(m) } func (*GetTaskLogsResponse) ProtoMessage() {} func (*GetTaskLogsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{14} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{14} } func (m *GetTaskLogsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTaskLogsResponse.Unmarshal(m, b) @@ -685,7 +685,7 @@ func (m *GetTaskRequest) Reset() { *m = GetTaskRequest{} } func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) } func (*GetTaskRequest) ProtoMessage() {} func (*GetTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{15} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{15} } func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b) @@ -723,7 +723,7 @@ func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} } func (m *GetTaskResponse) String() string { return proto.CompactTextString(m) } func (*GetTaskResponse) ProtoMessage() {} func (*GetTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{16} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{16} } func (m *GetTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTaskResponse.Unmarshal(m, b) @@ -762,7 +762,7 @@ func (m *RemoveTaskRequest) Reset() { *m = RemoveTaskRequest{} } func (m *RemoveTaskRequest) String() string { return proto.CompactTextString(m) } func (*RemoveTaskRequest) ProtoMessage() {} func (*RemoveTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{17} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{17} } func (m *RemoveTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveTaskRequest.Unmarshal(m, b) @@ -806,7 +806,7 @@ func (m *RemoveTaskResponse) Reset() { *m = RemoveTaskResponse{} } func (m *RemoveTaskResponse) String() string { return proto.CompactTextString(m) } func (*RemoveTaskResponse) ProtoMessage() {} func (*RemoveTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{18} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{18} } func (m *RemoveTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveTaskResponse.Unmarshal(m, b) @@ -837,7 +837,7 @@ func (m *QueueSizesRequest) Reset() { *m = QueueSizesRequest{} } func (m *QueueSizesRequest) String() string { return proto.CompactTextString(m) } func (*QueueSizesRequest) ProtoMessage() {} func (*QueueSizesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{19} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{19} } func (m *QueueSizesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueSizesRequest.Unmarshal(m, b) @@ -875,7 +875,7 @@ func (m *QueueSizesResponse) Reset() { *m = QueueSizesResponse{} } func (m *QueueSizesResponse) String() string { return proto.CompactTextString(m) } func (*QueueSizesResponse) ProtoMessage() {} func (*QueueSizesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{20} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{20} } func (m *QueueSizesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueSizesResponse.Unmarshal(m, b) @@ -912,7 +912,7 @@ func (m *QueueInfoRequest) Reset() { *m = QueueInfoRequest{} } func (m *QueueInfoRequest) String() string { return proto.CompactTextString(m) } func (*QueueInfoRequest) ProtoMessage() {} func (*QueueInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{21} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{21} } func (m *QueueInfoRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueInfoRequest.Unmarshal(m, b) @@ -943,7 +943,7 @@ func (m *QueueInfoResponse) Reset() { *m = QueueInfoResponse{} } func (m *QueueInfoResponse) String() string { return proto.CompactTextString(m) } func (*QueueInfoResponse) ProtoMessage() {} func (*QueueInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{22} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{22} } func (m *QueueInfoResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueInfoResponse.Unmarshal(m, b) @@ -980,7 +980,7 @@ func (m *QueueAllInfoRequest) Reset() { *m = QueueAllInfoRequest{} } func (m *QueueAllInfoRequest) String() string { return proto.CompactTextString(m) } func (*QueueAllInfoRequest) ProtoMessage() {} func (*QueueAllInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{23} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{23} } func (m *QueueAllInfoRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueAllInfoRequest.Unmarshal(m, b) @@ -1011,7 +1011,7 @@ func (m *QueueAllInfoResponse) Reset() { *m = QueueAllInfoResponse{} } func (m *QueueAllInfoResponse) String() string { return proto.CompactTextString(m) } func (*QueueAllInfoResponse) ProtoMessage() {} func (*QueueAllInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{24} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{24} } func (m *QueueAllInfoResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueAllInfoResponse.Unmarshal(m, b) @@ -1050,7 +1050,7 @@ func (m *QueueAllInfoResponse_ShardInfo) Reset() { *m = QueueAllInfoResp func (m *QueueAllInfoResponse_ShardInfo) String() string { return proto.CompactTextString(m) } func (*QueueAllInfoResponse_ShardInfo) ProtoMessage() {} func (*QueueAllInfoResponse_ShardInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{24, 0} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{24, 0} } func (m *QueueAllInfoResponse_ShardInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueAllInfoResponse_ShardInfo.Unmarshal(m, b) @@ -1095,7 +1095,7 @@ func (m *QueueAllInfoResponse_QueueInfo) Reset() { *m = QueueAllInfoResp func (m *QueueAllInfoResponse_QueueInfo) String() string { return proto.CompactTextString(m) } func (*QueueAllInfoResponse_QueueInfo) ProtoMessage() {} func (*QueueAllInfoResponse_QueueInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_task_service_1133a2fd800ff6c6, []int{24, 1} + return fileDescriptor_task_service_2cd893b942ad08bb, []int{24, 1} } func (m *QueueAllInfoResponse_QueueInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueueAllInfoResponse_QueueInfo.Unmarshal(m, b) @@ -1679,10 +1679,10 @@ var _TaskService_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("grpc/task_service.proto", fileDescriptor_task_service_1133a2fd800ff6c6) + proto.RegisterFile("grpc/task_service.proto", fileDescriptor_task_service_2cd893b942ad08bb) } -var fileDescriptor_task_service_1133a2fd800ff6c6 = []byte{ +var fileDescriptor_task_service_2cd893b942ad08bb = []byte{ // 1114 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x72, 0xdb, 0x54, 0x10, 0x1e, 0xc5, 0x89, 0x53, 0xaf, 0x93, 0xd4, 0x39, 0xf9, 0x33, 0x2a, 0x0c, 0x41, 0x2d, 0x6d, diff --git a/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go b/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go index 51abf61f5c..e73a12be92 100644 --- a/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go +++ b/client/gogrpc/conductor/grpc/workflows/workflow_service.pb.go @@ -36,7 +36,7 @@ func (m *StartWorkflowResponse) Reset() { *m = StartWorkflowResponse{} } func (m *StartWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*StartWorkflowResponse) ProtoMessage() {} func (*StartWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{0} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{0} } func (m *StartWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartWorkflowResponse.Unmarshal(m, b) @@ -77,7 +77,7 @@ func (m *GetWorkflowsRequest) Reset() { *m = GetWorkflowsRequest{} } func (m *GetWorkflowsRequest) String() string { return proto.CompactTextString(m) } func (*GetWorkflowsRequest) ProtoMessage() {} func (*GetWorkflowsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{1} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{1} } func (m *GetWorkflowsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowsRequest.Unmarshal(m, b) @@ -136,7 +136,7 @@ func (m *GetWorkflowsResponse) Reset() { *m = GetWorkflowsResponse{} } func (m *GetWorkflowsResponse) String() string { return proto.CompactTextString(m) } func (*GetWorkflowsResponse) ProtoMessage() {} func (*GetWorkflowsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{2} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{2} } func (m *GetWorkflowsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowsResponse.Unmarshal(m, b) @@ -174,7 +174,7 @@ func (m *GetWorkflowsResponse_Workflows) Reset() { *m = GetWorkflowsResp func (m *GetWorkflowsResponse_Workflows) String() string { return proto.CompactTextString(m) } func (*GetWorkflowsResponse_Workflows) ProtoMessage() {} func (*GetWorkflowsResponse_Workflows) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{2, 0} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{2, 0} } func (m *GetWorkflowsResponse_Workflows) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowsResponse_Workflows.Unmarshal(m, b) @@ -213,7 +213,7 @@ func (m *GetWorkflowStatusRequest) Reset() { *m = GetWorkflowStatusReque func (m *GetWorkflowStatusRequest) String() string { return proto.CompactTextString(m) } func (*GetWorkflowStatusRequest) ProtoMessage() {} func (*GetWorkflowStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{3} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{3} } func (m *GetWorkflowStatusRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowStatusRequest.Unmarshal(m, b) @@ -258,7 +258,7 @@ func (m *GetWorkflowStatusResponse) Reset() { *m = GetWorkflowStatusResp func (m *GetWorkflowStatusResponse) String() string { return proto.CompactTextString(m) } func (*GetWorkflowStatusResponse) ProtoMessage() {} func (*GetWorkflowStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{4} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{4} } func (m *GetWorkflowStatusResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkflowStatusResponse.Unmarshal(m, b) @@ -297,7 +297,7 @@ func (m *RemoveWorkflowRequest) Reset() { *m = RemoveWorkflowRequest{} } func (m *RemoveWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*RemoveWorkflowRequest) ProtoMessage() {} func (*RemoveWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{5} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{5} } func (m *RemoveWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveWorkflowRequest.Unmarshal(m, b) @@ -341,7 +341,7 @@ func (m *RemoveWorkflowResponse) Reset() { *m = RemoveWorkflowResponse{} func (m *RemoveWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*RemoveWorkflowResponse) ProtoMessage() {} func (*RemoveWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{6} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{6} } func (m *RemoveWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveWorkflowResponse.Unmarshal(m, b) @@ -375,7 +375,7 @@ func (m *GetRunningWorkflowsRequest) Reset() { *m = GetRunningWorkflowsR func (m *GetRunningWorkflowsRequest) String() string { return proto.CompactTextString(m) } func (*GetRunningWorkflowsRequest) ProtoMessage() {} func (*GetRunningWorkflowsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{7} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{7} } func (m *GetRunningWorkflowsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRunningWorkflowsRequest.Unmarshal(m, b) @@ -434,7 +434,7 @@ func (m *GetRunningWorkflowsResponse) Reset() { *m = GetRunningWorkflows func (m *GetRunningWorkflowsResponse) String() string { return proto.CompactTextString(m) } func (*GetRunningWorkflowsResponse) ProtoMessage() {} func (*GetRunningWorkflowsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{8} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{8} } func (m *GetRunningWorkflowsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRunningWorkflowsResponse.Unmarshal(m, b) @@ -472,7 +472,7 @@ func (m *DecideWorkflowRequest) Reset() { *m = DecideWorkflowRequest{} } func (m *DecideWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*DecideWorkflowRequest) ProtoMessage() {} func (*DecideWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{9} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{9} } func (m *DecideWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DecideWorkflowRequest.Unmarshal(m, b) @@ -509,7 +509,7 @@ func (m *DecideWorkflowResponse) Reset() { *m = DecideWorkflowResponse{} func (m *DecideWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*DecideWorkflowResponse) ProtoMessage() {} func (*DecideWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{10} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{10} } func (m *DecideWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DecideWorkflowResponse.Unmarshal(m, b) @@ -540,7 +540,7 @@ func (m *PauseWorkflowRequest) Reset() { *m = PauseWorkflowRequest{} } func (m *PauseWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*PauseWorkflowRequest) ProtoMessage() {} func (*PauseWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{11} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{11} } func (m *PauseWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PauseWorkflowRequest.Unmarshal(m, b) @@ -577,7 +577,7 @@ func (m *PauseWorkflowResponse) Reset() { *m = PauseWorkflowResponse{} } func (m *PauseWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*PauseWorkflowResponse) ProtoMessage() {} func (*PauseWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{12} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{12} } func (m *PauseWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PauseWorkflowResponse.Unmarshal(m, b) @@ -608,7 +608,7 @@ func (m *ResumeWorkflowRequest) Reset() { *m = ResumeWorkflowRequest{} } func (m *ResumeWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*ResumeWorkflowRequest) ProtoMessage() {} func (*ResumeWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{13} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{13} } func (m *ResumeWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResumeWorkflowRequest.Unmarshal(m, b) @@ -645,7 +645,7 @@ func (m *ResumeWorkflowResponse) Reset() { *m = ResumeWorkflowResponse{} func (m *ResumeWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*ResumeWorkflowResponse) ProtoMessage() {} func (*ResumeWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{14} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{14} } func (m *ResumeWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResumeWorkflowResponse.Unmarshal(m, b) @@ -678,7 +678,7 @@ func (m *SkipTaskRequest) Reset() { *m = SkipTaskRequest{} } func (m *SkipTaskRequest) String() string { return proto.CompactTextString(m) } func (*SkipTaskRequest) ProtoMessage() {} func (*SkipTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{15} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{15} } func (m *SkipTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SkipTaskRequest.Unmarshal(m, b) @@ -729,7 +729,7 @@ func (m *SkipTaskResponse) Reset() { *m = SkipTaskResponse{} } func (m *SkipTaskResponse) String() string { return proto.CompactTextString(m) } func (*SkipTaskResponse) ProtoMessage() {} func (*SkipTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{16} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{16} } func (m *SkipTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SkipTaskResponse.Unmarshal(m, b) @@ -760,7 +760,7 @@ func (m *RerunWorkflowResponse) Reset() { *m = RerunWorkflowResponse{} } func (m *RerunWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*RerunWorkflowResponse) ProtoMessage() {} func (*RerunWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{17} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{17} } func (m *RerunWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RerunWorkflowResponse.Unmarshal(m, b) @@ -798,7 +798,7 @@ func (m *RestartWorkflowRequest) Reset() { *m = RestartWorkflowRequest{} func (m *RestartWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*RestartWorkflowRequest) ProtoMessage() {} func (*RestartWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{18} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{18} } func (m *RestartWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestartWorkflowRequest.Unmarshal(m, b) @@ -835,7 +835,7 @@ func (m *RestartWorkflowResponse) Reset() { *m = RestartWorkflowResponse func (m *RestartWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*RestartWorkflowResponse) ProtoMessage() {} func (*RestartWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{19} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{19} } func (m *RestartWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestartWorkflowResponse.Unmarshal(m, b) @@ -866,7 +866,7 @@ func (m *RetryWorkflowRequest) Reset() { *m = RetryWorkflowRequest{} } func (m *RetryWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*RetryWorkflowRequest) ProtoMessage() {} func (*RetryWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{20} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{20} } func (m *RetryWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RetryWorkflowRequest.Unmarshal(m, b) @@ -903,7 +903,7 @@ func (m *RetryWorkflowResponse) Reset() { *m = RetryWorkflowResponse{} } func (m *RetryWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*RetryWorkflowResponse) ProtoMessage() {} func (*RetryWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{21} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{21} } func (m *RetryWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RetryWorkflowResponse.Unmarshal(m, b) @@ -934,7 +934,7 @@ func (m *ResetWorkflowCallbacksRequest) Reset() { *m = ResetWorkflowCall func (m *ResetWorkflowCallbacksRequest) String() string { return proto.CompactTextString(m) } func (*ResetWorkflowCallbacksRequest) ProtoMessage() {} func (*ResetWorkflowCallbacksRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{22} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{22} } func (m *ResetWorkflowCallbacksRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResetWorkflowCallbacksRequest.Unmarshal(m, b) @@ -971,7 +971,7 @@ func (m *ResetWorkflowCallbacksResponse) Reset() { *m = ResetWorkflowCal func (m *ResetWorkflowCallbacksResponse) String() string { return proto.CompactTextString(m) } func (*ResetWorkflowCallbacksResponse) ProtoMessage() {} func (*ResetWorkflowCallbacksResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{23} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{23} } func (m *ResetWorkflowCallbacksResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResetWorkflowCallbacksResponse.Unmarshal(m, b) @@ -1003,7 +1003,7 @@ func (m *TerminateWorkflowRequest) Reset() { *m = TerminateWorkflowReque func (m *TerminateWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*TerminateWorkflowRequest) ProtoMessage() {} func (*TerminateWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{24} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{24} } func (m *TerminateWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TerminateWorkflowRequest.Unmarshal(m, b) @@ -1047,7 +1047,7 @@ func (m *TerminateWorkflowResponse) Reset() { *m = TerminateWorkflowResp func (m *TerminateWorkflowResponse) String() string { return proto.CompactTextString(m) } func (*TerminateWorkflowResponse) ProtoMessage() {} func (*TerminateWorkflowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{25} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{25} } func (m *TerminateWorkflowResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TerminateWorkflowResponse.Unmarshal(m, b) @@ -1079,7 +1079,7 @@ func (m *WorkflowSummarySearchResult) Reset() { *m = WorkflowSummarySear func (m *WorkflowSummarySearchResult) String() string { return proto.CompactTextString(m) } func (*WorkflowSummarySearchResult) ProtoMessage() {} func (*WorkflowSummarySearchResult) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_service_ad4bde2e77de2037, []int{26} + return fileDescriptor_workflow_service_fc7b0bf1a282d9fc, []int{26} } func (m *WorkflowSummarySearchResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowSummarySearchResult.Unmarshal(m, b) @@ -1743,10 +1743,10 @@ var _WorkflowService_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("grpc/workflow_service.proto", fileDescriptor_workflow_service_ad4bde2e77de2037) + proto.RegisterFile("grpc/workflow_service.proto", fileDescriptor_workflow_service_fc7b0bf1a282d9fc) } -var fileDescriptor_workflow_service_ad4bde2e77de2037 = []byte{ +var fileDescriptor_workflow_service_fc7b0bf1a282d9fc = []byte{ // 1121 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6e, 0xdb, 0x46, 0x10, 0x86, 0xa4, 0xc4, 0xb6, 0xc6, 0x96, 0x7f, 0x36, 0xb6, 0x43, 0xd3, 0x48, 0xaa, 0xb2, 0x08, diff --git a/client/gogrpc/conductor/model/dynamicforkjointask.pb.go b/client/gogrpc/conductor/model/dynamicforkjointask.pb.go index 8c7110ef78..d47b9b6b61 100644 --- a/client/gogrpc/conductor/model/dynamicforkjointask.pb.go +++ b/client/gogrpc/conductor/model/dynamicforkjointask.pb.go @@ -34,7 +34,7 @@ func (m *DynamicForkJoinTask) Reset() { *m = DynamicForkJoinTask{} } func (m *DynamicForkJoinTask) String() string { return proto.CompactTextString(m) } func (*DynamicForkJoinTask) ProtoMessage() {} func (*DynamicForkJoinTask) Descriptor() ([]byte, []int) { - return fileDescriptor_dynamicforkjointask_300c110eb897c85e, []int{0} + return fileDescriptor_dynamicforkjointask_60f4ea3626679478, []int{0} } func (m *DynamicForkJoinTask) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DynamicForkJoinTask.Unmarshal(m, b) @@ -95,10 +95,10 @@ func init() { } func init() { - proto.RegisterFile("model/dynamicforkjointask.proto", fileDescriptor_dynamicforkjointask_300c110eb897c85e) + proto.RegisterFile("model/dynamicforkjointask.proto", fileDescriptor_dynamicforkjointask_60f4ea3626679478) } -var fileDescriptor_dynamicforkjointask_300c110eb897c85e = []byte{ +var fileDescriptor_dynamicforkjointask_60f4ea3626679478 = []byte{ // 325 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x4f, 0x4b, 0x03, 0x31, 0x10, 0xc5, 0xe9, 0x3f, 0xb1, 0xa9, 0x55, 0x89, 0x28, 0xa5, 0x15, 0x2c, 0x8a, 0xd0, 0x83, 0x24, diff --git a/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go b/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go index c02fc9b0d6..9650213be0 100644 --- a/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go +++ b/client/gogrpc/conductor/model/dynamicforkjointasklist.pb.go @@ -29,7 +29,7 @@ func (m *DynamicForkJoinTaskList) Reset() { *m = DynamicForkJoinTaskList func (m *DynamicForkJoinTaskList) String() string { return proto.CompactTextString(m) } func (*DynamicForkJoinTaskList) ProtoMessage() {} func (*DynamicForkJoinTaskList) Descriptor() ([]byte, []int) { - return fileDescriptor_dynamicforkjointasklist_4634756916e85673, []int{0} + return fileDescriptor_dynamicforkjointasklist_5dc7aa3e0011d25e, []int{0} } func (m *DynamicForkJoinTaskList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DynamicForkJoinTaskList.Unmarshal(m, b) @@ -61,10 +61,10 @@ func init() { } func init() { - proto.RegisterFile("model/dynamicforkjointasklist.proto", fileDescriptor_dynamicforkjointasklist_4634756916e85673) + proto.RegisterFile("model/dynamicforkjointasklist.proto", fileDescriptor_dynamicforkjointasklist_5dc7aa3e0011d25e) } -var fileDescriptor_dynamicforkjointasklist_4634756916e85673 = []byte{ +var fileDescriptor_dynamicforkjointasklist_5dc7aa3e0011d25e = []byte{ // 200 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xce, 0xcd, 0x4f, 0x49, 0xcd, 0xd1, 0x4f, 0xa9, 0xcc, 0x4b, 0xcc, 0xcd, 0x4c, 0x4e, 0xcb, 0x2f, 0xca, 0xce, 0xca, 0xcf, diff --git a/client/gogrpc/conductor/model/eventexecution.pb.go b/client/gogrpc/conductor/model/eventexecution.pb.go index 7c76aa9853..ac1c2a8ca0 100644 --- a/client/gogrpc/conductor/model/eventexecution.pb.go +++ b/client/gogrpc/conductor/model/eventexecution.pb.go @@ -45,7 +45,7 @@ func (x EventExecution_Status) String() string { return proto.EnumName(EventExecution_Status_name, int32(x)) } func (EventExecution_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_eventexecution_461922c614048c4a, []int{0, 0} + return fileDescriptor_eventexecution_680c67ac3fada8e2, []int{0, 0} } type EventExecution struct { @@ -66,7 +66,7 @@ func (m *EventExecution) Reset() { *m = EventExecution{} } func (m *EventExecution) String() string { return proto.CompactTextString(m) } func (*EventExecution) ProtoMessage() {} func (*EventExecution) Descriptor() ([]byte, []int) { - return fileDescriptor_eventexecution_461922c614048c4a, []int{0} + return fileDescriptor_eventexecution_680c67ac3fada8e2, []int{0} } func (m *EventExecution) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EventExecution.Unmarshal(m, b) @@ -149,10 +149,10 @@ func init() { } func init() { - proto.RegisterFile("model/eventexecution.proto", fileDescriptor_eventexecution_461922c614048c4a) + proto.RegisterFile("model/eventexecution.proto", fileDescriptor_eventexecution_680c67ac3fada8e2) } -var fileDescriptor_eventexecution_461922c614048c4a = []byte{ +var fileDescriptor_eventexecution_680c67ac3fada8e2 = []byte{ // 434 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x8b, 0xd3, 0x40, 0x14, 0xc6, 0x4d, 0xb2, 0x4d, 0xed, 0x0b, 0x76, 0xc3, 0x20, 0x32, 0x54, 0x85, 0xb2, 0x07, 0xa9, diff --git a/client/gogrpc/conductor/model/eventhandler.pb.go b/client/gogrpc/conductor/model/eventhandler.pb.go index 6a268b097f..def177112d 100644 --- a/client/gogrpc/conductor/model/eventhandler.pb.go +++ b/client/gogrpc/conductor/model/eventhandler.pb.go @@ -43,7 +43,7 @@ func (x EventHandler_Action_Type) String() string { return proto.EnumName(EventHandler_Action_Type_name, int32(x)) } func (EventHandler_Action_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_eventhandler_9283dbc454fc79ea, []int{0, 2, 0} + return fileDescriptor_eventhandler_d75293086a3c9db8, []int{0, 2, 0} } type EventHandler struct { @@ -61,7 +61,7 @@ func (m *EventHandler) Reset() { *m = EventHandler{} } func (m *EventHandler) String() string { return proto.CompactTextString(m) } func (*EventHandler) ProtoMessage() {} func (*EventHandler) Descriptor() ([]byte, []int) { - return fileDescriptor_eventhandler_9283dbc454fc79ea, []int{0} + return fileDescriptor_eventhandler_d75293086a3c9db8, []int{0} } func (m *EventHandler) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EventHandler.Unmarshal(m, b) @@ -131,7 +131,7 @@ func (m *EventHandler_StartWorkflow) Reset() { *m = EventHandler_StartWo func (m *EventHandler_StartWorkflow) String() string { return proto.CompactTextString(m) } func (*EventHandler_StartWorkflow) ProtoMessage() {} func (*EventHandler_StartWorkflow) Descriptor() ([]byte, []int) { - return fileDescriptor_eventhandler_9283dbc454fc79ea, []int{0, 0} + return fileDescriptor_eventhandler_d75293086a3c9db8, []int{0, 0} } func (m *EventHandler_StartWorkflow) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EventHandler_StartWorkflow.Unmarshal(m, b) @@ -200,7 +200,7 @@ func (m *EventHandler_TaskDetails) Reset() { *m = EventHandler_TaskDetai func (m *EventHandler_TaskDetails) String() string { return proto.CompactTextString(m) } func (*EventHandler_TaskDetails) ProtoMessage() {} func (*EventHandler_TaskDetails) Descriptor() ([]byte, []int) { - return fileDescriptor_eventhandler_9283dbc454fc79ea, []int{0, 1} + return fileDescriptor_eventhandler_d75293086a3c9db8, []int{0, 1} } func (m *EventHandler_TaskDetails) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EventHandler_TaskDetails.Unmarshal(m, b) @@ -263,7 +263,7 @@ func (m *EventHandler_Action) Reset() { *m = EventHandler_Action{} } func (m *EventHandler_Action) String() string { return proto.CompactTextString(m) } func (*EventHandler_Action) ProtoMessage() {} func (*EventHandler_Action) Descriptor() ([]byte, []int) { - return fileDescriptor_eventhandler_9283dbc454fc79ea, []int{0, 2} + return fileDescriptor_eventhandler_d75293086a3c9db8, []int{0, 2} } func (m *EventHandler_Action) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EventHandler_Action.Unmarshal(m, b) @@ -329,10 +329,10 @@ func init() { } func init() { - proto.RegisterFile("model/eventhandler.proto", fileDescriptor_eventhandler_9283dbc454fc79ea) + proto.RegisterFile("model/eventhandler.proto", fileDescriptor_eventhandler_d75293086a3c9db8) } -var fileDescriptor_eventhandler_9283dbc454fc79ea = []byte{ +var fileDescriptor_eventhandler_d75293086a3c9db8 = []byte{ // 665 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x6f, 0x4f, 0xd3, 0x40, 0x18, 0x77, 0x7f, 0x61, 0x4f, 0xe9, 0x9c, 0x17, 0x42, 0xea, 0x24, 0x91, 0x10, 0x4d, 0x30, 0x92, diff --git a/client/gogrpc/conductor/model/polldata.pb.go b/client/gogrpc/conductor/model/polldata.pb.go index 3b569f532b..b2ba7ff6ff 100644 --- a/client/gogrpc/conductor/model/polldata.pb.go +++ b/client/gogrpc/conductor/model/polldata.pb.go @@ -32,7 +32,7 @@ func (m *PollData) Reset() { *m = PollData{} } func (m *PollData) String() string { return proto.CompactTextString(m) } func (*PollData) ProtoMessage() {} func (*PollData) Descriptor() ([]byte, []int) { - return fileDescriptor_polldata_c64f15389955536a, []int{0} + return fileDescriptor_polldata_17cab9e308fb8d52, []int{0} } func (m *PollData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PollData.Unmarshal(m, b) @@ -84,9 +84,9 @@ func init() { proto.RegisterType((*PollData)(nil), "conductor.proto.PollData") } -func init() { proto.RegisterFile("model/polldata.proto", fileDescriptor_polldata_c64f15389955536a) } +func init() { proto.RegisterFile("model/polldata.proto", fileDescriptor_polldata_17cab9e308fb8d52) } -var fileDescriptor_polldata_c64f15389955536a = []byte{ +var fileDescriptor_polldata_17cab9e308fb8d52 = []byte{ // 229 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xc1, 0x4a, 0x03, 0x31, 0x10, 0x86, 0x59, 0x2b, 0xa5, 0x3b, 0x88, 0x42, 0x10, 0x59, 0x28, 0x42, 0x11, 0x0f, 0x3d, 0x6d, diff --git a/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go b/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go index cf04669222..5268688d53 100644 --- a/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go +++ b/client/gogrpc/conductor/model/rerunworkflowrequest.pb.go @@ -34,7 +34,7 @@ func (m *RerunWorkflowRequest) Reset() { *m = RerunWorkflowRequest{} } func (m *RerunWorkflowRequest) String() string { return proto.CompactTextString(m) } func (*RerunWorkflowRequest) ProtoMessage() {} func (*RerunWorkflowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_rerunworkflowrequest_ec6d727a6700f219, []int{0} + return fileDescriptor_rerunworkflowrequest_54d9ae665213e0b8, []int{0} } func (m *RerunWorkflowRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RerunWorkflowRequest.Unmarshal(m, b) @@ -96,10 +96,10 @@ func init() { } func init() { - proto.RegisterFile("model/rerunworkflowrequest.proto", fileDescriptor_rerunworkflowrequest_ec6d727a6700f219) + proto.RegisterFile("model/rerunworkflowrequest.proto", fileDescriptor_rerunworkflowrequest_54d9ae665213e0b8) } -var fileDescriptor_rerunworkflowrequest_ec6d727a6700f219 = []byte{ +var fileDescriptor_rerunworkflowrequest_54d9ae665213e0b8 = []byte{ // 369 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x4f, 0xef, 0xd2, 0x30, 0x18, 0xc7, 0x33, 0xf8, 0x61, 0x42, 0x09, 0x60, 0x8a, 0x41, 0x82, 0x1e, 0x16, 0x13, 0x13, 0x0e, diff --git a/client/gogrpc/conductor/model/skiptaskrequest.pb.go b/client/gogrpc/conductor/model/skiptaskrequest.pb.go index 42cd06bc1d..9d1e094d8e 100644 --- a/client/gogrpc/conductor/model/skiptaskrequest.pb.go +++ b/client/gogrpc/conductor/model/skiptaskrequest.pb.go @@ -34,7 +34,7 @@ func (m *SkipTaskRequest) Reset() { *m = SkipTaskRequest{} } func (m *SkipTaskRequest) String() string { return proto.CompactTextString(m) } func (*SkipTaskRequest) ProtoMessage() {} func (*SkipTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_skiptaskrequest_3fbc52032537d94c, []int{0} + return fileDescriptor_skiptaskrequest_fb745ec89a45d156, []int{0} } func (m *SkipTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SkipTaskRequest.Unmarshal(m, b) @@ -89,10 +89,10 @@ func init() { } func init() { - proto.RegisterFile("model/skiptaskrequest.proto", fileDescriptor_skiptaskrequest_3fbc52032537d94c) + proto.RegisterFile("model/skiptaskrequest.proto", fileDescriptor_skiptaskrequest_fb745ec89a45d156) } -var fileDescriptor_skiptaskrequest_3fbc52032537d94c = []byte{ +var fileDescriptor_skiptaskrequest_fb745ec89a45d156 = []byte{ // 348 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xbd, 0x4e, 0xc3, 0x30, 0x14, 0x85, 0x95, 0x06, 0x90, 0xea, 0x4a, 0xb4, 0x35, 0x08, 0x85, 0x94, 0xa1, 0x62, 0xea, 0x80, diff --git a/client/gogrpc/conductor/model/taskexeclog.pb.go b/client/gogrpc/conductor/model/taskexeclog.pb.go index 6c65dd502e..f8c999074d 100644 --- a/client/gogrpc/conductor/model/taskexeclog.pb.go +++ b/client/gogrpc/conductor/model/taskexeclog.pb.go @@ -31,7 +31,7 @@ func (m *TaskExecLog) Reset() { *m = TaskExecLog{} } func (m *TaskExecLog) String() string { return proto.CompactTextString(m) } func (*TaskExecLog) ProtoMessage() {} func (*TaskExecLog) Descriptor() ([]byte, []int) { - return fileDescriptor_taskexeclog_31ce5708c84ca255, []int{0} + return fileDescriptor_taskexeclog_e9c8274b44d54689, []int{0} } func (m *TaskExecLog) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskExecLog.Unmarshal(m, b) @@ -77,10 +77,10 @@ func init() { } func init() { - proto.RegisterFile("model/taskexeclog.proto", fileDescriptor_taskexeclog_31ce5708c84ca255) + proto.RegisterFile("model/taskexeclog.proto", fileDescriptor_taskexeclog_e9c8274b44d54689) } -var fileDescriptor_taskexeclog_31ce5708c84ca255 = []byte{ +var fileDescriptor_taskexeclog_e9c8274b44d54689 = []byte{ // 205 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x8f, 0x31, 0x4b, 0xc4, 0x40, 0x10, 0x85, 0x89, 0x81, 0x13, 0xf7, 0x14, 0x65, 0x9b, 0x0b, 0xd8, 0x9c, 0x56, 0x57, 0xed, 0x16, diff --git a/client/gogrpc/conductor/model/taskresult.pb.go b/client/gogrpc/conductor/model/taskresult.pb.go index 8e90a79e56..26eb4017f9 100644 --- a/client/gogrpc/conductor/model/taskresult.pb.go +++ b/client/gogrpc/conductor/model/taskresult.pb.go @@ -49,7 +49,7 @@ func (x TaskResult_Status) String() string { return proto.EnumName(TaskResult_Status_name, int32(x)) } func (TaskResult_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_taskresult_50ab9135b69785bc, []int{0, 0} + return fileDescriptor_taskresult_ccaec941f8ac2f31, []int{0, 0} } type TaskResult struct { @@ -70,7 +70,7 @@ func (m *TaskResult) Reset() { *m = TaskResult{} } func (m *TaskResult) String() string { return proto.CompactTextString(m) } func (*TaskResult) ProtoMessage() {} func (*TaskResult) Descriptor() ([]byte, []int) { - return fileDescriptor_taskresult_50ab9135b69785bc, []int{0} + return fileDescriptor_taskresult_ccaec941f8ac2f31, []int{0} } func (m *TaskResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskResult.Unmarshal(m, b) @@ -152,9 +152,9 @@ func init() { proto.RegisterEnum("conductor.proto.TaskResult_Status", TaskResult_Status_name, TaskResult_Status_value) } -func init() { proto.RegisterFile("model/taskresult.proto", fileDescriptor_taskresult_50ab9135b69785bc) } +func init() { proto.RegisterFile("model/taskresult.proto", fileDescriptor_taskresult_ccaec941f8ac2f31) } -var fileDescriptor_taskresult_50ab9135b69785bc = []byte{ +var fileDescriptor_taskresult_ccaec941f8ac2f31 = []byte{ // 517 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xdf, 0x6e, 0xda, 0x30, 0x14, 0xc6, 0x17, 0xa0, 0x69, 0x39, 0xac, 0x05, 0x59, 0x8c, 0x66, 0x74, 0x9a, 0x10, 0x57, 0x48, diff --git a/client/gogrpc/conductor/model/tasksummary.pb.go b/client/gogrpc/conductor/model/tasksummary.pb.go index 94078ec7bf..0127dd8f70 100644 --- a/client/gogrpc/conductor/model/tasksummary.pb.go +++ b/client/gogrpc/conductor/model/tasksummary.pb.go @@ -44,7 +44,7 @@ func (m *TaskSummary) Reset() { *m = TaskSummary{} } func (m *TaskSummary) String() string { return proto.CompactTextString(m) } func (*TaskSummary) ProtoMessage() {} func (*TaskSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_tasksummary_ccb082d5e959585d, []int{0} + return fileDescriptor_tasksummary_ab439d130c50da04, []int{0} } func (m *TaskSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskSummary.Unmarshal(m, b) @@ -181,10 +181,10 @@ func init() { } func init() { - proto.RegisterFile("model/tasksummary.proto", fileDescriptor_tasksummary_ccb082d5e959585d) + proto.RegisterFile("model/tasksummary.proto", fileDescriptor_tasksummary_ab439d130c50da04) } -var fileDescriptor_tasksummary_ccb082d5e959585d = []byte{ +var fileDescriptor_tasksummary_ab439d130c50da04 = []byte{ // 446 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcf, 0x8b, 0x13, 0x31, 0x14, 0xc7, 0xa9, 0xbb, 0xdb, 0x1f, 0xaf, 0x3b, 0xed, 0x32, 0xa8, 0x1d, 0x5d, 0x65, 0xcb, 0x8a, diff --git a/client/gogrpc/conductor/model/workflowdef.pb.go b/client/gogrpc/conductor/model/workflowdef.pb.go index 00cd04c69b..ed8cfe2a7e 100644 --- a/client/gogrpc/conductor/model/workflowdef.pb.go +++ b/client/gogrpc/conductor/model/workflowdef.pb.go @@ -38,7 +38,7 @@ func (m *WorkflowDef) Reset() { *m = WorkflowDef{} } func (m *WorkflowDef) String() string { return proto.CompactTextString(m) } func (*WorkflowDef) ProtoMessage() {} func (*WorkflowDef) Descriptor() ([]byte, []int) { - return fileDescriptor_workflowdef_7fb3769e2566471c, []int{0} + return fileDescriptor_workflowdef_3a04d4bf8b36be23, []int{0} } func (m *WorkflowDef) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowDef.Unmarshal(m, b) @@ -127,10 +127,10 @@ func init() { } func init() { - proto.RegisterFile("model/workflowdef.proto", fileDescriptor_workflowdef_7fb3769e2566471c) + proto.RegisterFile("model/workflowdef.proto", fileDescriptor_workflowdef_3a04d4bf8b36be23) } -var fileDescriptor_workflowdef_7fb3769e2566471c = []byte{ +var fileDescriptor_workflowdef_3a04d4bf8b36be23 = []byte{ // 404 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xdf, 0x6b, 0xd5, 0x30, 0x14, 0xc7, 0xe9, 0xba, 0x6e, 0xbb, 0x29, 0xf3, 0x5e, 0x03, 0x6a, 0x98, 0x0a, 0x45, 0x10, 0x2a, diff --git a/client/gogrpc/conductor/model/workflowsummary.pb.go b/client/gogrpc/conductor/model/workflowsummary.pb.go index 63847d00b8..06837d555e 100644 --- a/client/gogrpc/conductor/model/workflowsummary.pb.go +++ b/client/gogrpc/conductor/model/workflowsummary.pb.go @@ -42,7 +42,7 @@ func (m *WorkflowSummary) Reset() { *m = WorkflowSummary{} } func (m *WorkflowSummary) String() string { return proto.CompactTextString(m) } func (*WorkflowSummary) ProtoMessage() {} func (*WorkflowSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_workflowsummary_4b94875bbd67cbd7, []int{0} + return fileDescriptor_workflowsummary_3f8ed40c0bd9261f, []int{0} } func (m *WorkflowSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowSummary.Unmarshal(m, b) @@ -165,10 +165,10 @@ func init() { } func init() { - proto.RegisterFile("model/workflowsummary.proto", fileDescriptor_workflowsummary_4b94875bbd67cbd7) + proto.RegisterFile("model/workflowsummary.proto", fileDescriptor_workflowsummary_3f8ed40c0bd9261f) } -var fileDescriptor_workflowsummary_4b94875bbd67cbd7 = []byte{ +var fileDescriptor_workflowsummary_3f8ed40c0bd9261f = []byte{ // 428 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x51, 0x8b, 0xd3, 0x40, 0x10, 0xc7, 0x89, 0x77, 0x6d, 0xaf, 0x7b, 0xd7, 0x1e, 0x2e, 0x55, 0x57, 0x8b, 0x58, 0x14, 0x21, diff --git a/client/gogrpc/conductor/model/workflowtask.pb.go b/client/gogrpc/conductor/model/workflowtask.pb.go index 4146afad9c..1e24eb2f4b 100644 --- a/client/gogrpc/conductor/model/workflowtask.pb.go +++ b/client/gogrpc/conductor/model/workflowtask.pb.go @@ -39,6 +39,7 @@ type WorkflowTask struct { Sink string `protobuf:"bytes,17,opt,name=sink,proto3" json:"sink,omitempty"` Optional bool `protobuf:"varint,18,opt,name=optional,proto3" json:"optional,omitempty"` TaskDefinition *TaskDef `protobuf:"bytes,19,opt,name=task_definition,json=taskDefinition,proto3" json:"task_definition,omitempty"` + RateLimited bool `protobuf:"varint,20,opt,name=rate_limited,json=rateLimited,proto3" json:"rate_limited,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -48,7 +49,7 @@ func (m *WorkflowTask) Reset() { *m = WorkflowTask{} } func (m *WorkflowTask) String() string { return proto.CompactTextString(m) } func (*WorkflowTask) ProtoMessage() {} func (*WorkflowTask) Descriptor() ([]byte, []int) { - return fileDescriptor_workflowtask_db933374415937fc, []int{0} + return fileDescriptor_workflowtask_9ea0dc5eed4f592b, []int{0} } func (m *WorkflowTask) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowTask.Unmarshal(m, b) @@ -201,6 +202,13 @@ func (m *WorkflowTask) GetTaskDefinition() *TaskDef { return nil } +func (m *WorkflowTask) GetRateLimited() bool { + if m != nil { + return m.RateLimited + } + return false +} + type WorkflowTask_WorkflowTaskList struct { Tasks []*WorkflowTask `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -212,7 +220,7 @@ func (m *WorkflowTask_WorkflowTaskList) Reset() { *m = WorkflowTask_Work func (m *WorkflowTask_WorkflowTaskList) String() string { return proto.CompactTextString(m) } func (*WorkflowTask_WorkflowTaskList) ProtoMessage() {} func (*WorkflowTask_WorkflowTaskList) Descriptor() ([]byte, []int) { - return fileDescriptor_workflowtask_db933374415937fc, []int{0, 0} + return fileDescriptor_workflowtask_9ea0dc5eed4f592b, []int{0, 0} } func (m *WorkflowTask_WorkflowTaskList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowTask_WorkflowTaskList.Unmarshal(m, b) @@ -247,52 +255,54 @@ func init() { } func init() { - proto.RegisterFile("model/workflowtask.proto", fileDescriptor_workflowtask_db933374415937fc) -} - -var fileDescriptor_workflowtask_db933374415937fc = []byte{ - // 688 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdf, 0x4f, 0x1b, 0x39, - 0x10, 0x56, 0x08, 0x01, 0x32, 0x81, 0x24, 0x18, 0xee, 0xb0, 0x72, 0xc7, 0x5d, 0x44, 0x1f, 0x9a, - 0x87, 0x6a, 0x53, 0x05, 0x55, 0xad, 0x78, 0x6a, 0x69, 0x68, 0x55, 0xf5, 0x17, 0xda, 0x56, 0x45, - 0x42, 0xaa, 0x56, 0x9b, 0x5d, 0x6f, 0xea, 0x66, 0x63, 0xaf, 0x6c, 0x6f, 0x21, 0x7f, 0x79, 0x5f, - 0x2b, 0x8f, 0x77, 0x93, 0x10, 0x10, 0x6a, 0xdf, 0xc6, 0xdf, 0x7c, 0xf3, 0xe3, 0xb3, 0x67, 0x0c, - 0x74, 0x2a, 0x63, 0x96, 0xf6, 0xaf, 0xa4, 0x9a, 0x24, 0xa9, 0xbc, 0x32, 0xa1, 0x9e, 0x78, 0x99, - 0x92, 0x46, 0x92, 0x56, 0x24, 0x45, 0x9c, 0x47, 0x46, 0x2a, 0x07, 0x74, 0xf6, 0x1c, 0xd5, 0x52, - 0x62, 0x96, 0x14, 0xe0, 0xa1, 0x03, 0x75, 0x3e, 0x2a, 0x53, 0x64, 0xa1, 0x0a, 0xa7, 0xba, 0x70, - 0xff, 0x3b, 0x96, 0x72, 0x9c, 0xb2, 0x3e, 0x9e, 0x46, 0x79, 0xd2, 0xd7, 0x46, 0xe5, 0x91, 0x71, - 0xde, 0xa3, 0x9f, 0x75, 0xd8, 0xbe, 0x28, 0xc2, 0x3e, 0x87, 0x7a, 0x42, 0x08, 0xac, 0x8b, 0x70, - 0xca, 0x68, 0xa5, 0x5b, 0xe9, 0xd5, 0x7d, 0xb4, 0x89, 0x07, 0x7b, 0xb6, 0x64, 0xa0, 0x58, 0xc2, - 0x14, 0x13, 0x11, 0x0b, 0x90, 0xb2, 0x86, 0x94, 0x5d, 0xeb, 0xf2, 0x4b, 0xcf, 0x07, 0xcb, 0xef, - 0x42, 0x23, 0x66, 0x3a, 0x52, 0x3c, 0x33, 0x5c, 0x0a, 0x5a, 0x45, 0xde, 0x32, 0x44, 0xbe, 0x42, - 0x9b, 0x8b, 0x2c, 0x37, 0x01, 0xb6, 0xca, 0x0c, 0x53, 0x9a, 0xae, 0x77, 0xab, 0xbd, 0xc6, 0x60, - 0xe0, 0xad, 0x88, 0xf6, 0x96, 0xdb, 0xf3, 0xde, 0xd8, 0xa8, 0xf3, 0x79, 0xd0, 0x99, 0x30, 0x6a, - 0xe6, 0xb7, 0xf8, 0x4d, 0xd4, 0x8a, 0x30, 0xb3, 0x8c, 0xd1, 0x9a, 0x13, 0x61, 0x6d, 0xf2, 0x04, - 0x0e, 0xe2, 0x99, 0x08, 0xa7, 0x3c, 0x0a, 0x50, 0x8c, 0x95, 0xe0, 0xca, 0xd3, 0x0d, 0xa4, 0xed, - 0x17, 0x6e, 0x5b, 0xc7, 0xca, 0xc0, 0x7c, 0xa4, 0x07, 0xed, 0x28, 0xd4, 0x2c, 0xf8, 0x11, 0xa6, - 0x79, 0xc9, 0xdf, 0x44, 0x7e, 0xd3, 0xe2, 0x5f, 0x2c, 0xec, 0x98, 0x0f, 0xa1, 0x85, 0x4c, 0x76, - 0x9d, 0x29, 0xa6, 0xb5, 0x55, 0xbe, 0xb5, 0x20, 0x9e, 0xcd, 0x51, 0x72, 0x01, 0xcd, 0x98, 0x45, - 0xdc, 0xda, 0x81, 0x75, 0x69, 0x5a, 0x47, 0xe9, 0x8f, 0xef, 0x97, 0x3e, 0x2c, 0x62, 0x5e, 0xda, - 0x10, 0x27, 0x7c, 0x27, 0x5e, 0xc6, 0xc8, 0x53, 0xa0, 0xa5, 0xc4, 0x44, 0xaa, 0x09, 0xea, 0xd4, - 0x45, 0xcf, 0x80, 0xad, 0xfc, 0x55, 0xf8, 0x5f, 0x49, 0x35, 0xb1, 0x49, 0xb5, 0x6b, 0xfd, 0x2d, - 0x3c, 0xb8, 0x23, 0x70, 0xe9, 0x85, 0xdc, 0x83, 0x37, 0x30, 0xc7, 0x7f, 0xab, 0x39, 0x16, 0x6f, - 0x82, 0xaf, 0xff, 0x1c, 0xb6, 0x63, 0x96, 0x84, 0x79, 0x6a, 0x50, 0x1d, 0xdd, 0x46, 0x71, 0x87, - 0xf7, 0x8a, 0xb3, 0xd3, 0x81, 0x21, 0x56, 0x08, 0x79, 0x0f, 0xb0, 0x68, 0x83, 0xee, 0x60, 0xbc, - 0x77, 0xff, 0xe5, 0x2c, 0x1f, 0xde, 0x71, 0x6d, 0xfc, 0x7a, 0x52, 0xb6, 0x47, 0xfe, 0x87, 0x86, - 0x36, 0xa1, 0x32, 0x41, 0xcc, 0xd2, 0x70, 0x46, 0x9b, 0xdd, 0x4a, 0xaf, 0xe6, 0x03, 0x42, 0x43, - 0x8b, 0x90, 0x73, 0x20, 0x3a, 0x1f, 0x05, 0xe5, 0xfa, 0x14, 0x37, 0xd6, 0xea, 0x56, 0x7a, 0x8d, - 0xc1, 0xd1, 0xad, 0xba, 0x9f, 0xf2, 0x51, 0x59, 0x0d, 0x45, 0x6b, 0xbf, 0xad, 0x57, 0x20, 0x72, - 0x00, 0x9b, 0xdf, 0x25, 0x17, 0x81, 0x14, 0xb4, 0xdd, 0xad, 0xf6, 0xea, 0xfe, 0x86, 0x3d, 0x7e, - 0x14, 0x76, 0x32, 0x35, 0x17, 0x13, 0xba, 0xeb, 0x26, 0xd3, 0xda, 0xa4, 0x03, 0x5b, 0x12, 0xd7, - 0x22, 0x4c, 0x29, 0xe9, 0x56, 0x7a, 0x5b, 0xfe, 0xfc, 0x4c, 0x5e, 0x40, 0x0b, 0xa7, 0x35, 0x66, - 0x09, 0x17, 0x1c, 0xd7, 0x69, 0x0f, 0xfb, 0xa2, 0xb7, 0xfa, 0xb2, 0x62, 0x87, 0x2c, 0xf1, 0x9b, - 0xc6, 0x19, 0x05, 0xbf, 0xf3, 0x1a, 0xda, 0xab, 0xb7, 0x43, 0x8e, 0xa1, 0xe6, 0x2e, 0xb7, 0xf2, - 0x3b, 0x8f, 0xe3, 0xb8, 0x9d, 0x4b, 0xd8, 0xbf, 0x6b, 0xfd, 0x48, 0x1b, 0xaa, 0x13, 0x36, 0x2b, - 0x7e, 0x0c, 0x6b, 0x92, 0x47, 0x50, 0xc3, 0x7d, 0xc1, 0x2f, 0xa2, 0x31, 0xf8, 0xdb, 0x73, 0x7f, - 0x90, 0x57, 0xfe, 0x41, 0x1e, 0xae, 0x8d, 0xef, 0x48, 0x27, 0x6b, 0xcf, 0x2a, 0x9d, 0x0c, 0xc8, - 0xed, 0xf9, 0xbe, 0x23, 0xf3, 0xf0, 0x66, 0xe6, 0x3f, 0x9d, 0x8a, 0x45, 0xc5, 0x53, 0x0e, 0xff, - 0x44, 0x72, 0xea, 0x09, 0x66, 0x92, 0x94, 0x5f, 0xaf, 0xe6, 0x39, 0x6d, 0x2e, 0xc7, 0x9e, 0x8f, - 0x2e, 0x4f, 0xc6, 0xdc, 0x7c, 0xcb, 0x47, 0x5e, 0x24, 0xa7, 0xfd, 0x22, 0xa6, 0x3f, 0x8f, 0xe9, - 0x47, 0x29, 0x67, 0xc2, 0xf4, 0xc7, 0x72, 0xac, 0xb2, 0x68, 0x09, 0xc7, 0xaf, 0x79, 0xb4, 0x81, - 0x29, 0x8f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xea, 0x4c, 0x04, 0xea, 0x05, 0x00, 0x00, + proto.RegisterFile("model/workflowtask.proto", fileDescriptor_workflowtask_9ea0dc5eed4f592b) +} + +var fileDescriptor_workflowtask_9ea0dc5eed4f592b = []byte{ + // 708 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x51, 0x6f, 0xd3, 0x3a, + 0x14, 0x56, 0xd7, 0x75, 0x5b, 0x4f, 0xbb, 0xb6, 0xf3, 0x76, 0xef, 0xac, 0xde, 0xbb, 0x7b, 0xcb, + 0x78, 0xa0, 0x0f, 0x28, 0x45, 0x9d, 0x10, 0x68, 0x4f, 0x30, 0x3a, 0x10, 0x62, 0xc0, 0x14, 0x10, + 0x93, 0x26, 0xa1, 0x28, 0x4d, 0x9c, 0x62, 0x9a, 0xc6, 0x91, 0xed, 0xb0, 0xf5, 0xaf, 0xf0, 0x6b, + 0x91, 0x8f, 0x93, 0x36, 0xeb, 0xa6, 0x09, 0xde, 0xec, 0xef, 0x7c, 0xdf, 0x39, 0xe7, 0xb3, 0x7d, + 0x0c, 0x74, 0x26, 0x42, 0x16, 0x0f, 0xae, 0x84, 0x9c, 0x46, 0xb1, 0xb8, 0xd2, 0xbe, 0x9a, 0x3a, + 0xa9, 0x14, 0x5a, 0x90, 0x76, 0x20, 0x92, 0x30, 0x0b, 0xb4, 0x90, 0x16, 0xe8, 0xee, 0x5a, 0xaa, + 0xa1, 0x84, 0x2c, 0xca, 0xc1, 0x03, 0x0b, 0xaa, 0x6c, 0x5c, 0xa4, 0x48, 0x7d, 0xe9, 0xcf, 0x54, + 0x1e, 0xfe, 0x77, 0x22, 0xc4, 0x24, 0x66, 0x03, 0xdc, 0x8d, 0xb3, 0x68, 0xa0, 0xb4, 0xcc, 0x02, + 0x6d, 0xa3, 0x87, 0x3f, 0x01, 0x9a, 0x17, 0xb9, 0xec, 0xb3, 0xaf, 0xa6, 0x84, 0xc0, 0x7a, 0xe2, + 0xcf, 0x18, 0xad, 0xf4, 0x2a, 0xfd, 0xba, 0x8b, 0x6b, 0xe2, 0xc0, 0xae, 0x29, 0xe9, 0x49, 0x16, + 0x31, 0xc9, 0x92, 0x80, 0x79, 0x48, 0x59, 0x43, 0xca, 0x8e, 0x09, 0xb9, 0x45, 0xe4, 0x83, 0xe1, + 0xf7, 0xa0, 0x11, 0x32, 0x15, 0x48, 0x9e, 0x6a, 0x2e, 0x12, 0x5a, 0x45, 0x5e, 0x19, 0x22, 0x5f, + 0xa1, 0xc3, 0x93, 0x34, 0xd3, 0x1e, 0xb6, 0xca, 0x34, 0x93, 0x8a, 0xae, 0xf7, 0xaa, 0xfd, 0xc6, + 0x70, 0xe8, 0xac, 0x98, 0x76, 0xca, 0xed, 0x39, 0x6f, 0x8d, 0xea, 0x7c, 0x21, 0x3a, 0x4d, 0xb4, + 0x9c, 0xbb, 0x6d, 0x7e, 0x13, 0x35, 0x26, 0xf4, 0x3c, 0x65, 0xb4, 0x66, 0x4d, 0x98, 0x35, 0x79, + 0x0a, 0xfb, 0xe1, 0x3c, 0xf1, 0x67, 0x3c, 0xf0, 0xd0, 0x8c, 0xb1, 0x60, 0xcb, 0xd3, 0x0d, 0xa4, + 0xed, 0xe5, 0x61, 0x53, 0xc7, 0xd8, 0xc0, 0x7c, 0xa4, 0x0f, 0x9d, 0xc0, 0x57, 0xcc, 0xfb, 0xe1, + 0xc7, 0x59, 0xc1, 0xdf, 0x44, 0x7e, 0xcb, 0xe0, 0x5f, 0x0c, 0x6c, 0x99, 0x8f, 0xa0, 0x8d, 0x4c, + 0x76, 0x9d, 0x4a, 0xa6, 0x94, 0x71, 0xbe, 0xb5, 0x24, 0x9e, 0x2e, 0x50, 0x72, 0x01, 0xad, 0x90, + 0x05, 0xdc, 0xac, 0x3d, 0x13, 0x52, 0xb4, 0x8e, 0xd6, 0x9f, 0xdc, 0x6f, 0x7d, 0x94, 0x6b, 0x5e, + 0x19, 0x89, 0x35, 0xbe, 0x1d, 0x96, 0x31, 0xf2, 0x0c, 0x68, 0x61, 0x31, 0x12, 0x72, 0x8a, 0x3e, + 0x55, 0xde, 0x33, 0x60, 0x2b, 0x7f, 0xe5, 0xf1, 0xd7, 0x42, 0x4e, 0x4d, 0x52, 0x65, 0x5b, 0x7f, + 0x07, 0x0f, 0xef, 0x10, 0x96, 0x6e, 0xc8, 0x5e, 0x78, 0x03, 0x73, 0xfc, 0xb7, 0x9a, 0x63, 0x79, + 0x27, 0x78, 0xfb, 0x2f, 0xa0, 0x19, 0xb2, 0xc8, 0xcf, 0x62, 0x8d, 0xee, 0x68, 0x13, 0xcd, 0x1d, + 0xdc, 0x6b, 0xce, 0xbc, 0x0e, 0x94, 0x18, 0x23, 0xe4, 0x3d, 0xc0, 0xb2, 0x0d, 0xba, 0x8d, 0x7a, + 0xe7, 0xfe, 0xc3, 0x29, 0x6f, 0xce, 0xb8, 0xd2, 0x6e, 0x3d, 0x2a, 0xda, 0x23, 0xff, 0x43, 0x43, + 0x69, 0x5f, 0x6a, 0x2f, 0x64, 0xb1, 0x3f, 0xa7, 0xad, 0x5e, 0xa5, 0x5f, 0x73, 0x01, 0xa1, 0x91, + 0x41, 0xc8, 0x39, 0x10, 0x95, 0x8d, 0xbd, 0x62, 0x7c, 0xf2, 0x13, 0x6b, 0xf7, 0x2a, 0xfd, 0xc6, + 0xf0, 0xf0, 0x56, 0xdd, 0x4f, 0xd9, 0xb8, 0xa8, 0x86, 0xa6, 0x95, 0xdb, 0x51, 0x2b, 0x10, 0xd9, + 0x87, 0xcd, 0xef, 0x82, 0x27, 0x9e, 0x48, 0x68, 0xa7, 0x57, 0xed, 0xd7, 0xdd, 0x0d, 0xb3, 0xfd, + 0x98, 0x98, 0x97, 0xa9, 0x78, 0x32, 0xa5, 0x3b, 0xf6, 0x65, 0x9a, 0x35, 0xe9, 0xc2, 0x96, 0xc0, + 0xb1, 0xf0, 0x63, 0x4a, 0x7a, 0x95, 0xfe, 0x96, 0xbb, 0xd8, 0x93, 0x97, 0xd0, 0xc6, 0xd7, 0x1a, + 0xb2, 0x88, 0x27, 0x1c, 0xc7, 0x69, 0x17, 0xfb, 0xa2, 0xb7, 0xfa, 0x32, 0x66, 0x47, 0x2c, 0x72, + 0x5b, 0xda, 0x2e, 0x72, 0x3e, 0x79, 0x00, 0x4d, 0xe9, 0x6b, 0xe6, 0xc5, 0x7c, 0xc6, 0x35, 0x0b, + 0xe9, 0x1e, 0x96, 0x68, 0x18, 0xec, 0xcc, 0x42, 0xdd, 0x37, 0xd0, 0x59, 0x3d, 0x40, 0x72, 0x04, + 0x35, 0x7b, 0xfe, 0x95, 0xdf, 0xb9, 0x3f, 0xcb, 0xed, 0x5e, 0xc2, 0xde, 0x5d, 0x13, 0x4a, 0x3a, + 0x50, 0x9d, 0xb2, 0x79, 0xfe, 0xa9, 0x98, 0x25, 0x79, 0x0c, 0x35, 0x1c, 0x29, 0xfc, 0x45, 0x1a, + 0xc3, 0xbf, 0x1d, 0xfb, 0x4d, 0x39, 0xc5, 0x37, 0xe5, 0xe0, 0x64, 0xb9, 0x96, 0x74, 0xbc, 0xf6, + 0xbc, 0xd2, 0x4d, 0x81, 0xdc, 0x1e, 0x81, 0x3b, 0x32, 0x8f, 0x6e, 0x66, 0xfe, 0xd3, 0x87, 0xb3, + 0xac, 0x78, 0xc2, 0xe1, 0x9f, 0x40, 0xcc, 0x9c, 0x84, 0xe9, 0x28, 0xe6, 0xd7, 0xab, 0x79, 0x4e, + 0x5a, 0x65, 0xed, 0xf9, 0xf8, 0xf2, 0x78, 0xc2, 0xf5, 0xb7, 0x6c, 0xec, 0x04, 0x62, 0x36, 0xc8, + 0x35, 0x83, 0x85, 0x66, 0x10, 0xc4, 0x9c, 0x25, 0x7a, 0x30, 0x11, 0x13, 0x99, 0x06, 0x25, 0x1c, + 0x7f, 0xef, 0xf1, 0x06, 0xa6, 0x3c, 0xfa, 0x15, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x25, 0x52, 0x75, + 0x0d, 0x06, 0x00, 0x00, } From c092545ddecf5586ed1bb5fa989b1841ebf9aa13 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Mon, 1 Oct 2018 09:40:50 -0700 Subject: [PATCH 17/29] adding jacoco test coverage and Coveralls integration --- .travis.yml | 4 ++++ README.md | 5 +++++ build.gradle | 22 +++++++++++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b46c5d8d6a..167c2e7346 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ language: java jdk: - oraclejdk8 + +after_success: + - mvn jacoco:report coveralls:report + install: true script: "./buildViaTravis.sh" git: diff --git a/README.md b/README.md index f9e81fe6c1..2c133ce04a 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,11 @@ To build the server, use the following dependencies in your classpath: * conductor-es2-persistence _or_ conductor-es5-persistence (_unless using your own index module_) * conductor-contribs (_optional_) +##Test coverage +To measure test coverage use the following command: `gradle test jacocoTestReport` +Results will be published to [Coveralls](https://coveralls.io/github/Netflix/conductor) + + ### Deploying Jersey JAX-RS resources Add the following packages to classpath scan: diff --git a/build.gradle b/build.gradle index b1c170cf60..88ae7112cc 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { repositories { jcenter() } - + dependencies { classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3' classpath 'org.apache.ant:ant:1.9.7' @@ -24,8 +24,9 @@ subprojects { apply plugin: 'nebula.netflixoss' apply plugin: 'nebula.provided-base' - apply plugin: 'java' apply plugin: 'idea' + apply plugin: 'jacoco' + apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'project-report' @@ -42,18 +43,29 @@ subprojects { } group = "com.netflix.${githubProjectName}" - + tasks.withType(Test) { maxParallelForks = 100 } - + license { excludes(['**/*.txt', '**/*.conf', '**/*.properties', '**/*.json', '**/swagger-ui/*']) } - + task licenseFormatTests (type:nl.javadude.gradle.plugins.license.License) { source = fileTree(dir: "src/test").include("**/*") } licenseFormat.dependsOn licenseFormatTests + + jacocoTestReport { + additionalSourceDirs = files(sourceSets.main.allSource.srcDirs) + sourceDirectories = files(sourceSets.main.allSource.srcDirs) + classDirectories = files(sourceSets.main.output) + reports { + html.enabled = true + xml.enabled = true + csv.enabled = false + } + } } From cbae1ec67fd945ffb547a027cb5d80e7a9f95157 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Mon, 1 Oct 2018 10:27:28 -0700 Subject: [PATCH 18/29] improve coveralls integration --- .travis.yml | 2 +- README.md | 4 ++-- build.gradle | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 167c2e7346..cb19709c05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: - oraclejdk8 after_success: - - mvn jacoco:report coveralls:report +- ./gradlew cobertura coveralls install: true script: "./buildViaTravis.sh" diff --git a/README.md b/README.md index 2c133ce04a..6f8fc13e43 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ To build the server, use the following dependencies in your classpath: * conductor-contribs (_optional_) ##Test coverage -To measure test coverage use the following command: `gradle test jacocoTestReport` -Results will be published to [Coveralls](https://coveralls.io/github/Netflix/conductor) +To measure test coverage locally use the following command: `gradle test jacocoTestReport` +For Travis builds results will be published to [Coveralls](https://coveralls.io/github/Netflix/conductor) ### Deploying Jersey JAX-RS resources diff --git a/build.gradle b/build.gradle index 88ae7112cc..9051047057 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ buildscript { } plugins { id 'nebula.netflixoss' version '5.1.1' + id 'com.github.kt3k.coveralls' version '2.8.2' } // Establish version and status From a8030877a7de9c5dd3b293decd4054ec3a057921 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Mon, 1 Oct 2018 11:38:56 -0700 Subject: [PATCH 19/29] adding badge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f8fc13e43..a313a630e8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ ![Conductor](docs/docs/img/conductor-vector-x.png) + ## Conductor Conductor is an _orchestration_ engine that runs in the cloud. [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) - +[![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=master)](https://coveralls.io/github/Netflix/conductor?branch=master) ## Documentation & Getting Started From 3a3b866ee196ad2d348f488aaada38590c382fc7 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Mon, 1 Oct 2018 13:07:01 -0700 Subject: [PATCH 20/29] fixes and refactoring, changing branch name to the current one(tmp) --- .codecov.yml | 3 +++ .travis.yml | 3 +-- README.md | 2 +- build.gradle | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 .codecov.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 0000000000..ba23740b14 --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,3 @@ +codecov: + branch: feature/add_tests_coverage-AL + # strict_yaml_branch: master # Enable this if we want to use the yml file in master to dictate the reports for all branches \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index cb19709c05..42a494c299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ jdk: - oraclejdk8 after_success: -- ./gradlew cobertura coveralls - + - bash <(curl -s https://codecov.io/bash) install: true script: "./buildViaTravis.sh" git: diff --git a/README.md b/README.md index a313a630e8..82b9477708 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Conductor is an _orchestration_ engine that runs in the cloud. [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) -[![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=master)](https://coveralls.io/github/Netflix/conductor?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=feature/add_tests_coverage-AL)](https://coveralls.io/github/Netflix/conductor?branch=feature/add_tests_coverage-AL) ## Documentation & Getting Started diff --git a/build.gradle b/build.gradle index 9051047057..fe4d9eafa7 100644 --- a/build.gradle +++ b/build.gradle @@ -70,3 +70,56 @@ subprojects { } } } + + + +/********************************** + * Coverage Tasks + **********************************/ +task codeCoverageReport(type: JacocoReport, group: "Coverage reports") { + executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") + + dependsOn subprojects*.test + + subprojects.each { + sourceSets it.sourceSets.main + } + + reports { + xml.enabled = true + xml.destination new File("${buildDir}/reports/jacoco/report.xml") + html.enabled = true + html.destination new File("${buildDir}/reports/jacoco/html") + csv.enabled = false + } + afterEvaluate { + // Exclude generated files from top-level coverage report + classDirectories = files( + classDirectories.files.collect { + fileTree( + dir: it, + exclude: [ + "**/com/netflix/genie/proto/**", + "**/com/netflix/genie/web/jpa/entities/*_*", + ] + ) + } + ) + } +} + +coveralls { + sourceDirs = subprojects.sourceSets.main.allSource.srcDirs.flatten() + jacocoReportPath = "${project.buildDir}/reports/jacoco/report.xml" +} + +tasks.coveralls { + group = "Coverage reports" + description = "Uploads the aggregated coverage report to Coveralls" + + dependsOn codeCoverageReport + onlyIf { + System.env."CI" + } +} + From 19ee5be64fa39f2c500da07729acffd9d83d555f Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Mon, 1 Oct 2018 14:16:33 -0700 Subject: [PATCH 21/29] fixes and refactoring, changing branch name to the current one(tmp) --- build.gradle | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index fe4d9eafa7..09e1e3f863 100644 --- a/build.gradle +++ b/build.gradle @@ -59,10 +59,17 @@ subprojects { licenseFormat.dependsOn licenseFormatTests + + tasks.withType(Test) { + task -> + // set heap size for the test JVM(s) + minHeapSize = "256m" + maxHeapSize = "2g" + + jacocoTestReport.executionData += files("$buildDir/jacoco/${task.name}.exec") + } + jacocoTestReport { - additionalSourceDirs = files(sourceSets.main.allSource.srcDirs) - sourceDirectories = files(sourceSets.main.allSource.srcDirs) - classDirectories = files(sourceSets.main.output) reports { html.enabled = true xml.enabled = true From 4fbb77061b842c065aa65bbeb62b8e6ee9a56774 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Mon, 1 Oct 2018 18:19:35 -0700 Subject: [PATCH 22/29] remove obsolete code, modify travis sh file to run an additional codeCoverageReport task --- build.gradle | 9 +-------- buildViaTravis.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 09e1e3f863..f32a08853d 100644 --- a/build.gradle +++ b/build.gradle @@ -104,11 +104,7 @@ task codeCoverageReport(type: JacocoReport, group: "Coverage reports") { classDirectories = files( classDirectories.files.collect { fileTree( - dir: it, - exclude: [ - "**/com/netflix/genie/proto/**", - "**/com/netflix/genie/web/jpa/entities/*_*", - ] + dir: it ) } ) @@ -125,8 +121,5 @@ tasks.coveralls { description = "Uploads the aggregated coverage report to Coveralls" dependsOn codeCoverageReport - onlyIf { - System.env."CI" - } } diff --git a/buildViaTravis.sh b/buildViaTravis.sh index 9cc169e471..4f2c588be9 100755 --- a/buildViaTravis.sh +++ b/buildViaTravis.sh @@ -2,21 +2,22 @@ # This script will build the project. if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]" - ./gradlew build + ./gradlew build codeCoverageReport coveralls elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' - ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot --info --stacktrace + ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot codeCoverageReport coveralls --info --stacktrace elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']' case "$TRAVIS_TAG" in *-rc\.*) - ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate --info --stacktrace + ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate codeCoverageReport coveralls --info --stacktrace ;; *) - ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final --info --stacktrace + ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final codeCoverageReport coveralls --info --stacktrace ;; esac else echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']' - ./gradlew build + ./gradlew build codeCoverageReport coveralls fi + From dd65e475051a5ee76f6f7bcde425f398e2928c31 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Tue, 2 Oct 2018 10:06:08 -0700 Subject: [PATCH 23/29] restructure modules in main gradle file to excluded non-java projects --- build.gradle | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index f32a08853d..ada07ac287 100644 --- a/build.gradle +++ b/build.gradle @@ -20,24 +20,29 @@ ext.githubProjectName = rootProject.name // Change if github project name is not apply plugin: 'project-report' apply from: "$rootDir/versionsOfDependencies.gradle" +allprojects { + apply plugin: 'idea' + apply plugin: 'jacoco' + apply plugin: 'eclipse' -subprojects { + repositories { + jcenter() + } +} + +def javaProjects = subprojects.findAll { + it.name != "ui" +} +configure(javaProjects) { apply plugin: 'nebula.netflixoss' apply plugin: 'nebula.provided-base' - apply plugin: 'idea' - apply plugin: 'jacoco' apply plugin: 'java' - apply plugin: 'eclipse' apply plugin: 'project-report' sourceCompatibility = 1.8 targetCompatibility = 1.8 - repositories { - jcenter() - } - dependencies { testCompile "junit:junit-dep:${revJUnit}" testCompile "org.mockito:mockito-all:${revMockito}" @@ -85,8 +90,7 @@ subprojects { **********************************/ task codeCoverageReport(type: JacocoReport, group: "Coverage reports") { executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") - - dependsOn subprojects*.test + //dependsOn subprojects*.test subprojects.each { sourceSets it.sourceSets.main @@ -119,7 +123,6 @@ coveralls { tasks.coveralls { group = "Coverage reports" description = "Uploads the aggregated coverage report to Coveralls" - dependsOn codeCoverageReport } From ffbc610384d53b25f47e0efcd1a72bb69d5aed0a Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Tue, 2 Oct 2018 10:46:41 -0700 Subject: [PATCH 24/29] improve readme, add code coverage, travis link, license link etc --- README.md | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 82b9477708..a3c0e0c3db 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,22 @@ ## Conductor Conductor is an _orchestration_ engine that runs in the cloud. -[![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) -[![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=feature/add_tests_coverage-AL)](https://coveralls.io/github/Netflix/conductor?branch=feature/add_tests_coverage-AL) +[![Download](https://api.bintray.com/packages/netflixoss/maven/conductor/images/download.svg)](https://bintray.com/netflixoss/maven/genie/_latestVersion) +[![License](https://img.shields.io/github/license/Netflix/conductor.svg)](http://www.apache.org/licenses/LICENSE-2.0) +[![Issues](https://img.shields.io/github/issues/Netflix/conductor.svg)](https://github.com/Netflix/conductor/issues) +[![NetflixOSS Lifecycle](https://img.shields.io/osslifecycle/Netflix/conductor.svg)]() + +## Builds +Conductor builds are run on Travis CI [here](https://travis-ci.org/Netflix/conductor). + +| Branch | Build | Coverage (coveralls.io) | Coverage (codecov.io) | +|:------:|:-------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------:| +| master | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=master)](https://coveralls.io/github/Netflix/conductor?branch=master) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/master) | +| 2.0.x | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=2.0)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=2.0.x)](https://coveralls.io/github/Netflix/conductor?branch=2.0.x) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/2.0.x) | +| 1.12.x | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=1.12.x)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=1.12.x)](https://coveralls.io/github/Netflix/conductor?branch=1.12.x) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/1.12.x) | + ## Documentation & Getting Started [http://netflix.github.io/conductor/](http://netflix.github.io/conductor/) @@ -42,10 +54,6 @@ To build the server, use the following dependencies in your classpath: * conductor-es2-persistence _or_ conductor-es5-persistence (_unless using your own index module_) * conductor-contribs (_optional_) -##Test coverage -To measure test coverage locally use the following command: `gradle test jacocoTestReport` -For Travis builds results will be published to [Coveralls](https://coveralls.io/github/Netflix/conductor) - ### Deploying Jersey JAX-RS resources Add the following packages to classpath scan: @@ -73,18 +81,3 @@ com.netflix.conductor.dao.RedisWorkflowModule ## Get Support Conductor is maintained by Media Workflow Infrastructure team at Netflix. Use github issue tracking for any support request. -## LICENSE - -Copyright (c) 2018 Netflix, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. From 27caeeb1a5bc658c6313a8dae67a10ec01ca009a Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Tue, 2 Oct 2018 10:52:16 -0700 Subject: [PATCH 25/29] minor tweak --- .codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.codecov.yml b/.codecov.yml index ba23740b14..8061bcac5e 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,3 @@ codecov: - branch: feature/add_tests_coverage-AL + branch: master # strict_yaml_branch: master # Enable this if we want to use the yml file in master to dictate the reports for all branches \ No newline at end of file From d612fc0ae38f910b2549202205db8b2acd7a3850 Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Tue, 2 Oct 2018 11:41:23 -0700 Subject: [PATCH 26/29] fix minor typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3c0e0c3db..7e4d6b459c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Conductor is an _orchestration_ engine that runs in the cloud. -[![Download](https://api.bintray.com/packages/netflixoss/maven/conductor/images/download.svg)](https://bintray.com/netflixoss/maven/genie/_latestVersion) +[![Download](https://api.bintray.com/packages/netflixoss/maven/conductor/images/download.svg)](https://bintray.com/netflixoss/maven/conductor/_latestVersion) [![License](https://img.shields.io/github/license/Netflix/conductor.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Issues](https://img.shields.io/github/issues/Netflix/conductor.svg)](https://github.com/Netflix/conductor/issues) [![NetflixOSS Lifecycle](https://img.shields.io/osslifecycle/Netflix/conductor.svg)]() From 6ad38694206dc7f93e5a51124c6202fc6f6f2fcf Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Tue, 2 Oct 2018 11:46:08 -0700 Subject: [PATCH 27/29] re-enable tests for the coverage reports task --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ada07ac287..4f5620d725 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ configure(javaProjects) { **********************************/ task codeCoverageReport(type: JacocoReport, group: "Coverage reports") { executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") - //dependsOn subprojects*.test + dependsOn subprojects*.test subprojects.each { sourceSets it.sourceSets.main From 91fcc2557508f1e3a4d591231bb28e22f327ef6f Mon Sep 17 00:00:00 2001 From: Alex Lich Date: Thu, 4 Oct 2018 14:50:56 -0700 Subject: [PATCH 28/29] measure coverage every time dev is built, not master only display test coverage for dev and master branches for now --- .codecov.yml | 2 +- README.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 8061bcac5e..9d85a301aa 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,3 @@ codecov: - branch: master + branch: dev # strict_yaml_branch: master # Enable this if we want to use the yml file in master to dictate the reports for all branches \ No newline at end of file diff --git a/README.md b/README.md index 7e4d6b459c..a17599a503 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ Conductor builds are run on Travis CI [here](https://travis-ci.org/Netflix/condu | Branch | Build | Coverage (coveralls.io) | Coverage (codecov.io) | |:------:|:-------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------:| | master | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=master)](https://coveralls.io/github/Netflix/conductor?branch=master) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/master) | -| 2.0.x | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=2.0)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=2.0.x)](https://coveralls.io/github/Netflix/conductor?branch=2.0.x) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/2.0.x) | -| 1.12.x | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=1.12.x)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=1.12.x)](https://coveralls.io/github/Netflix/conductor?branch=1.12.x) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/1.12.x) | +| dev | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=dev)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=dev)](https://coveralls.io/github/Netflix/conductor?branch=dev) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/dev) | ## Documentation & Getting Started [http://netflix.github.io/conductor/](http://netflix.github.io/conductor/) From 04e5c475523cf3cd604b82bd9087b2f0df3f3984 Mon Sep 17 00:00:00 2001 From: Alex <40185028+alexnetflix@users.noreply.github.com> Date: Thu, 4 Oct 2018 15:05:33 -0700 Subject: [PATCH 29/29] Update README.md cosmetic fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a17599a503..0360141898 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Conductor builds are run on Travis CI [here](https://travis-ci.org/Netflix/condu | Branch | Build | Coverage (coveralls.io) | Coverage (codecov.io) | |:------:|:-------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------:| | master | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=master)](https://coveralls.io/github/Netflix/conductor?branch=master) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/master) | -| dev | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=dev)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=dev)](https://coveralls.io/github/Netflix/conductor?branch=dev) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/dev) | +| dev | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=dev)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=dev)](https://coveralls.io/github/Netflix/conductor?branch=dev) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/dev/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/dev) | ## Documentation & Getting Started [http://netflix.github.io/conductor/](http://netflix.github.io/conductor/)