remove logrus and add new interfaces for worker

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17 as build
+FROM golang:1.19 as build
 RUN mkdir /package
 COPY /sdk /package/sdk
 COPY /go.mod /package/go.mod

examples/go.mod

@@ -13,13 +13,13 @@ require (
 	github.com/antihax/optional v1.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	golang.org/x/sys v0.6.0 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )

go.mod

@@ -1,30 +1,32 @@
 module github.com/conductor-sdk/conductor-go
 
-go 1.17
+go 1.18
 
 require (
 	github.com/antihax/optional v1.0.0
 	github.com/google/uuid v1.3.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/prometheus/client_golang v1.12.1
-	github.com/sirupsen/logrus v1.8.1
+	github.com/prometheus/client_golang v0.9.2
+	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.1
-	go.uber.org/zap v1.24.0
+	go.uber.org/zap v1.27.0
 )
 
 require (
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )

sdk/authentication/token_helper.go

@@ -27,9 +27,9 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/conductor-sdk/conductor-go/sdk/log"
 	"github.com/conductor-sdk/conductor-go/sdk/model"
 	"github.com/conductor-sdk/conductor-go/sdk/settings"
-	log "github.com/sirupsen/logrus"
 )
 
 var (

sdk/authentication/token_manager.go

@@ -13,9 +13,9 @@ import (
 	"net/http"
 	"sync"
 
+	"github.com/conductor-sdk/conductor-go/sdk/log"
 	"github.com/conductor-sdk/conductor-go/sdk/settings"
 	"github.com/patrickmn/go-cache"
-	log "github.com/sirupsen/logrus"
 )
 
 const (

sdk/client/api_application_resource.go

@@ -32,10 +32,7 @@ func (a *ApplicationResourceApiService) AddRoleToApplicationUser(ctx context.Con
 	var result interface{}
 	path := fmt.Sprintf("/applications/%s/roles/%s", applicationId, role)
 	resp, err := a.Post(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 /*
@@ -52,7 +49,7 @@ func (a *ApplicationResourceApiService) CreateAccessKey(ctx context.Context, id
 		return nil, resp, err
 	}
 
-	return &result, resp, nil
+	return &result, resp, err
 }
 
 /*
@@ -69,7 +66,7 @@ func (a *ApplicationResourceApiService) CreateApplication(ctx context.Context, b
 		return nil, resp, err
 	}
 
-	return &result, resp, nil
+	return &result, resp, err
 }
 
 /*
@@ -82,11 +79,7 @@ ApplicationResourceApiService Delete an access key
 func (a *ApplicationResourceApiService) DeleteAccessKey(ctx context.Context, applicationId string, keyId string) (*http.Response, error) {
 	path := fmt.Sprintf("/applications/%s/accessKeys/%s", applicationId, keyId)
 	resp, err := a.Delete(ctx, path, nil, nil)
-	if err != nil {
-		return resp, err
-	}
-
-	return resp, nil
+	return resp, err
 }
 
 /*
@@ -99,10 +92,7 @@ func (a *ApplicationResourceApiService) DeleteApplication(ctx context.Context, i
 	var result interface{}
 	path := fmt.Sprintf("/applications/%s", id)
 	resp, err := a.Delete(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 /*
@@ -114,32 +104,23 @@ ApplicationResourceApiService Delete a tag for application
 func (a *ApplicationResourceApiService) DeleteTagForApplication(ctx context.Context, body []model.Tag, id string) (*http.Response, error) {
 	path := fmt.Sprintf("/applications/%s/tags", id)
 	resp, err := a.DeleteWithBody(ctx, path, body, nil)
-	if err != nil {
-		return resp, err
-	}
-	return resp, nil
+	return resp, err
 }
 
 // GetAccessKeys gets all access keys for an application
 func (a *ApplicationResourceApiService) GetAccessKeys(ctx context.Context, id string) ([]rbac.AccessKeyResponse, *http.Response, error) {
 	var result []rbac.AccessKeyResponse
 	path := fmt.Sprintf("/applications/%s/accessKeys", id)
 	resp, err := a.Get(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 // GetAppByAccessKeyId gets an application by access key ID
 func (a *ApplicationResourceApiService) GetAppByAccessKeyId(ctx context.Context, accessKeyId string) (interface{}, *http.Response, error) {
 	var result interface{}
 	path := fmt.Sprintf("/applications/key/%s", accessKeyId)
 	resp, err := a.Get(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 // GetApplication gets an application by ID
@@ -159,52 +140,37 @@ func (a *ApplicationResourceApiService) GetTagsForApplication(ctx context.Contex
 	var result []model.Tag
 	path := fmt.Sprintf("/applications/%s/tags", id)
 	resp, err := a.Get(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 // ListApplications lists all applications
 func (a *ApplicationResourceApiService) ListApplications(ctx context.Context) ([]rbac.ConductorApplication, *http.Response, error) {
 	var result []rbac.ConductorApplication
 	resp, err := a.Get(ctx, "/applications", nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 // PutTagForApplication adds tags to an application
 func (a *ApplicationResourceApiService) PutTagForApplication(ctx context.Context, body []model.Tag, id string) (*http.Response, error) {
 	path := fmt.Sprintf("/applications/%s/tags", id)
 	resp, err := a.Put(ctx, path, body, nil)
-	if err != nil {
-		return resp, err
-	}
-	return resp, nil
+	return resp, err
 }
 
 // RemoveRoleFromApplicationUser removes a role from an application user
 func (a *ApplicationResourceApiService) RemoveRoleFromApplicationUser(ctx context.Context, applicationId string, role string) (interface{}, *http.Response, error) {
 	var result interface{}
 	path := fmt.Sprintf("/applications/%s/roles/%s", applicationId, role)
 	resp, err := a.Delete(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 // ToggleAccessKeyStatus toggles the status of an access key
 func (a *ApplicationResourceApiService) ToggleAccessKeyStatus(ctx context.Context, applicationId string, keyId string) (interface{}, *http.Response, error) {
 	var result interface{}
 	path := fmt.Sprintf("/applications/%s/accessKeys/%s/status", applicationId, keyId)
 	resp, err := a.Post(ctx, path, nil, &result)
-	if err != nil {
-		return nil, resp, err
-	}
-	return result, resp, nil
+	return result, resp, err
 }
 
 // UpdateApplication updates an application
@@ -217,5 +183,5 @@ func (a *ApplicationResourceApiService) UpdateApplication(ctx context.Context, b
 		return nil, resp, err
 	}
 
-	return &result, resp, nil
+	return &result, resp, err
 }

sdk/client/api_client.go

@@ -76,7 +76,7 @@ func NewAuthenticationSettingsFromEnv() *settings.AuthenticationSettings {
 func NewHttpSettingsFromEnv() *settings.HttpSettings {
 	url := os.Getenv(CONDUCTOR_SERVER_URL)
 	if url == "" {
-		log.Fatalf("Error: %s env variable is not set", CONDUCTOR_SERVER_URL)
+		log.Error("Error: %s env variable is not set", CONDUCTOR_SERVER_URL)
 	}
 
 	return settings.NewHttpSettings(url)

sdk/client/api_task_resource.go

@@ -74,28 +74,28 @@ TaskResourceApiService Batch poll for a task of a certain type
  * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
  * @param tasktype
  * @param optional nil or *TaskResourceApiBatchPollOpts - Optional Parameters:
-     * @param "Workerid" (optional.String) -
+     * @param "WorkerId" (optional.String) -
      * @param "Domain" (optional.String) -
      * @param "Count" (optional.Int32) -
      * @param "Timeout" (optional.Int32) -
 @return []Task
 */
 
 type TaskResourceApiBatchPollOpts struct {
-	Workerid optional.String
+	WorkerId optional.String
 	Domain   optional.String
 	Count    optional.Int32
 	Timeout  optional.Int32
 }
 
-func (a *TaskResourceApiService) BatchPoll(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiBatchPollOpts) ([]model.Task, *http.Response, error) {
-	var result []model.Task
+func (a *TaskResourceApiService) BatchPollTask(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiBatchPollOpts) ([]model.PolledTask, *http.Response, error) {
+	var result []model.PolledTask
 
 	path := fmt.Sprintf("/tasks/poll/batch/%s", tasktype)
 
 	queryParams := url.Values{}
-	if localVarOptionals != nil && localVarOptionals.Workerid.IsSet() {
-		queryParams.Add("workerid", parameterToString(localVarOptionals.Workerid.Value(), ""))
+	if localVarOptionals != nil && localVarOptionals.WorkerId.IsSet() {
+		queryParams.Add("workerid", parameterToString(localVarOptionals.WorkerId.Value(), ""))
 	}
 	if localVarOptionals != nil && localVarOptionals.Domain.IsSet() {
 		queryParams.Add("domain", parameterToString(localVarOptionals.Domain.Value(), ""))
@@ -239,7 +239,7 @@ TaskResourceApiService Poll for a task of a certain type
  * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
  * @param tasktype
  * @param optional nil or *TaskResourceApiPollOpts - Optional Parameters:
-     * @param "Workerid" (optional.String) -
+     * @param "WorkerId" (optional.String) -
      * @param "Domain" (optional.String) -
 @return Task
 */

sdk/client/task_client.go

@@ -10,18 +10,18 @@ import (
 type TaskClient interface {
 	All(ctx context.Context) (map[string]int64, *http.Response, error)
 	AllVerbose(ctx context.Context) (map[string]map[string]map[string]int64, *http.Response, error)
-	BatchPoll(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiBatchPollOpts) ([]model.Task, *http.Response, error)
+	BatchPollTask(ctx context.Context, tasktype string, options *TaskResourceApiBatchPollOpts) ([]model.PolledTask, *http.Response, error)
 	GetAllPollData(ctx context.Context) ([]model.PollData, *http.Response, error)
 	GetExternalStorageLocation1(ctx context.Context, path string, operation string, payloadType string) (model.ExternalStorageLocation, *http.Response, error)
 	GetPollData(ctx context.Context, taskType string) ([]model.PollData, *http.Response, error)
 	GetTask(ctx context.Context, taskId string) (model.Task, *http.Response, error)
 	GetTaskLogs(ctx context.Context, taskId string) ([]model.TaskExecLog, *http.Response, error)
 	Log(ctx context.Context, body string, taskId string) (*http.Response, error)
-	Poll(ctx context.Context, tasktype string, localVarOptionals *TaskResourceApiPollOpts) (model.Task, *http.Response, error)
+	Poll(ctx context.Context, tasktype string, options *TaskResourceApiPollOpts) (model.Task, *http.Response, error)
 	RequeuePendingTask(ctx context.Context, taskType string) (string, *http.Response, error)
-	Search(ctx context.Context, localVarOptionals *TaskResourceApiSearch1Opts) (model.SearchResultTaskSummary, *http.Response, error)
-	SearchV2(ctx context.Context, localVarOptionals *TaskResourceApiSearchV21Opts) (model.SearchResultTask, *http.Response, error)
-	Size(ctx context.Context, localVarOptionals *TaskResourceApiSizeOpts) (map[string]int32, *http.Response, error)
+	Search(ctx context.Context, options *TaskResourceApiSearch1Opts) (model.SearchResultTaskSummary, *http.Response, error)
+	SearchV2(ctx context.Context, options *TaskResourceApiSearchV21Opts) (model.SearchResultTask, *http.Response, error)
+	Size(ctx context.Context, options *TaskResourceApiSizeOpts) (map[string]int32, *http.Response, error)
 	UpdateTask(ctx context.Context, taskResult *model.TaskResult) (string, *http.Response, error)
 	UpdateTaskByRefName(ctx context.Context, body map[string]interface{}, workflowId string, taskRefName string, status string) (string, *http.Response, error)
 	UpdateTaskByRefNameWithWorkerId(ctx context.Context, body map[string]interface{}, workflowId string, taskRefName string, status string, workerId optional.String) (string, *http.Response, error)

sdk/concurrency/recover.go

@@ -10,8 +10,8 @@
 package concurrency
 
 import (
+	"github.com/conductor-sdk/conductor-go/sdk/log"
 	"github.com/conductor-sdk/conductor-go/sdk/metrics"
-	log "github.com/sirupsen/logrus"
 	"runtime/debug"
 )
 

sdk/log/logger.go

@@ -30,6 +30,3 @@ func Error(args ...interface{}) {
 func Warning(args ...interface{}) {
 	sugar.Warn(args)
 }
-func Fatalf(format string, args ...interface{}) {
-	sugar.Fatalf(format, args...)
-}

sdk/metrics/provider.go

@@ -13,8 +13,8 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/conductor-sdk/conductor-go/sdk/log"
 	"github.com/conductor-sdk/conductor-go/sdk/settings"
-	log "github.com/sirupsen/logrus"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -40,14 +40,12 @@ func ProvideMetrics(metricsSettings *settings.MetricsSettings) {
 		prometheus.MustRegister(gaugeByName[metricName])
 	}
 	collectionEnabled = true
-	
+
 	http.Handle(
 		metricsSettings.ApiEndpoint,
 		promhttp.HandlerFor(
 			prometheus.DefaultGatherer,
-			promhttp.HandlerOpts{
-				EnableOpenMetrics: true,
-			},
+			promhttp.HandlerOpts{},
 		),
 	)
 	portString := strconv.Itoa(metricsSettings.Port)

sdk/model/search_result_workflow_schedule_execution_model.go

@@ -10,6 +10,6 @@
 package model
 
 type SearchResultWorkflowSchedule struct {
-	Results   []WorkflowScheduleExecutionModel `json:"results,omitempty"`
-	TotalHits int64                            `json:"totalHits,omitempty"`
+	Results   []WorkflowScheduleExecution `json:"results,omitempty"`
+	TotalHits int64                       `json:"totalHits,omitempty"`
 }

sdk/model/tag.go

@@ -5,3 +5,9 @@ type Tag struct {
 	Type_ string `json:"type,omitempty"`
 	Value string `json:"value,omitempty"`
 }
+
+type TagString struct {
+	Key   string `json:"key,omitempty"`
+	Type_ string `json:"type,omitempty"`
+	Value string `json:"value,omitempty"`
+}