Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kubernetes/conversion_test: use test-builders package 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-10-30 10:53:39 +01:00
parent 270defa177
commit 2d0c10d77a
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
cli/command/stack/kubernetes/conversion_test.go
View File

@ -3,6 +3,7 @@ package kubernetes
import ( import (
"testing" "testing"
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
"github.com/docker/compose-on-kubernetes/api/labels" "github.com/docker/compose-on-kubernetes/api/labels"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/assert"
@ -45,8 +46,8 @@ func TestKubernetesServiceToSwarmServiceConversion(t *testing.T) {
}, },
}, },
expectedServices: []swarm.Service{ expectedServices: []swarm.Service{
makeSwarmService(t, "stack_service1", "uid1", withMode("replicated", 5), withStatus(2, 5)), makeSwarmService(t, "stack_service1", "uid1", ReplicatedService(5), ServiceStatus(5, 2)),
makeSwarmService(t, "stack_service2", "uid2", withMode("replicated", 3), withStatus(3, 3)), makeSwarmService(t, "stack_service2", "uid2", ReplicatedService(3), ServiceStatus(3, 3)),
}, },
}, },
{ {
@ -70,8 +71,9 @@ func TestKubernetesServiceToSwarmServiceConversion(t *testing.T) {
}, },
expectedServices: []swarm.Service{ expectedServices: []swarm.Service{
makeSwarmService(t, "stack_service", "uid1", makeSwarmService(t, "stack_service", "uid1",
withMode("replicated", 1), ReplicatedService(1),
withStatus(1, 1), withPort(swarm.PortConfig{ ServiceStatus(1, 1),
withPort(swarm.PortConfig{
PublishMode: swarm.PortConfigPublishModeIngress, PublishMode: swarm.PortConfigPublishModeIngress,
PublishedPort: 80, PublishedPort: 80,
TargetPort: 80, TargetPort: 80,
@ -101,8 +103,8 @@ func TestKubernetesServiceToSwarmServiceConversion(t *testing.T) {
}, },
expectedServices: []swarm.Service{ expectedServices: []swarm.Service{
makeSwarmService(t, "stack_service", "uid1", makeSwarmService(t, "stack_service", "uid1",
withMode("replicated", 1), ReplicatedService(1),
withStatus(1, 1), ServiceStatus(1, 1),
withPort(swarm.PortConfig{ withPort(swarm.PortConfig{
PublishMode: swarm.PortConfigPublishModeHost, PublishMode: swarm.PortConfigPublishModeHost,
PublishedPort: 35666, PublishedPort: 35666,
@ -165,25 +167,7 @@ func makeKubeService(service, stack, uid string, serviceType apiv1.ServiceType,
} }
} }
func withMode(mode string, replicas uint64) func(*swarm.Service) { // TODO convertToServices currently doesn't set swarm.EndpointSpec.Ports
return func(service *swarm.Service) {
switch mode {
case "global":
service.Spec.Mode = swarm.ServiceMode{
Global: &swarm.GlobalService{},
}
case "replicated":
service.Spec.Mode = swarm.ServiceMode{
Replicated: &swarm.ReplicatedService{Replicas: &replicas},
}
withStatus(0, replicas)
default:
service.Spec.Mode = swarm.ServiceMode{}
withStatus(0, 0)
}
}
}
func withPort(port swarm.PortConfig) func(*swarm.Service) { func withPort(port swarm.PortConfig) func(*swarm.Service) {
return func(service *swarm.Service) { return func(service *swarm.Service) {
if service.Endpoint.Ports == nil { if service.Endpoint.Ports == nil {
@ -193,32 +177,9 @@ func withPort(port swarm.PortConfig) func(*swarm.Service) {
} }
} }
func withStatus(running, desired uint64) func(*swarm.Service) { func makeSwarmService(t *testing.T, name, id string, opts ...func(*swarm.Service)) swarm.Service {
return func(service *swarm.Service) {
service.ServiceStatus = &swarm.ServiceStatus{
RunningTasks: running,
DesiredTasks: desired,
}
}
}
func makeSwarmService(t *testing.T, service, id string, opts ...func(*swarm.Service)) swarm.Service {
t.Helper() t.Helper()
s := swarm.Service{ options := []func(*swarm.Service){ServiceID(id), ServiceName(name), ServiceImage("image")}
ID: id, options = append(options, opts...)
Spec: swarm.ServiceSpec{ return *Service(options...)
Annotations: swarm.Annotations{
Name: service,
},
TaskTemplate: swarm.TaskSpec{
ContainerSpec: &swarm.ContainerSpec{
Image: "image",
},
},
},
}
for _, o := range opts {
o(&s)
}
return s
} }