From 63c82efd3375509a3b1daff68c3751c54f803ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Mej=C3=ADas=20Rodr=C3=ADguez?= Date: Tue, 10 Sep 2019 19:03:39 -0400 Subject: [PATCH] Export doJSONWithToken --- client/client.go | 6 ++++-- client/client_test.go | 2 +- client/endpointGroup_list.go | 2 +- client/endpoint_docker_info.go | 2 +- client/endpoint_list.go | 2 +- client/stackFile_inspect.go | 2 +- client/stack_create.go | 4 ++-- client/stack_delete.go | 2 +- client/stack_list.go | 2 +- client/stack_update.go | 2 +- client/status.go | 2 +- client/user_list.go | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/client/client.go b/client/client.go index 16b8ac7..de1cdb5 100644 --- a/client/client.go +++ b/client/client.go @@ -69,6 +69,9 @@ type PortainerClient interface { // GetUsername returns the user name used by the client GetUsername() string + + // DoJSONWithToken makes an HTTP request with a JSON body and an auth token + DoJSONWithToken(uri, method string, headers http.Header, request interface{}, response interface{}) (err error) } type portainerClientImp struct { @@ -178,8 +181,7 @@ func (n *portainerClientImp) doJSON(uri, method string, headers http.Header, req return nil } -// Do a JSON http request with an auth token -func (n *portainerClientImp) doJSONWithToken(uri, method string, headers http.Header, request interface{}, response interface{}) (err error) { +func (n *portainerClientImp) DoJSONWithToken(uri, method string, headers http.Header, request interface{}, response interface{}) (err error) { // Ensure there is an auth token if n.token == "" { n.token, err = n.AuthenticateUser(AuthenticateUserOptions{ diff --git a/client/client_test.go b/client/client_test.go index 5542f1f..9b12085 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -398,7 +398,7 @@ func Test_portainerClientImp_doJSONWithToken(t *testing.T) { token: tt.fields.token, } - err := n.doJSONWithToken(tt.args.uri, tt.args.method, tt.args.headers, &tt.args.requestBody, &tt.args.responseBody) + err := n.DoJSONWithToken(tt.args.uri, tt.args.method, tt.args.headers, &tt.args.requestBody, &tt.args.responseBody) assert.Equal(t, tt.wantErr, err != nil) assert.Equal(t, tt.wantRespBody, tt.args.responseBody) }) diff --git a/client/endpointGroup_list.go b/client/endpointGroup_list.go index 89de541..85efa28 100644 --- a/client/endpointGroup_list.go +++ b/client/endpointGroup_list.go @@ -7,6 +7,6 @@ import ( ) func (n *portainerClientImp) EndpointGroupList() (endpointGroups []portainer.EndpointGroup, err error) { - err = n.doJSONWithToken("endpoint_groups", http.MethodGet, http.Header{}, nil, &endpointGroups) + err = n.DoJSONWithToken("endpoint_groups", http.MethodGet, http.Header{}, nil, &endpointGroups) return } diff --git a/client/endpoint_docker_info.go b/client/endpoint_docker_info.go index 83fb90e..cebcff3 100644 --- a/client/endpoint_docker_info.go +++ b/client/endpoint_docker_info.go @@ -8,6 +8,6 @@ import ( ) func (n *portainerClientImp) EndpointDockerInfo(endpointID portainer.EndpointID) (info map[string]interface{}, err error) { - err = n.doJSONWithToken(fmt.Sprintf("endpoints/%v/docker/info", endpointID), http.MethodGet, http.Header{}, nil, &info) + err = n.DoJSONWithToken(fmt.Sprintf("endpoints/%v/docker/info", endpointID), http.MethodGet, http.Header{}, nil, &info) return } diff --git a/client/endpoint_list.go b/client/endpoint_list.go index 2aac0e9..7f3babe 100644 --- a/client/endpoint_list.go +++ b/client/endpoint_list.go @@ -7,6 +7,6 @@ import ( ) func (n *portainerClientImp) EndpointList() (endpoints []portainer.Endpoint, err error) { - err = n.doJSONWithToken("endpoints", http.MethodGet, http.Header{}, nil, &endpoints) + err = n.DoJSONWithToken("endpoints", http.MethodGet, http.Header{}, nil, &endpoints) return } diff --git a/client/stackFile_inspect.go b/client/stackFile_inspect.go index 7ef6720..d0aa610 100644 --- a/client/stackFile_inspect.go +++ b/client/stackFile_inspect.go @@ -15,7 +15,7 @@ type StackFileInspectResponse struct { func (n *portainerClientImp) StackFileInspect(stackID portainer.StackID) (content string, err error) { var respBody StackFileInspectResponse - err = n.doJSONWithToken(fmt.Sprintf("stacks/%v/file", stackID), http.MethodGet, http.Header{}, nil, &respBody) + err = n.DoJSONWithToken(fmt.Sprintf("stacks/%v/file", stackID), http.MethodGet, http.Header{}, nil, &respBody) if err != nil { return } diff --git a/client/stack_create.go b/client/stack_create.go index d93011c..2ddc40f 100644 --- a/client/stack_create.go +++ b/client/stack_create.go @@ -39,7 +39,7 @@ func (n *portainerClientImp) StackCreateCompose(options StackCreateComposeOption StackFileContent: options.StackFileContent, } - err = n.doJSONWithToken(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%v", 2, "string", options.EndpointID), http.MethodPost, http.Header{}, &reqBody, &stack) + err = n.DoJSONWithToken(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%v", 2, "string", options.EndpointID), http.MethodPost, http.Header{}, &reqBody, &stack) return } @@ -51,6 +51,6 @@ func (n *portainerClientImp) StackCreateSwarm(options StackCreateSwarmOptions) ( StackFileContent: options.StackFileContent, } - err = n.doJSONWithToken(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%v", 1, "string", options.EndpointID), http.MethodPost, http.Header{}, &reqBody, &stack) + err = n.DoJSONWithToken(fmt.Sprintf("stacks?type=%v&method=%s&endpointId=%v", 1, "string", options.EndpointID), http.MethodPost, http.Header{}, &reqBody, &stack) return } diff --git a/client/stack_delete.go b/client/stack_delete.go index f67fc20..4112f6c 100644 --- a/client/stack_delete.go +++ b/client/stack_delete.go @@ -8,6 +8,6 @@ import ( ) func (n *portainerClientImp) StackDelete(stackID portainer.StackID) (err error) { - err = n.doJSONWithToken(fmt.Sprintf("stacks/%d", stackID), http.MethodDelete, http.Header{}, nil, nil) + err = n.DoJSONWithToken(fmt.Sprintf("stacks/%d", stackID), http.MethodDelete, http.Header{}, nil, nil) return } diff --git a/client/stack_list.go b/client/stack_list.go index 7b74c6d..98374aa 100644 --- a/client/stack_list.go +++ b/client/stack_list.go @@ -23,6 +23,6 @@ func (n *portainerClientImp) StackList(options StackListOptions) (stacks []porta filterJSONBytes, _ := json.Marshal(options.Filter) filterJSONString := string(filterJSONBytes) - err = n.doJSONWithToken(fmt.Sprintf("stacks?filters=%s", filterJSONString), http.MethodGet, http.Header{}, nil, &stacks) + err = n.DoJSONWithToken(fmt.Sprintf("stacks?filters=%s", filterJSONString), http.MethodGet, http.Header{}, nil, &stacks) return } diff --git a/client/stack_update.go b/client/stack_update.go index 45ea6b8..3a03e55 100644 --- a/client/stack_update.go +++ b/client/stack_update.go @@ -30,6 +30,6 @@ func (n *portainerClientImp) StackUpdate(options StackUpdateOptions) (err error) Prune: options.Prune, } - err = n.doJSONWithToken(fmt.Sprintf("stacks/%v?endpointId=%v", options.Stack.ID, options.EndpointID), http.MethodPut, http.Header{}, &reqBody, nil) + err = n.DoJSONWithToken(fmt.Sprintf("stacks/%v?endpointId=%v", options.Stack.ID, options.EndpointID), http.MethodPut, http.Header{}, &reqBody, nil) return } diff --git a/client/status.go b/client/status.go index 62744bd..5d06703 100644 --- a/client/status.go +++ b/client/status.go @@ -7,6 +7,6 @@ import ( ) func (n *portainerClientImp) Status() (status portainer.Status, err error) { - err = n.doJSONWithToken("status", http.MethodGet, http.Header{}, nil, &status) + err = n.DoJSONWithToken("status", http.MethodGet, http.Header{}, nil, &status) return } diff --git a/client/user_list.go b/client/user_list.go index b4e8342..612aa51 100644 --- a/client/user_list.go +++ b/client/user_list.go @@ -7,6 +7,6 @@ import ( ) func (n *portainerClientImp) UserList() (users []portainer.User, err error) { - err = n.doJSONWithToken("users", http.MethodGet, http.Header{}, nil, &users) + err = n.DoJSONWithToken("users", http.MethodGet, http.Header{}, nil, &users) return }