Skip to content

Commit

Permalink
Reverted other unnecessary linting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
djcass44 committed Oct 3, 2020
1 parent 4c5701d commit 06b7c6b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
13 changes: 8 additions & 5 deletions client/go/conductorhttpclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func NewConductorHttpClient(baseUrl string) *ConductorHttpClient {
return conductorClient
}


/**********************/
/* Metadata Functions */
/**********************/
Expand All @@ -44,7 +45,7 @@ func (c *ConductorHttpClient) GetWorkflowDef(workflowName string, version int) (
if version > 0 {
versionString = strconv.Itoa(version)
}
params := map[string]string{"version": versionString}
params := map[string]string{"version":versionString}
outputString, err := c.httpClient.Get(url, params, nil)
if err != nil {
log.Println("Error while trying to Get Workflow Definition", err)
Expand Down Expand Up @@ -93,7 +94,7 @@ func (c *ConductorHttpClient) UnRegisterWorkflowDef(workflowDefName string, vers
versionString = strconv.Itoa(version)

url := c.httpClient.MakeUrl("/metadata/workflow/{workflowDefName}/{version}", "{workflowDefName}",
workflowDefName, "{version}", versionString)
workflowDefName, "{version}", versionString)

outputString, err := c.httpClient.Delete(url, nil, nil, "")

Expand Down Expand Up @@ -160,6 +161,7 @@ func (c *ConductorHttpClient) GetAllTaskDefs() (string, error) {
}
}


/**********************/
/* Task Functions */
/**********************/
Expand Down Expand Up @@ -247,6 +249,7 @@ func (c *ConductorHttpClient) GetTaskQueueSizes(taskNames string) (string, error
}
}


/**********************/
/* Workflow Functions */
/**********************/
Expand All @@ -257,7 +260,7 @@ func (c *ConductorHttpClient) GetWorkflow(workflowId string, includeTasks bool)
if includeTasks {
includeTasksString = "true"
}
params := map[string]string{"includeTasks": includeTasksString}
params := map[string]string{"includeTasks":includeTasksString}
outputString, err := c.httpClient.Get(url, params, nil)
if err != nil {
log.Println("Error while trying to Get Workflow", workflowId, err)
Expand All @@ -274,7 +277,7 @@ func (c *ConductorHttpClient) GetRunningWorkflows(workflowName string, version i
if version > 0 {
versionString = strconv.Itoa(version)
}
params := map[string]string{"version": versionString}
params := map[string]string{"version":versionString}
if startTime != 0 {
params["startTime"] = strconv.FormatFloat(startTime, 'f', -1, 64)
}
Expand Down Expand Up @@ -307,7 +310,7 @@ func (c *ConductorHttpClient) StartWorkflow(workflowName string, version int, co
inputJson = "{}"
}

headers := map[string]string{"Accept": "text/plain"}
headers := map[string]string{"Accept":"text/plain"}

outputString, err := c.httpClient.Post(url, params, headers, inputJson)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions client/go/httpclient/httpclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
)

type HttpClient struct {
BaseUrl string
Headers map[string]string
BaseUrl string
Headers map[string]string
PrintLogs bool
client *http.Client
}
Expand Down Expand Up @@ -135,7 +135,7 @@ func (c *HttpClient) Put(url string, queryParamsMap map[string]string, headers m
urlString := url + genParamString(queryParamsMap)
resp, err := c.httpRequest(urlString, "PUT", headers, body)
if err != nil {
log.Println("Http PUT Error for URL: ", urlString)
log.Println("Http PUT Error for URL: ", urlString, )
return "", err
}
return resp, nil
Expand Down

0 comments on commit 06b7c6b

Please sign in to comment.