Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Client.DoJson to doJson

Browse Source
This commit is contained in:
Juan Carlos Mejías Rodríguez 2019-08-02 13:12:25 -04:00
parent 70621c750c
commit 93f08172ac
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/client.go
View File

@ -83,7 +83,7 @@ func (n *PortainerClient) do(uri, method string, request io.Reader, requestType
return return
} }
func (n *PortainerClient) DoJSON(uri, method string, request interface{}, response interface{}) error { func (n *PortainerClient) doJSON(uri, method string, request interface{}, response interface{}) error {
var body io.Reader var body io.Reader
if request != nil { if request != nil {
@ -120,7 +120,7 @@ func (n *PortainerClient) Authenticate(user, password string) (token string, err
respBody := AuthenticateUserResponse{} respBody := AuthenticateUserResponse{}
err = n.DoJSON("auth", http.MethodPost, &reqBody, &respBody) err = n.doJSON("auth", http.MethodPost, &reqBody, &respBody)
if err != nil { if err != nil {
return return
} }
@ -133,7 +133,7 @@ func (n *PortainerClient) Authenticate(user, password string) (token string, err
// Get endpoints // Get endpoints
func (n *PortainerClient) GetEndpoints() (endpoints []EndpointSubset, err error) { func (n *PortainerClient) GetEndpoints() (endpoints []EndpointSubset, err error) {
PrintVerbose("Getting endpoints...") PrintVerbose("Getting endpoints...")
err = n.DoJSON("endpoints", http.MethodGet, nil, &endpoints) err = n.doJSON("endpoints", http.MethodGet, nil, &endpoints)
return return
} }
@ -149,7 +149,7 @@ func (n *PortainerClient) GetStacks(swarmId string, endpointId uint32) (stacks [
filterJsonBytes, _ := json.Marshal(filter) filterJsonBytes, _ := json.Marshal(filter)
filterJsonString := string(filterJsonBytes) filterJsonString := string(filterJsonBytes)
err = n.DoJSON(fmt.Sprintf("stacks?filters=%s", filterJsonString), http.MethodGet, nil, &stacks) err = n.doJSON(fmt.Sprintf("stacks?filters=%s", filterJsonString), http.MethodGet, nil, &stacks)
return return
} }
@ -164,7 +164,7 @@ func (n *PortainerClient) CreateSwarmStack(stackName string, environmentVariable
StackFileContent: stackFileContent, StackFileContent: stackFileContent,
} }
err = n.DoJSON(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%s", 1, "string", endpointId), http.MethodPost, &reqBody, nil) err = n.doJSON(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%s", 1, "string", endpointId), http.MethodPost, &reqBody, nil)
return return
} }
@ -178,7 +178,7 @@ func (n *PortainerClient) CreateComposeStack(stackName string, environmentVariab
StackFileContent: stackFileContent, StackFileContent: stackFileContent,
} }
err = n.DoJSON(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%s", 2, "string", endpointId), http.MethodPost, &reqBody, nil) err = n.doJSON(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%s", 2, "string", endpointId), http.MethodPost, &reqBody, nil)
return return
} }
@ -192,7 +192,7 @@ func (n *PortainerClient) UpdateStack(stack Stack, environmentVariables []StackE
Prune: prune, Prune: prune,
} }
err = n.DoJSON(fmt.Sprintf("stacks/%v?endpointId=%s", stack.Id, endpointId), http.MethodPut, &reqBody, nil) err = n.doJSON(fmt.Sprintf("stacks/%v?endpointId=%s", stack.Id, endpointId), http.MethodPut, &reqBody, nil)
return return
} }
@ -200,7 +200,7 @@ func (n *PortainerClient) UpdateStack(stack Stack, environmentVariables []StackE
func (n *PortainerClient) DeleteStack(stackId uint32) (err error) { func (n *PortainerClient) DeleteStack(stackId uint32) (err error) {
PrintVerbose("Deleting stack...") PrintVerbose("Deleting stack...")
err = n.DoJSON(fmt.Sprintf("stacks/%d", stackId), http.MethodDelete, nil, nil) err = n.doJSON(fmt.Sprintf("stacks/%d", stackId), http.MethodDelete, nil, nil)
return return
} }
@ -210,7 +210,7 @@ func (n *PortainerClient) GetStackFileContent(stackId uint32) (content string, e
var respBody StackFileInspectResponse var respBody StackFileInspectResponse
err = n.DoJSON(fmt.Sprintf("stacks/%v/file", stackId), http.MethodGet, nil, &respBody) err = n.doJSON(fmt.Sprintf("stacks/%v/file", stackId), http.MethodGet, nil, &respBody)
if err != nil { if err != nil {
return return
} }
@ -224,13 +224,13 @@ func (n *PortainerClient) GetStackFileContent(stackId uint32) (content string, e
func (n *PortainerClient) GetEndpointDockerInfo(endpointId string) (info map[string]interface{}, err error) { func (n *PortainerClient) GetEndpointDockerInfo(endpointId string) (info map[string]interface{}, err error) {
PrintVerbose("Getting endpoint Docker info...") PrintVerbose("Getting endpoint Docker info...")
err = n.DoJSON(fmt.Sprintf("endpoints/%v/docker/info", endpointId), http.MethodGet, nil, &info) err = n.doJSON(fmt.Sprintf("endpoints/%v/docker/info", endpointId), http.MethodGet, nil, &info)
return return
} }
// Get Portainer status info // Get Portainer status info
func (n *PortainerClient) GetStatus() (status Status, err error) { func (n *PortainerClient) GetStatus() (status Status, err error) {
err = n.DoJSON("status", http.MethodGet, nil, &status) err = n.doJSON("status", http.MethodGet, nil, &status)
return return
} }