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

Allow to transform any source type into the target struct 

Signed-off-by: Mindaugas Rukas <momomg@gmail.com>
This commit is contained in:
Mindaugas Rukas 2018-10-02 14:00:11 +03:00
parent ea5f4c4984
commit 83fd688fa2
2 changed files with 88 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/compose/loader/loader.go
View File

@ -266,9 +266,9 @@ func getServices(configDict map[string]interface{}) map[string]interface{} {
return map[string]interface{}{}
}
// Transform converts the source map into the target struct with compose types transformer
// Transform converts the source into the target struct with compose types transformer
// and the specified transformers if any.
func Transform(source map[string]interface{}, target interface{}, additionalTransformers ...Transformer) error {
func Transform(source interface{}, target interface{}, additionalTransformers ...Transformer) error {
data := mapstructure.Metadata{}
config := &mapstructure.DecoderConfig{
DecodeHook: mapstructure.ComposeDecodeHookFunc(

148
cli/compose/loader/loader_test.go
View File

@ -115,6 +115,67 @@ var sampleDict = map[string]interface{}{
},
}
var samplePortsConfig = []types.ServicePortConfig{
{
Mode: "ingress",
Target: 8080,
Published: 80,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8081,
Published: 81,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8082,
Published: 82,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8090,
Published: 90,
Protocol: "udp",
},
{
Mode: "ingress",
Target: 8091,
Published: 91,
Protocol: "udp",
},
{
Mode: "ingress",
Target: 8092,
Published: 92,
Protocol: "udp",
},
{
Mode: "ingress",
Target: 8500,
Published: 85,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8600,
Published: 0,
Protocol: "tcp",
},
{
Target: 53,
Published: 10053,
Protocol: "udp",
},
{
Mode: "host",
Target: 22,
Published: 10022,
},
}
func strPtr(val string) *string {
return &val
}
@ -1038,69 +1099,8 @@ services:
`)
assert.NilError(t, err)
expected := []types.ServicePortConfig{
{
Mode: "ingress",
Target: 8080,
Published: 80,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8081,
Published: 81,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8082,
Published: 82,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8090,
Published: 90,
Protocol: "udp",
},
{
Mode: "ingress",
Target: 8091,
Published: 91,
Protocol: "udp",
},
{
Mode: "ingress",
Target: 8092,
Published: 92,
Protocol: "udp",
},
{
Mode: "ingress",
Target: 8500,
Published: 85,
Protocol: "tcp",
},
{
Mode: "ingress",
Target: 8600,
Published: 0,
Protocol: "tcp",
},
{
Target: 53,
Published: 10053,
Protocol: "udp",
},
{
Mode: "host",
Target: 22,
Published: 10022,
},
}
assert.Check(t, is.Len(config.Services, 1))
assert.Check(t, is.DeepEqual(expected, config.Services[0].Ports))
assert.Check(t, is.DeepEqual(samplePortsConfig, config.Services[0].Ports))
}
func TestLoadExpandedMountFormat(t *testing.T) {
@ -1460,3 +1460,27 @@ services:
})
}
}
func TestTransform(t *testing.T) {
var source = []interface{}{
"80-82:8080-8082",
"90-92:8090-8092/udp",
"85:8500",
8600,
map[string]interface{}{
"protocol": "udp",
"target": 53,
"published": 10053,
},
map[string]interface{}{
"mode": "host",
"target": 22,
"published": 10022,
},
}
var ports []types.ServicePortConfig
err := Transform(source, &ports)
assert.NilError(t, err)
assert.Check(t, is.DeepEqual(samplePortsConfig, ports))
}