InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update request.* signature to remove the host

Browse Source 
99.9% of use case for request call are using daemonHost. This makes it
default and adds a `request.DoOnHost` function to be able to specify
the host for specific, more complex use cases.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester
2017-03-06 16:35:27 +01:00
parent 3cfc3e30a8
commit b11ba1231e
17 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
integration-cli/environment/clean.go
View File

@@ -4,13 +4,11 @@ import (
"encoding/json"
"fmt"
"net/http"
"os"
"strings"
"github.com/docker/docker/api/types"
volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/integration-cli/request"
"github.com/docker/docker/opts"
icmd "github.com/docker/docker/pkg/testutil/cmd"
)
@@ -111,7 +109,7 @@ func deleteAllVolumes(t testingT, dockerBinary string) {
}
var errs []string
for _, v := range volumes {
status, b, err := request.SockRequest("DELETE", "/volumes/"+v.Name, nil, DaemonHost())
status, b, err := request.SockRequest("DELETE", "/volumes/"+v.Name, nil, request.DaemonHost())
if err != nil {
errs = append(errs, err.Error())
continue
@@ -127,7 +125,7 @@ func deleteAllVolumes(t testingT, dockerBinary string) {
func getAllVolumes() ([]*types.Volume, error) {
var volumes volumetypes.VolumesListOKBody
_, b, err := request.SockRequest("GET", "/volumes", nil, DaemonHost())
_, b, err := request.SockRequest("GET", "/volumes", nil, request.DaemonHost())
if err != nil {
return nil, err
}
@@ -151,7 +149,7 @@ func deleteAllNetworks(t testingT, dockerBinary string, daemonPlatform string) {
// nat is a pre-defined network on Windows and cannot be removed
continue
}
status, b, err := request.SockRequest("DELETE", "/networks/"+n.Name, nil, DaemonHost())
status, b, err := request.SockRequest("DELETE", "/networks/"+n.Name, nil, request.DaemonHost())
if err != nil {
errs = append(errs, err.Error())
continue
@@ -167,7 +165,7 @@ func deleteAllNetworks(t testingT, dockerBinary string, daemonPlatform string) {
func getAllNetworks() ([]types.NetworkResource, error) {
var networks []types.NetworkResource
_, b, err := request.SockRequest("GET", "/networks", nil, DaemonHost())
_, b, err := request.SockRequest("GET", "/networks", nil, request.DaemonHost())
if err != nil {
return nil, err
}
@@ -185,7 +183,7 @@ func deleteAllPlugins(t testingT, dockerBinary string) {
var errs []string
for _, p := range plugins {
pluginName := p.Name
status, b, err := request.SockRequest("DELETE", "/plugins/"+pluginName+"?force=1", nil, DaemonHost())
status, b, err := request.SockRequest("DELETE", "/plugins/"+pluginName+"?force=1", nil, request.DaemonHost())
if err != nil {
errs = append(errs, err.Error())
continue
@@ -201,7 +199,7 @@ func deleteAllPlugins(t testingT, dockerBinary string) {
func getAllPlugins() (types.PluginsListResponse, error) {
var plugins types.PluginsListResponse
_, b, err := request.SockRequest("GET", "/plugins", nil, DaemonHost())
_, b, err := request.SockRequest("GET", "/plugins", nil, request.DaemonHost())
if err != nil {
return nil, err
}
@@ -210,12 +208,3 @@ func getAllPlugins() (types.PluginsListResponse, error) {
}
return plugins, nil
}
// DaemonHost return the daemon host string for this test execution
func DaemonHost() string {
daemonURLStr := "unix://" + opts.DefaultUnixSocket
if daemonHostVar := os.Getenv("DOCKER_HOST"); daemonHostVar != "" {
daemonURLStr = daemonHostVar
}
return daemonURLStr
}