Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gracefully fail if Network and IPAM plugins are used #1856

Merged
merged 1 commit into from
Jan 11, 2017
Merged

Gracefully fail if Network and IPAM plugins are used #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion manager/controlapi/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func validateAnnotations(m api.Annotations) error {
return nil
}

func validateDriver(driver *api.Driver) error {
func validateDriver(driver *api.Driver, defName string) error {
if driver == nil {
// It is ok to not specify the driver. We will choose
// a default driver.
Expand All @@ -87,5 +87,8 @@ func validateDriver(driver *api.Driver) error {
return grpc.Errorf(codes.InvalidArgument, "driver name: if driver is specified name is required")
}

if driver.Name != defName {
return grpc.Errorf(codes.InvalidArgument, "invalid driver (%s) specified", driver.Name)
}
return nil
}
6 changes: 4 additions & 2 deletions manager/controlapi/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"fmt"
"net"

"github.com/docker/libnetwork/ipamapi"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/identity"
"github.com/docker/swarmkit/manager/allocator/networkallocator"
"github.com/docker/swarmkit/manager/state/store"
"golang.org/x/net/context"
"google.golang.org/grpc"
Expand Down Expand Up @@ -54,7 +56,7 @@ func validateIPAM(ipam *api.IPAMOptions) error {
return nil
}

if err := validateDriver(ipam.Driver); err != nil {
if err := validateDriver(ipam.Driver, ipamapi.DefaultIPAM); err != nil {
return err
}

Expand All @@ -76,7 +78,7 @@ func validateNetworkSpec(spec *api.NetworkSpec) error {
return err
}

if err := validateDriver(spec.DriverConfig); err != nil {
if err := validateDriver(spec.DriverConfig, networkallocator.DefaultDriver); err != nil {
return err
}

Expand Down
8 changes: 6 additions & 2 deletions manager/controlapi/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,13 @@ func createServiceInNetwork(t *testing.T, ts *testServer, name, image string, nw
}

func TestValidateDriver(t *testing.T) {
assert.NoError(t, validateDriver(nil))
assert.NoError(t, validateDriver(nil, ""))

err := validateDriver(&api.Driver{Name: ""})
err := validateDriver(&api.Driver{Name: ""}, "")
assert.Error(t, err)
assert.Equal(t, codes.InvalidArgument, grpc.Code(err))

err = validateDriver(&api.Driver{Name: "test"}, "default")
assert.Error(t, err)
assert.Equal(t, codes.InvalidArgument, grpc.Code(err))
}
Expand Down