deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

actually use normalizeNetworkNames to produce valid network names (#1393)

Browse Source
This commit is contained in:
exokortex 2021-07-07 08:29:03 +02:00 committed by GitHub
parent 0b331d9e5d
commit c51d59566b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/loader/compose/compose_test.go
View File

@ -453,7 +453,7 @@ func TestNormalizeNetworkNames(t *testing.T) {
composeNetworkName string
normalizedNetworkName string
}{
{"foo_bar", "foobar"},
{"foo_bar", "foo-bar"},
{"foo", "foo"},
{"FOO", "foo"},
{"foo.bar", "foo.bar"},

2
pkg/loader/compose/utils.go
View File

@ -151,7 +151,7 @@ func normalizeVolumes(svcName string) string {
}
func normalizeNetworkNames(netName string) (string, error) {
netval := strings.ToLower(netName)
netval := strings.ToLower(strings.Replace(netName, "_", "-", -1))
regString := ("[^A-Za-z0-9.-]+")
reg, err := regexp.Compile(regString)
if err != nil {

9
pkg/loader/compose/v1v2.go
View File

@ -256,7 +256,14 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose
if len(composeServiceConfig.Networks.Networks) > 0 {
for _, value := range composeServiceConfig.Networks.Networks {
if value.Name != "default" {
serviceConfig.Network = append(serviceConfig.Network, value.RealName)
nomalizedNetworkName, err := normalizeNetworkNames(value.RealName)
if err != nil {
return kobject.KomposeObject{}, errors.Wrap(err, "Error trying to normalize network names")
}
if nomalizedNetworkName != value.RealName {
log.Warnf("Network name in docker-compose has been changed from %q to %q", value.RealName, nomalizedNetworkName)
}
serviceConfig.Network = append(serviceConfig.Network, nomalizedNetworkName)
}
}
}