format code with gofumpt
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@ -273,6 +273,7 @@ func (ctx *serviceInspectContext) HasLogDriver() bool {
|
||||
func (ctx *serviceInspectContext) HasLogDriverName() bool {
|
||||
return ctx.Service.Spec.TaskTemplate.LogDriver.Name != ""
|
||||
}
|
||||
|
||||
func (ctx *serviceInspectContext) LogDriverName() string {
|
||||
return ctx.Service.Spec.TaskTemplate.LogDriver.Name
|
||||
}
|
||||
|
||||
@ -301,6 +301,7 @@ func TestServiceContextWriteJSON(t *testing.T) {
|
||||
assert.Check(t, is.DeepEqual(expectedJSONs[i], m), msg)
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceContextWriteJSONField(t *testing.T) {
|
||||
services := []swarm.Service{
|
||||
{
|
||||
|
||||
@ -180,7 +180,6 @@ func TestResourceOptionsToResourceRequirements(t *testing.T) {
|
||||
assert.NilError(t, err)
|
||||
assert.Check(t, is.Len(r.Reservations.GenericResources, len(opt.resGenericResources)))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestToServiceNetwork(t *testing.T) {
|
||||
|
||||
@ -91,7 +91,8 @@ func TestReplicatedProgressUpdaterOneReplica(t *testing.T) {
|
||||
|
||||
// Task with DesiredState beyond Running is ignored
|
||||
tasks = append(tasks,
|
||||
swarm.Task{ID: "1",
|
||||
swarm.Task{
|
||||
ID: "1",
|
||||
NodeID: "a",
|
||||
DesiredState: swarm.TaskStateShutdown,
|
||||
Status: swarm.TaskStatus{State: swarm.TaskStateNew},
|
||||
@ -140,7 +141,8 @@ func TestReplicatedProgressUpdaterOneReplica(t *testing.T) {
|
||||
// replacement task, not the old task.
|
||||
tasks[0].DesiredState = swarm.TaskStateShutdown
|
||||
tasks = append(tasks,
|
||||
swarm.Task{ID: "2",
|
||||
swarm.Task{
|
||||
ID: "2",
|
||||
NodeID: "b",
|
||||
DesiredState: swarm.TaskStateRunning,
|
||||
Status: swarm.TaskStatus{State: swarm.TaskStateRunning},
|
||||
@ -154,7 +156,8 @@ func TestReplicatedProgressUpdaterOneReplica(t *testing.T) {
|
||||
// Add a new task while the current one is still running, to simulate
|
||||
// "start-then-stop" updates.
|
||||
tasks = append(tasks,
|
||||
swarm.Task{ID: "3",
|
||||
swarm.Task{
|
||||
ID: "3",
|
||||
NodeID: "b",
|
||||
DesiredState: swarm.TaskStateRunning,
|
||||
Status: swarm.TaskStatus{State: swarm.TaskStatePreparing},
|
||||
@ -254,7 +257,8 @@ func TestGlobalProgressUpdaterOneNode(t *testing.T) {
|
||||
|
||||
// Task with DesiredState beyond Running is ignored
|
||||
tasks = append(tasks,
|
||||
swarm.Task{ID: "1",
|
||||
swarm.Task{
|
||||
ID: "1",
|
||||
NodeID: "a",
|
||||
DesiredState: swarm.TaskStateShutdown,
|
||||
Status: swarm.TaskStatus{State: swarm.TaskStateNew},
|
||||
@ -304,7 +308,8 @@ func TestGlobalProgressUpdaterOneNode(t *testing.T) {
|
||||
// replacement task, not the old task.
|
||||
tasks[0].DesiredState = swarm.TaskStateShutdown
|
||||
tasks = append(tasks,
|
||||
swarm.Task{ID: "2",
|
||||
swarm.Task{
|
||||
ID: "2",
|
||||
NodeID: "a",
|
||||
DesiredState: swarm.TaskStateRunning,
|
||||
Status: swarm.TaskStatus{State: swarm.TaskStateRunning},
|
||||
@ -318,7 +323,8 @@ func TestGlobalProgressUpdaterOneNode(t *testing.T) {
|
||||
// Add a new task while the current one is still running, to simulate
|
||||
// "start-then-stop" updates.
|
||||
tasks = append(tasks,
|
||||
swarm.Task{ID: "3",
|
||||
swarm.Task{
|
||||
ID: "3",
|
||||
NodeID: "a",
|
||||
DesiredState: swarm.TaskStateRunning,
|
||||
Status: swarm.TaskStatus{State: swarm.TaskStatePreparing},
|
||||
|
||||
@ -12,7 +12,6 @@ import (
|
||||
)
|
||||
|
||||
func newRemoveCommand(dockerCli command.Cli) *cobra.Command {
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "rm SERVICE [SERVICE...]",
|
||||
Aliases: []string{"remove"},
|
||||
|
||||
@ -999,7 +999,6 @@ func updateDNSConfig(flags *pflag.FlagSet, config **swarm.DNSConfig) error {
|
||||
for _, nameserver := range nameservers {
|
||||
if _, exists := toRemove[nameserver]; !exists {
|
||||
newConfig.Nameservers = append(newConfig.Nameservers, nameserver)
|
||||
|
||||
}
|
||||
}
|
||||
// Sort so that result is predictable.
|
||||
|
||||
@ -507,15 +507,19 @@ type secretAPIClientMock struct {
|
||||
func (s secretAPIClientMock) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) {
|
||||
return s.listResult, nil
|
||||
}
|
||||
|
||||
func (s secretAPIClientMock) SecretCreate(ctx context.Context, secret swarm.SecretSpec) (types.SecretCreateResponse, error) {
|
||||
return types.SecretCreateResponse{}, nil
|
||||
}
|
||||
|
||||
func (s secretAPIClientMock) SecretRemove(ctx context.Context, id string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s secretAPIClientMock) SecretInspectWithRaw(ctx context.Context, name string) (swarm.Secret, []byte, error) {
|
||||
return swarm.Secret{}, []byte{}, nil
|
||||
}
|
||||
|
||||
func (s secretAPIClientMock) SecretUpdate(ctx context.Context, id string, version swarm.Version, secret swarm.SecretSpec) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user