You've already forked dcmerge
Compare commits
1 Commits
v0.4.2
...
747e46aa18
| Author | SHA1 | Date | |
|---|---|---|---|
747e46aa18
|
20
.drone.yml
20
.drone.yml
@ -67,7 +67,7 @@ steps:
|
||||
- name: unit-test
|
||||
commands:
|
||||
- go test -v ./...
|
||||
image: docker.io/library/golang:1.24.0
|
||||
image: docker.io/library/golang:1.23.6
|
||||
|
||||
trigger:
|
||||
event:
|
||||
@ -92,7 +92,7 @@ steps:
|
||||
- name: unit-test
|
||||
commands:
|
||||
- go test -v ./...
|
||||
image: docker.io/library/golang:1.24.0
|
||||
image: docker.io/library/golang:1.23.6
|
||||
|
||||
trigger:
|
||||
event:
|
||||
@ -123,7 +123,7 @@ steps:
|
||||
image: git.cryptic.systems/volker.raschek/git:1.4.0
|
||||
|
||||
- name: build
|
||||
image: docker.io/plugins/docker:20.18.7
|
||||
image: docker.io/plugins/docker:20.18.6
|
||||
settings:
|
||||
auto_tag: false
|
||||
dockerfile: Dockerfile
|
||||
@ -190,7 +190,7 @@ steps:
|
||||
image: git.cryptic.systems/volker.raschek/git:1.4.0
|
||||
|
||||
- name: build
|
||||
image: docker.io/plugins/docker:20.18.7
|
||||
image: docker.io/plugins/docker:20.18.6
|
||||
settings:
|
||||
auto_tag: false
|
||||
dockerfile: Dockerfile
|
||||
@ -257,7 +257,7 @@ steps:
|
||||
image: git.cryptic.systems/volker.raschek/git:1.4.0
|
||||
|
||||
- name: build
|
||||
image: docker.io/plugins/docker:20.18.7
|
||||
image: docker.io/plugins/docker:20.18.6
|
||||
settings:
|
||||
auto_tag: false
|
||||
dockerfile: Dockerfile
|
||||
@ -322,7 +322,7 @@ steps:
|
||||
image: git.cryptic.systems/volker.raschek/git:1.4.0
|
||||
|
||||
- name: build
|
||||
image: docker.io/plugins/docker:20.18.7
|
||||
image: docker.io/plugins/docker:20.18.6
|
||||
settings:
|
||||
auto_tag: false
|
||||
dockerfile: Dockerfile
|
||||
@ -456,7 +456,7 @@ steps:
|
||||
from_secret: container_image_registry_user
|
||||
DEST_CRED_PASSWORD:
|
||||
from_secret: container_image_registry_password
|
||||
image: quay.io/skopeo/stable:v1.18.0
|
||||
image: quay.io/skopeo/stable:v1.17.0
|
||||
|
||||
- name: email-notification
|
||||
environment:
|
||||
@ -506,7 +506,7 @@ steps:
|
||||
image: git.cryptic.systems/volker.raschek/git:1.4.0
|
||||
|
||||
- name: build
|
||||
image: docker.io/plugins/docker:20.18.7
|
||||
image: docker.io/plugins/docker:20.18.6
|
||||
settings:
|
||||
auto_tag: true
|
||||
auto_tag_suffix: amd64
|
||||
@ -566,7 +566,7 @@ steps:
|
||||
image: git.cryptic.systems/volker.raschek/git:1.4.0
|
||||
|
||||
- name: build
|
||||
image: docker.io/plugins/docker:20.18.7
|
||||
image: docker.io/plugins/docker:20.18.6
|
||||
settings:
|
||||
auto_tag: true
|
||||
auto_tag_suffix: arm64-v8
|
||||
@ -696,7 +696,7 @@ steps:
|
||||
from_secret: container_image_registry_user
|
||||
DEST_CRED_PASSWORD:
|
||||
from_secret: container_image_registry_password
|
||||
image: quay.io/skopeo/stable:v1.18.0
|
||||
image: quay.io/skopeo/stable:v1.17.0
|
||||
|
||||
- name: email-notification
|
||||
environment:
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
||||
dcmerge
|
||||
coverage.txt
|
||||
dcmerge
|
||||
@ -8,7 +8,7 @@ import (
|
||||
"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
|
||||
"git.cryptic.systems/volker.raschek/dcmerge/pkg/fetcher"
|
||||
"github.com/spf13/cobra"
|
||||
"gopkg.in/yaml.v3"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
func Execute(version string) error {
|
||||
@ -18,7 +18,7 @@ func Execute(version string) error {
|
||||
Long: "To load completions",
|
||||
DisableFlagsInUseLine: true,
|
||||
ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
|
||||
Args: cobra.MatchAll(cobra.ExactArgs(1)),
|
||||
Args: cobra.ExactValidArgs(1),
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
switch args[0] {
|
||||
case "bash":
|
||||
@ -100,12 +100,10 @@ func run(cmd *cobra.Command, args []string) error {
|
||||
defer f.Close()
|
||||
|
||||
yamlEncoder := yaml.NewEncoder(f)
|
||||
yamlEncoder.SetIndent(2)
|
||||
return yamlEncoder.Encode(dockerComposeConfig)
|
||||
|
||||
default:
|
||||
yamlEncoder := yaml.NewEncoder(os.Stdout)
|
||||
yamlEncoder.SetIndent(2)
|
||||
return yamlEncoder.Encode(dockerComposeConfig)
|
||||
}
|
||||
|
||||
|
||||
7
go.mod
7
go.mod
@ -3,14 +3,15 @@ module git.cryptic.systems/volker.raschek/dcmerge
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/spf13/cobra v1.9.1
|
||||
github.com/spf13/cobra v1.8.1
|
||||
github.com/stretchr/testify v1.10.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/spf13/pflag v1.0.6 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
12
go.sum
12
go.sum
@ -1,4 +1,4 @@
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||
@ -6,13 +6,15 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
|
||||
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
|
||||
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
|
||||
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
|
||||
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
|
||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
@ -2,10 +2,7 @@ package dockerCompose
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -71,36 +68,24 @@ func (c *Config) ExistsVolume(name string) bool {
|
||||
func (c *Config) Merge(config *Config) {
|
||||
for name, network := range config.Networks {
|
||||
if !c.ExistsNetwork(name) {
|
||||
if c.Networks == nil {
|
||||
c.Networks = make(map[string]*Network)
|
||||
}
|
||||
c.Networks[name] = network
|
||||
}
|
||||
}
|
||||
|
||||
for name, secret := range config.Secrets {
|
||||
if !c.ExistsSecret(name) {
|
||||
if c.Secrets == nil {
|
||||
c.Secrets = make(map[string]*Secret)
|
||||
}
|
||||
c.Secrets[name] = secret
|
||||
}
|
||||
}
|
||||
|
||||
for name, service := range config.Services {
|
||||
if !c.ExistsService(name) {
|
||||
if c.Services == nil {
|
||||
c.Services = make(map[string]*Service)
|
||||
}
|
||||
c.Services[name] = service
|
||||
}
|
||||
}
|
||||
|
||||
for name, volume := range config.Volumes {
|
||||
if !c.ExistsVolume(name) {
|
||||
if c.Volumes == nil {
|
||||
c.Volumes = make(map[string]*Volume)
|
||||
}
|
||||
c.Volumes[name] = volume
|
||||
}
|
||||
}
|
||||
@ -531,19 +516,19 @@ func NewSecret() *Secret {
|
||||
}
|
||||
|
||||
type Service struct {
|
||||
CapabilitiesAdd []string `json:"cap_add,omitempty" yaml:"cap_add,omitempty"`
|
||||
CapabilitiesDrop []string `json:"cap_drop,omitempty" yaml:"cap_drop,omitempty"`
|
||||
DependsOnContainer *DependsOnContainer `json:"depends_on,omitempty" yaml:"depends_on,omitempty"`
|
||||
Deploy *ServiceDeploy `json:"deploy,omitempty" yaml:"deploy,omitempty"`
|
||||
Environments []string `json:"environment,omitempty" yaml:"environment,omitempty"`
|
||||
ExtraHosts []string `json:"extra_hosts,omitempty" yaml:"extra_hosts,omitempty"`
|
||||
Image string `json:"image,omitempty" yaml:"image,omitempty"`
|
||||
Labels []string `json:"labels,omitempty" yaml:"labels,omitempty"`
|
||||
Networks map[string]*ServiceNetwork `json:"networks,omitempty" yaml:"networks,omitempty"`
|
||||
Ports []Port `json:"ports,omitempty" yaml:"ports,omitempty"`
|
||||
Secrets []string `json:"secrets,omitempty" yaml:"secrets,omitempty"`
|
||||
ULimits *ServiceULimits `json:"ulimits,omitempty" yaml:"ulimits,omitempty"`
|
||||
Volumes []string `json:"volumes,omitempty" yaml:"volumes,omitempty"`
|
||||
CapabilitiesAdd []string `json:"cap_add,omitempty" yaml:"cap_add,omitempty"`
|
||||
CapabilitiesDrop []string `json:"cap_drop,omitempty" yaml:"cap_drop,omitempty"`
|
||||
DependsOn []string `json:"depends_on,omitempty" yaml:"depends_on,omitempty"`
|
||||
Deploy *ServiceDeploy `json:"deploy,omitempty" yaml:"deploy,omitempty"`
|
||||
Environments []string `json:"environment,omitempty" yaml:"environment,omitempty"`
|
||||
ExtraHosts []string `json:"extra_hosts,omitempty" yaml:"extra_hosts,omitempty"`
|
||||
Image string `json:"image,omitempty" yaml:"image,omitempty"`
|
||||
Labels []string `json:"labels,omitempty" yaml:"labels,omitempty"`
|
||||
Networks map[string]*ServiceNetwork `json:"networks,omitempty" yaml:"networks,omitempty"`
|
||||
Ports []string `json:"ports,omitempty" yaml:"ports,omitempty"`
|
||||
Secrets []string `json:"secrets,omitempty" yaml:"secrets,omitempty"`
|
||||
ULimits *ServiceULimits `json:"ulimits,omitempty" yaml:"ulimits,omitempty"`
|
||||
Volumes []string `json:"volumes,omitempty" yaml:"volumes,omitempty"`
|
||||
}
|
||||
|
||||
// ExistsEnvironment returns true if the passed name of environment variable is
|
||||
@ -571,22 +556,39 @@ func (s *Service) ExistsLabel(name string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// ExistsPort returns true if the port definition is already present. The port defines a mapping between the host system
|
||||
// port and the container port. It is also possible to specify the individual ip address of the host system or the
|
||||
// container. Additionally, the protocol can be specified as suffix.
|
||||
//
|
||||
// // Example
|
||||
// s := new(Service)
|
||||
// b := s.ExistsPort("80:80")
|
||||
// b = s.ExistsPort("0.0.0.0:80:80/tcp")
|
||||
// b = s.ExistsPort("0.0.0.0:80:80/tcp")
|
||||
// b = s.ExistsPort("192.168.178.10:80:172.25.18.20:80/tcp")
|
||||
func (s *Service) ExistsPort(port string) bool {
|
||||
for _, p := range s.Ports {
|
||||
if string(p) == port {
|
||||
// ExistsPort returns true if the port definition is already present.
|
||||
func (s *Service) ExistsPort(src string, dest string, protocol string) bool {
|
||||
for _, port := range s.Ports {
|
||||
s, d, p := splitStringInPort(port)
|
||||
if s == src && d == dest && p == protocol {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// ExistsDestinationPort returns true if the destination port is already used.
|
||||
func (s *Service) ExistsDestinationPort(dest string) bool {
|
||||
for _, port := range s.Ports {
|
||||
_, d, _ := splitStringInPort(port)
|
||||
if d == dest {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// ExistsSourcePort returns true if the source port is already used.
|
||||
func (s *Service) ExistsSourcePort(src string) bool {
|
||||
for _, port := range s.Ports {
|
||||
s, _, _ := splitStringInPort(port)
|
||||
if s == src {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@ -643,7 +645,7 @@ func (s *Service) Equal(equalable Equalable) bool {
|
||||
default:
|
||||
return equalSlice(s.CapabilitiesAdd, service.CapabilitiesAdd) &&
|
||||
equalSlice(s.CapabilitiesDrop, service.CapabilitiesDrop) &&
|
||||
s.DependsOnContainer.Equal(service.DependsOnContainer) &&
|
||||
equalSlice(s.DependsOn, service.DependsOn) &&
|
||||
s.Deploy.Equal(service.Deploy) &&
|
||||
equalSlice(s.Environments, service.Environments) &&
|
||||
equalSlice(s.ExtraHosts, service.ExtraHosts) &&
|
||||
@ -675,7 +677,7 @@ func (s *Service) MergeExistingWin(service *Service) {
|
||||
default:
|
||||
s.mergeExistingWinCapabilitiesAdd(service.CapabilitiesAdd)
|
||||
s.mergeExistingWinCapabilitiesDrop(service.CapabilitiesDrop)
|
||||
s.mergeExistingWinDependsOnContainer(service.DependsOnContainer)
|
||||
s.mergeExistingWinDependsOn(service.DependsOn)
|
||||
s.mergeExistingWinDeploy(service.Deploy)
|
||||
s.mergeExistingWinEnvironments(service.Environments)
|
||||
s.mergeExistingWinExtraHosts(service.ExtraHosts)
|
||||
@ -709,7 +711,7 @@ func (s *Service) MergeLastWin(service *Service) {
|
||||
default:
|
||||
s.mergeLastWinCapabilitiesAdd(service.CapabilitiesAdd)
|
||||
s.mergeLastWinCapabilitiesDrop(service.CapabilitiesDrop)
|
||||
s.mergeLastWinDependsOnContainer(service.DependsOnContainer)
|
||||
s.mergeLastWinDependsOn(service.DependsOn)
|
||||
s.mergeLastWinDeploy(service.Deploy)
|
||||
s.mergeLastWinEnvironments(service.Environments)
|
||||
s.mergeLastWinExtraHosts(service.ExtraHosts)
|
||||
@ -739,22 +741,10 @@ func (s *Service) mergeExistingWinCapabilitiesDrop(capabilitiesDrop []string) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) mergeExistingWinDependsOnContainer(dependsOnContainer *DependsOnContainer) {
|
||||
switch {
|
||||
case s.DependsOnContainer != nil && dependsOnContainer == nil:
|
||||
fallthrough
|
||||
case s.DependsOnContainer == nil && dependsOnContainer == nil:
|
||||
return
|
||||
case s.DependsOnContainer == nil && dependsOnContainer != nil:
|
||||
s.DependsOnContainer = dependsOnContainer
|
||||
default:
|
||||
for name, depOn := range dependsOnContainer.DependsOn {
|
||||
if !ExistsInMap(s.DependsOnContainer.DependsOn, name) && depOn != nil {
|
||||
if s.DependsOnContainer.DependsOn == nil {
|
||||
s.DependsOnContainer.DependsOn = make(map[string]*ServiceDependsOn)
|
||||
}
|
||||
s.DependsOnContainer.DependsOn[name] = depOn
|
||||
}
|
||||
func (s *Service) mergeExistingWinDependsOn(dependsOn []string) {
|
||||
for _, depOn := range dependsOn {
|
||||
if !existsInSlice(s.DependsOn, depOn) && len(depOn) > 0 {
|
||||
s.DependsOn = append(s.DependsOn, depOn)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -856,7 +846,7 @@ func (s *Service) mergeExistingWinNetworks(networks map[string]*ServiceNetwork)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) mergeExistingWinPorts(ports []Port) {
|
||||
func (s *Service) mergeExistingWinPorts(ports []string) {
|
||||
switch {
|
||||
case s.Ports == nil && ports != nil:
|
||||
s.Ports = ports
|
||||
@ -865,33 +855,15 @@ func (s *Service) mergeExistingWinPorts(ports []Port) {
|
||||
case s.Ports == nil && ports == nil:
|
||||
return
|
||||
default:
|
||||
LOOP:
|
||||
for i := range ports {
|
||||
if len(ports[i]) <= 0 {
|
||||
continue LOOP
|
||||
for _, port := range ports {
|
||||
if len(port) <= 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
newPort := Port(ports[i])
|
||||
|
||||
for j := range s.Ports {
|
||||
existingPort := Port(s.Ports[j])
|
||||
switch {
|
||||
case newPort.existsSrcIP() && existingPort.existsSrcIP() &&
|
||||
newPort.getSrc() == existingPort.getSrc():
|
||||
continue LOOP
|
||||
case !newPort.existsSrcIP() && existingPort.existsSrcIP() &&
|
||||
newPort.getSrcPort() == existingPort.getSrcPort():
|
||||
continue LOOP
|
||||
case newPort.existsSrcIP() && !existingPort.existsSrcIP() &&
|
||||
newPort.getSrcPort() == existingPort.getSrcPort():
|
||||
continue LOOP
|
||||
case !newPort.existsSrcIP() && !existingPort.existsSrcIP() &&
|
||||
newPort.getSrcPort() == existingPort.getSrcPort():
|
||||
continue LOOP
|
||||
}
|
||||
src, dest, protocol := splitStringInPort(port)
|
||||
if !s.ExistsDestinationPort(dest) {
|
||||
s.SetPort(src, dest, protocol)
|
||||
}
|
||||
|
||||
s.Ports = append(s.Ports, ports[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -959,20 +931,14 @@ func (s *Service) mergeLastWinCapabilitiesDrop(capabilitiesDrop []string) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) mergeLastWinDependsOnContainer(dependsOnContainer *DependsOnContainer) {
|
||||
switch {
|
||||
case s.DependsOnContainer != nil && dependsOnContainer == nil:
|
||||
fallthrough
|
||||
case s.DependsOnContainer == nil && dependsOnContainer == nil:
|
||||
return
|
||||
case s.DependsOnContainer == nil && dependsOnContainer != nil:
|
||||
s.DependsOnContainer = dependsOnContainer
|
||||
default:
|
||||
for name, depOn := range dependsOnContainer.DependsOn {
|
||||
if s.DependsOnContainer.DependsOn == nil {
|
||||
s.DependsOnContainer.DependsOn = make(map[string]*ServiceDependsOn)
|
||||
}
|
||||
s.DependsOnContainer.DependsOn[name] = depOn
|
||||
func (s *Service) mergeLastWinDependsOn(dependsOn []string) {
|
||||
for _, dep := range dependsOn {
|
||||
if len(dep) <= 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
if !existsInSlice(s.DependsOn, dep) {
|
||||
s.DependsOn = append(s.DependsOn, dep)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1076,7 +1042,7 @@ func (s *Service) mergeLastWinNetworks(networks map[string]*ServiceNetwork) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) mergeLastWinPorts(ports []Port) {
|
||||
func (s *Service) mergeLastWinPorts(ports []string) {
|
||||
switch {
|
||||
case s.Ports == nil && ports != nil:
|
||||
s.Ports = ports
|
||||
@ -1085,11 +1051,13 @@ func (s *Service) mergeLastWinPorts(ports []Port) {
|
||||
case s.Ports == nil && ports == nil:
|
||||
return
|
||||
default:
|
||||
for i := range ports {
|
||||
if len(ports[i]) <= 0 {
|
||||
for _, port := range ports {
|
||||
if len(port) <= 0 {
|
||||
continue
|
||||
}
|
||||
s.SetPort(string(ports[i]))
|
||||
|
||||
src, dest, protocol := splitStringInPort(port)
|
||||
s.SetPort(src, dest, protocol)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1152,7 +1120,8 @@ func (s *Service) RemoveEnvironment(name string) {
|
||||
s.Environments = environments
|
||||
}
|
||||
|
||||
// RemoveLabel remove all found labels from the internal slice matching by the passed name.
|
||||
// RemoveLabel remove all found labels from the internal slice matching by the
|
||||
// passed name.
|
||||
func (s *Service) RemoveLabel(name string) {
|
||||
labels := make([]string, 0)
|
||||
for _, label := range s.Labels {
|
||||
@ -1164,47 +1133,25 @@ func (s *Service) RemoveLabel(name string) {
|
||||
s.Labels = labels
|
||||
}
|
||||
|
||||
// RemovePortByDst remove all found ports from the internal slice matching by the passed destination. The destination
|
||||
// can contains only the destination port, but also the destination ip address.
|
||||
//
|
||||
// // Example
|
||||
// s := new(Service)
|
||||
// s.RemovePortByDst("8080")
|
||||
// s.RemovePortByDst("172.25.18.20:8080")
|
||||
func (s *Service) RemovePortByDst(dest string) {
|
||||
ports := make([]Port, 0)
|
||||
// RemovePort remove all found ports from the internal slice matching by the
|
||||
// passed dest port.
|
||||
func (s *Service) RemovePort(dest string) {
|
||||
ports := make([]string, 0)
|
||||
for _, port := range s.Ports {
|
||||
srcPort, destPort, protocol := splitStringInPort(port)
|
||||
|
||||
switch {
|
||||
case port.getDst() == dest:
|
||||
continue
|
||||
default:
|
||||
ports = append(ports, port)
|
||||
case destPort == dest && len(protocol) <= 0:
|
||||
s.Ports = append(s.Ports, fmt.Sprintf("%s%s%s", srcPort, portDelimiter, destPort))
|
||||
case destPort == dest && len(protocol) > 0:
|
||||
s.Ports = append(s.Ports, fmt.Sprintf("%s%s%s%s%s", srcPort, portDelimiter, destPort, portProtocolDelimiter, protocol))
|
||||
}
|
||||
}
|
||||
s.Ports = ports
|
||||
}
|
||||
|
||||
// RemovePortBySrc remove all found ports from the internal slice matching by the passed source. The source can contains
|
||||
// only the source port, but also the source ip address.
|
||||
//
|
||||
// // Example
|
||||
// s := new(Service)
|
||||
// s.RemovePortBySrc("8080")
|
||||
// s.RemovePortBySrc("192.168.178.10:8080")
|
||||
func (s *Service) RemovePortBySrc(src string) {
|
||||
ports := make([]Port, 0)
|
||||
for _, port := range s.Ports {
|
||||
switch {
|
||||
case port.getSrc() == src:
|
||||
continue
|
||||
default:
|
||||
ports = append(ports, port)
|
||||
}
|
||||
}
|
||||
s.Ports = ports
|
||||
}
|
||||
|
||||
// RemoveVolume remove all found volumes from the internal slice matching by the dest path.
|
||||
// RemoveVolume remove all found volumes from the internal slice matching by the
|
||||
// dest path.
|
||||
func (s *Service) RemoveVolume(dest string) {
|
||||
volumes := make([]string, 0)
|
||||
for _, volume := range s.Volumes {
|
||||
@ -1232,16 +1179,14 @@ func (s *Service) SetLabel(name string, value string) {
|
||||
s.Labels = append(s.Labels, fmt.Sprintf("%s%s%s", name, labelDelimiter, value))
|
||||
}
|
||||
|
||||
// SetPort add or overwrite an existing source port.
|
||||
//
|
||||
// // Example
|
||||
// s := new(Service)
|
||||
// s.SetPort("0.0.0.0:443:172.25.18.20:8443/tcp") // Add new port
|
||||
// s.SetPort("0.0.0.0:443:10.254.611.66:443/tcp") // Overwrite port determined by source port
|
||||
func (s *Service) SetPort(port string) {
|
||||
newPort := Port(port)
|
||||
s.RemovePortBySrc(newPort.getSrc())
|
||||
s.Ports = append(s.Ports, newPort)
|
||||
// SetPort add or overwrite an existing port.
|
||||
func (s *Service) SetPort(src string, dest string, protocol string) {
|
||||
s.RemovePort(dest)
|
||||
if len(protocol) <= 0 {
|
||||
s.Ports = append(s.Ports, fmt.Sprintf("%s%s%s", src, volumeDelimiter, dest))
|
||||
} else {
|
||||
s.Ports = append(s.Ports, fmt.Sprintf("%s%s%s%s%s", src, portDelimiter, dest, portProtocolDelimiter, protocol))
|
||||
}
|
||||
}
|
||||
|
||||
// SetVolume add or overwrite an existing volume.
|
||||
@ -1254,88 +1199,6 @@ func (s *Service) SetVolume(src string, dest string, perm string) {
|
||||
}
|
||||
}
|
||||
|
||||
const (
|
||||
ServiceDependsOnConditionServiceCompletedSuccessfully string = "service_completed_successfully"
|
||||
ServiceDependsOnConditionServiceHealthy string = "service_healthy"
|
||||
ServiceDependsOnConditionServiceStarted string = "service_started"
|
||||
)
|
||||
|
||||
// DependsOnContainer is a wrapper to handle different YAML type formats of DependsOn.
|
||||
type DependsOnContainer struct {
|
||||
Slice []string
|
||||
DependsOn map[string]*ServiceDependsOn
|
||||
}
|
||||
|
||||
// Equal returns true if the passed equalable is equal
|
||||
func (sdoc *DependsOnContainer) Equal(equalable Equalable) bool {
|
||||
serviceDependsOnContainer, ok := equalable.(*DependsOnContainer)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
|
||||
switch {
|
||||
case sdoc == nil && serviceDependsOnContainer == nil:
|
||||
return true
|
||||
case sdoc != nil && serviceDependsOnContainer == nil:
|
||||
fallthrough
|
||||
case sdoc == nil && serviceDependsOnContainer != nil:
|
||||
return false
|
||||
default:
|
||||
return equalSlice(sdoc.Slice, serviceDependsOnContainer.Slice) &&
|
||||
EqualStringMap(sdoc.DependsOn, serviceDependsOnContainer.DependsOn)
|
||||
}
|
||||
}
|
||||
|
||||
// MarshalYAML implements the MarshalYAML interface to customize the behavior when being marshaled into a YAML document.
|
||||
func (sdoc *DependsOnContainer) MarshalYAML() (interface{}, error) {
|
||||
var foundAnotherCondition bool = false
|
||||
var dependencyNames []string
|
||||
|
||||
for dependencyName, dependencyDefinition := range sdoc.DependsOn {
|
||||
if dependencyDefinition.Condition == ServiceDependsOnConditionServiceStarted {
|
||||
dependencyNames = append(dependencyNames, dependencyName)
|
||||
continue
|
||||
}
|
||||
foundAnotherCondition = true
|
||||
}
|
||||
|
||||
switch {
|
||||
case foundAnotherCondition:
|
||||
return sdoc.DependsOn, nil
|
||||
case !foundAnotherCondition && len(dependencyNames) > 0:
|
||||
return dependencyNames, nil
|
||||
default:
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
|
||||
// UnmarshalYAML implements the UnmarshalYAML interface to customize the behavior when being unmarshaled into a YAML
|
||||
// document.
|
||||
func (sdoc *DependsOnContainer) UnmarshalYAML(value *yaml.Node) error {
|
||||
if sdoc.DependsOn == nil {
|
||||
sdoc.DependsOn = make(map[string]*ServiceDependsOn)
|
||||
}
|
||||
|
||||
if sdoc.Slice == nil {
|
||||
sdoc.Slice = make([]string, 0)
|
||||
}
|
||||
|
||||
if err := value.Decode(&sdoc.Slice); err == nil {
|
||||
for _, s := range sdoc.Slice {
|
||||
sdoc.DependsOn[s] = &ServiceDependsOn{
|
||||
Condition: ServiceDependsOnConditionServiceStarted,
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := value.Decode(sdoc.DependsOn); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// NewService returns an empty initialized Service.
|
||||
func NewService() *Service {
|
||||
return &Service{
|
||||
@ -1346,38 +1209,13 @@ func NewService() *Service {
|
||||
ExtraHosts: make([]string, 0),
|
||||
Labels: make([]string, 0),
|
||||
Networks: make(map[string]*ServiceNetwork),
|
||||
Ports: make([]Port, 0),
|
||||
Ports: make([]string, 0),
|
||||
Secrets: make([]string, 0),
|
||||
ULimits: new(ServiceULimits),
|
||||
Volumes: make([]string, 0),
|
||||
}
|
||||
}
|
||||
|
||||
type ServiceDependsOn struct {
|
||||
Condition string `yaml:"condition,omitempty"`
|
||||
Restart string `yaml:"restart,omitempty"`
|
||||
}
|
||||
|
||||
// Equal returns true if the passed equalable is equal
|
||||
func (sdo *ServiceDependsOn) Equal(equalable Equalable) bool {
|
||||
serviceDependsOn, ok := equalable.(*ServiceDependsOn)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
|
||||
switch {
|
||||
case sdo == nil && serviceDependsOn == nil:
|
||||
return true
|
||||
case sdo != nil && serviceDependsOn == nil:
|
||||
fallthrough
|
||||
case sdo == nil && serviceDependsOn != nil:
|
||||
return false
|
||||
default:
|
||||
return sdo.Condition == serviceDependsOn.Condition &&
|
||||
sdo.Restart == serviceDependsOn.Restart
|
||||
}
|
||||
}
|
||||
|
||||
type ServiceDeploy struct {
|
||||
Resources *ServiceDeployResources `json:"resources" yaml:"resources"`
|
||||
}
|
||||
@ -2059,7 +1897,7 @@ func (v *Volume) MergeLastWin(volume *Volume) {
|
||||
}
|
||||
}
|
||||
|
||||
func (v *Volume) mergeExistingWinExternal(_ bool) {
|
||||
func (v *Volume) mergeExistingWinExternal(external bool) {
|
||||
if v.External {
|
||||
return
|
||||
}
|
||||
@ -2112,35 +1950,17 @@ func splitStringInKeyValue(s, sep string) (string, string) {
|
||||
return key, value
|
||||
}
|
||||
|
||||
// splitStringInPortMapping parses a string and returns the src, dest port including an optional protocol.
|
||||
//
|
||||
// // Example
|
||||
// s, d, p := splitStringInPortMapping("80:80/tcp")
|
||||
// // Output: "80" "80" "tcp"
|
||||
// s, d, p := splitStringInPortMapping("0.0.0.0:80:80/tcp")
|
||||
// // Output: "0.0.0.0:80" "80" "tcp"
|
||||
//
|
||||
// Deprecated: Instead of using the splitStringInPortMapping function, use the method of the type Port{}.
|
||||
func splitStringInPortMapping(s string) (string, string, string) {
|
||||
p := Port(s)
|
||||
func splitStringInPort(s string) (string, string, string) {
|
||||
parts := strings.Split(s, portDelimiter)
|
||||
src := parts[0]
|
||||
rest := parts[1]
|
||||
|
||||
var src string
|
||||
switch {
|
||||
case p.existsSrcIP() && p.existsSrcPort():
|
||||
src = fmt.Sprintf("%s:%s", p.getSrcIP(), p.getSrcPort())
|
||||
case !p.existsSrcIP():
|
||||
src = p.getSrcPort()
|
||||
parts = strings.Split(rest, portProtocolDelimiter)
|
||||
if len(parts) == 2 {
|
||||
return src, parts[0], parts[1]
|
||||
}
|
||||
|
||||
var dst string
|
||||
switch {
|
||||
case p.existsDstIP() && p.existsDstPort():
|
||||
dst = fmt.Sprintf("%s:%s", p.getDstIP(), p.getDstPort())
|
||||
case !p.existsDstIP():
|
||||
dst = p.getDstPort()
|
||||
}
|
||||
|
||||
return src, dst, p.getProtocol()
|
||||
return src, parts[0], ""
|
||||
}
|
||||
|
||||
func splitStringInVolume(s string) (string, string, string) {
|
||||
@ -2153,131 +1973,3 @@ func splitStringInVolume(s string) (string, string, string) {
|
||||
}
|
||||
return src, dest, ""
|
||||
}
|
||||
|
||||
var (
|
||||
regExpPort = regexp.MustCompile(`^((?<srcIP>([\d]{1,3}\.){3}[\d]{1,3}):)?(?<srcPort>[\d]{1,5}):((?<dstIP>([\d]{1,3}\.){3}[\d]{1,3}):)?(?<dstPort>[\d]{1,5})(\/(?<protocol>[a-z]*))?$`)
|
||||
)
|
||||
|
||||
type Port string
|
||||
|
||||
// existsDstPort returns true, if the port string contains a trailing destination port definition.
|
||||
func (p Port) existsDstPort() bool {
|
||||
return len(p.getDstPort()) > 0
|
||||
}
|
||||
|
||||
// existsDstIP returns true, if the port string contains a trailing destination ip definition.
|
||||
func (p Port) existsDstIP() bool {
|
||||
return len(p.getDstIP()) > 0
|
||||
}
|
||||
|
||||
// existsProtocol returns true, if the port string contains a protocol definition.
|
||||
func (p Port) existsProtocol() bool {
|
||||
return len(p.getProtocol()) > 0
|
||||
}
|
||||
|
||||
// existsSrcIP returns true, if the port string contains a leading src ip definition.
|
||||
func (p Port) existsSrcIP() bool {
|
||||
return len(p.getSrcIP()) > 0
|
||||
}
|
||||
|
||||
// existsSrcPort returns true, if the port string contains a leading src port definition.
|
||||
func (p Port) existsSrcPort() bool {
|
||||
return len(p.getSrcPort()) > 0
|
||||
}
|
||||
|
||||
// getDst returns the concatenation of the destination ip and port. If the destination ip is empty, only the port will
|
||||
// be returned.
|
||||
func (p Port) getDst() string {
|
||||
switch {
|
||||
case p.existsDstIP():
|
||||
return fmt.Sprintf("%s%s%s", p.getDstIP(), portDelimiter, p.getDstPort())
|
||||
default:
|
||||
return p.getDstPort()
|
||||
}
|
||||
}
|
||||
|
||||
// getSrcIP returns the destination ip, if the port string contains a destination ip definition.
|
||||
func (p Port) getDstIP() string {
|
||||
matches := regExpPort.FindStringSubmatch(string(p))
|
||||
i := regExpPort.SubexpIndex("dstIP")
|
||||
|
||||
switch {
|
||||
case len(matches) <= 0:
|
||||
return ""
|
||||
case i < 0:
|
||||
return ""
|
||||
}
|
||||
|
||||
return matches[i]
|
||||
}
|
||||
|
||||
// getSrcPort returns the destination port, if the port string contains an destination port definition.
|
||||
func (p Port) getDstPort() string {
|
||||
matches := regExpPort.FindStringSubmatch(string(p))
|
||||
i := regExpPort.SubexpIndex("dstPort")
|
||||
|
||||
switch {
|
||||
case len(matches) <= 0:
|
||||
return ""
|
||||
case i < 0:
|
||||
return ""
|
||||
}
|
||||
|
||||
return matches[i]
|
||||
}
|
||||
|
||||
// getProtocol returns the protocol, if the port string contains a protocol definition.
|
||||
func (p Port) getProtocol() string {
|
||||
matches := regExpPort.FindStringSubmatch(string(p))
|
||||
i := regExpPort.SubexpIndex("protocol")
|
||||
|
||||
switch {
|
||||
case len(matches) <= 0:
|
||||
return ""
|
||||
case i < 0:
|
||||
return ""
|
||||
}
|
||||
|
||||
return matches[i]
|
||||
}
|
||||
|
||||
// getSrc returns the concatenation of the source ip and port. If the source ip is empty, only the port will be
|
||||
// returned.
|
||||
func (p Port) getSrc() string {
|
||||
switch {
|
||||
case p.existsSrcIP():
|
||||
return fmt.Sprintf("%s%s%s", p.getSrcIP(), portDelimiter, p.getSrcPort())
|
||||
default:
|
||||
return p.getSrcPort()
|
||||
}
|
||||
}
|
||||
|
||||
// getSrcIP returns the source ip, if the port string contains an src ip definition.
|
||||
func (p Port) getSrcIP() string {
|
||||
matches := regExpPort.FindStringSubmatch(string(p))
|
||||
i := regExpPort.SubexpIndex("srcIP")
|
||||
|
||||
switch {
|
||||
case len(matches) <= 0:
|
||||
return ""
|
||||
case i < 0:
|
||||
return ""
|
||||
}
|
||||
|
||||
return matches[i]
|
||||
}
|
||||
|
||||
// getSrcPort returns the source port, if the port string contains an src port definition.
|
||||
func (p Port) getSrcPort() string {
|
||||
matches := regExpPort.FindStringSubmatch(string(p))
|
||||
i := regExpPort.SubexpIndex("srcPort")
|
||||
|
||||
switch {
|
||||
case len(matches) <= 0:
|
||||
return ""
|
||||
case i < 0:
|
||||
return ""
|
||||
}
|
||||
|
||||
return matches[i]
|
||||
}
|
||||
|
||||
@ -1,418 +0,0 @@
|
||||
package dockerCompose
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func Test_splitStringInPortMapping(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s string
|
||||
expectedSrc string
|
||||
expectedDst string
|
||||
expectedProtocol string
|
||||
}{
|
||||
{
|
||||
s: "53:53",
|
||||
expectedSrc: "53",
|
||||
expectedDst: "53",
|
||||
expectedProtocol: "",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53",
|
||||
expectedSrc: "0.0.0.0:53",
|
||||
expectedDst: "53",
|
||||
expectedProtocol: "",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:10.11.12.13:53",
|
||||
expectedSrc: "0.0.0.0:53",
|
||||
expectedDst: "10.11.12.13:53",
|
||||
expectedProtocol: "",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:10.11.12.13:53/tcp",
|
||||
expectedSrc: "0.0.0.0:53",
|
||||
expectedDst: "10.11.12.13:53",
|
||||
expectedProtocol: "tcp",
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
actualSrc, actualDst, actualProtocol := splitStringInPortMapping(testCase.s)
|
||||
require.Equal(testCase.expectedSrc, actualSrc, "TestCase %v", i)
|
||||
require.Equal(testCase.expectedDst, actualDst, "TestCase %v", i)
|
||||
require.Equal(testCase.expectedProtocol, actualProtocol, "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPort_DstIP(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s string
|
||||
expectedBool bool
|
||||
expectedString string
|
||||
}{
|
||||
{
|
||||
s: "",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53/tcp",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53/udp",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
|
||||
{
|
||||
s: "0.0.0.0:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:0.0.0.0:53",
|
||||
expectedBool: true,
|
||||
expectedString: "0.0.0.0",
|
||||
},
|
||||
{
|
||||
s: "53:0.0.0.0:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "0.0.0.0",
|
||||
},
|
||||
{
|
||||
s: "53:0.0.0.0:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "0.0.0.0",
|
||||
},
|
||||
|
||||
{
|
||||
s: "10.11.12.13:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:10.11.12.13:53",
|
||||
expectedBool: true,
|
||||
expectedString: "10.11.12.13",
|
||||
},
|
||||
{
|
||||
s: "53:10.11.12.13:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "10.11.12.13",
|
||||
},
|
||||
{
|
||||
s: "53:10.11.12.13:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "10.11.12.13",
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
p := Port(testCase.s)
|
||||
require.Equal(testCase.expectedBool, p.existsDstIP(), "TestCase %v", i)
|
||||
require.Equal(testCase.expectedString, p.getDstIP(), "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPort_DstPort(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s string
|
||||
expectedBool bool
|
||||
expectedString string
|
||||
}{
|
||||
{
|
||||
s: "",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
|
||||
{
|
||||
s: "53:0.0.0.0:53",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:0.0.0.0:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:0.0.0.0:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
|
||||
{
|
||||
s: "53:10.11.12.13:53",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:10.11.12.13:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:10.11.12.13:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
p := Port(testCase.s)
|
||||
require.Equal(testCase.expectedBool, p.existsDstPort(), "TestCase %v", i)
|
||||
require.Equal(testCase.expectedString, p.getDstPort(), "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPort_Protocol(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s string
|
||||
expectedBool bool
|
||||
expectedString string
|
||||
}{
|
||||
{
|
||||
s: "0",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53/tcp",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53/udp",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "tcp",
|
||||
},
|
||||
{
|
||||
s: "53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "udp",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "tcp",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "udp",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "tcp",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:11.12.13.14:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "tcp",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:11.12.13.14:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "udp",
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
p := Port(testCase.s)
|
||||
require.Equal(testCase.expectedBool, p.existsProtocol(), "TestCase %v", i)
|
||||
require.Equal(testCase.expectedString, p.getProtocol(), "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPort_SrcIP(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s string
|
||||
expectedBool bool
|
||||
expectedString string
|
||||
}{
|
||||
{
|
||||
s: "",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53/tcp",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53/udp",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
|
||||
{
|
||||
s: "0.0.0.0:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53",
|
||||
expectedBool: true,
|
||||
expectedString: "0.0.0.0",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "0.0.0.0",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "0.0.0.0",
|
||||
},
|
||||
|
||||
{
|
||||
s: "10.11.12.13:53",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "10.11.12.13:53:53",
|
||||
expectedBool: true,
|
||||
expectedString: "10.11.12.13",
|
||||
},
|
||||
{
|
||||
s: "10.11.12.13:53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "10.11.12.13",
|
||||
},
|
||||
{
|
||||
s: "10.11.12.13:53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "10.11.12.13",
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
p := Port(testCase.s)
|
||||
require.Equal(testCase.expectedBool, p.existsSrcIP(), "TestCase %v", i)
|
||||
require.Equal(testCase.expectedString, p.getSrcIP(), "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPort_SrcPort(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s string
|
||||
expectedBool bool
|
||||
expectedString string
|
||||
}{
|
||||
{
|
||||
s: "",
|
||||
expectedBool: false,
|
||||
expectedString: "",
|
||||
},
|
||||
{
|
||||
s: "53:53",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
|
||||
{
|
||||
s: "0.0.0.0:53:53",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "0.0.0.0:53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
|
||||
{
|
||||
s: "10.11.12.13:53:53",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "10.11.12.13:53:53/tcp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
{
|
||||
s: "10.11.12.13:53:53/udp",
|
||||
expectedBool: true,
|
||||
expectedString: "53",
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
p := Port(testCase.s)
|
||||
require.Equal(testCase.expectedBool, p.existsSrcPort(), "TestCase %v", i)
|
||||
require.Equal(testCase.expectedString, p.getSrcPort(), "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
@ -1,90 +1,12 @@
|
||||
package dockerCompose_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"embed"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
|
||||
"github.com/stretchr/testify/require"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
//go:embed test/assets/merge
|
||||
var testAssetsMerge embed.FS
|
||||
|
||||
func TestConfig_Merge(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testAssetPath := "test/assets/merge"
|
||||
|
||||
testAssetMergeDirEntries, err := testAssetsMerge.ReadDir(testAssetPath)
|
||||
require.NoError(err)
|
||||
|
||||
// iterate over testcase directories
|
||||
for i, mergeDirEntry := range testAssetMergeDirEntries {
|
||||
if !mergeDirEntry.IsDir() {
|
||||
continue
|
||||
}
|
||||
|
||||
// iterate over files in testcase directories
|
||||
testCaseAssetPath := testAssetPath + "/" + mergeDirEntry.Name()
|
||||
testCaseDirEntries, err := testAssetsMerge.ReadDir(testCaseAssetPath)
|
||||
require.NoError(err)
|
||||
|
||||
expectedDockerComposeConfig := &dockerCompose.Config{}
|
||||
dockerComposeConfigs := []*dockerCompose.Config{}
|
||||
for _, testCaseDirEntry := range testCaseDirEntries {
|
||||
if testCaseDirEntry.IsDir() {
|
||||
continue
|
||||
}
|
||||
|
||||
dockerComposeConfigFile := testAssetPath + "/" + mergeDirEntry.Name() + "/" + testCaseDirEntry.Name()
|
||||
b, err := testAssetsMerge.ReadFile(dockerComposeConfigFile)
|
||||
require.NoError(err)
|
||||
yamlDecoder := yaml.NewDecoder(bytes.NewReader(b))
|
||||
|
||||
switch {
|
||||
case strings.HasPrefix(testCaseDirEntry.Name(), "expectedResult"):
|
||||
err = yamlDecoder.Decode(expectedDockerComposeConfig)
|
||||
require.NoError(err)
|
||||
case strings.HasSuffix(testCaseDirEntry.Name(), ".yml") || strings.HasSuffix(testCaseDirEntry.Name(), ".yaml"):
|
||||
dockerComposeConfig := &dockerCompose.Config{}
|
||||
err = yamlDecoder.Decode(dockerComposeConfig)
|
||||
require.NoError(err)
|
||||
dockerComposeConfigs = append(dockerComposeConfigs, dockerComposeConfig)
|
||||
}
|
||||
}
|
||||
|
||||
actualDockerComposeConfig := &dockerCompose.Config{}
|
||||
for _, dockerComposeConfig := range dockerComposeConfigs {
|
||||
actualDockerComposeConfig.Merge(dockerComposeConfig)
|
||||
}
|
||||
|
||||
expectedBytes := make([]byte, 0)
|
||||
expectedBytesBuffer := bytes.NewBuffer(expectedBytes)
|
||||
yamlEncoder := yaml.NewEncoder(expectedBytesBuffer)
|
||||
err = yamlEncoder.Encode(expectedDockerComposeConfig)
|
||||
require.NoError(err)
|
||||
|
||||
err = yamlEncoder.Close()
|
||||
require.NoError(err)
|
||||
|
||||
actualBytes := make([]byte, 0)
|
||||
actualBytesBuffer := bytes.NewBuffer(actualBytes)
|
||||
yamlEncoder = yaml.NewEncoder(actualBytesBuffer)
|
||||
err = yamlEncoder.Encode(actualDockerComposeConfig)
|
||||
require.NoError(err)
|
||||
|
||||
err = yamlEncoder.Close()
|
||||
require.NoError(err)
|
||||
|
||||
require.Equal(expectedBytesBuffer.String(), actualBytesBuffer.String(), "TestCase %v", i)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestNetwork_Equal(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
@ -301,34 +223,34 @@ func TestService_Equal(t *testing.T) {
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
CapabilitiesAdd: []string{},
|
||||
CapabilitiesDrop: []string{},
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
Deploy: nil,
|
||||
Environments: []string{},
|
||||
ExtraHosts: []string{},
|
||||
Image: "",
|
||||
Labels: []string{},
|
||||
Networks: map[string]*dockerCompose.ServiceNetwork{},
|
||||
Ports: []dockerCompose.Port{},
|
||||
Secrets: []string{},
|
||||
ULimits: nil,
|
||||
Volumes: []string{},
|
||||
CapabilitiesAdd: []string{},
|
||||
CapabilitiesDrop: []string{},
|
||||
DependsOn: []string{},
|
||||
Deploy: nil,
|
||||
Environments: []string{},
|
||||
ExtraHosts: []string{},
|
||||
Image: "",
|
||||
Labels: []string{},
|
||||
Networks: map[string]*dockerCompose.ServiceNetwork{},
|
||||
Ports: []string{},
|
||||
Secrets: []string{},
|
||||
ULimits: nil,
|
||||
Volumes: []string{},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
CapabilitiesAdd: []string{},
|
||||
CapabilitiesDrop: []string{},
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
Deploy: nil,
|
||||
Environments: []string{},
|
||||
ExtraHosts: []string{},
|
||||
Image: "",
|
||||
Labels: []string{},
|
||||
Networks: map[string]*dockerCompose.ServiceNetwork{},
|
||||
Ports: []dockerCompose.Port{},
|
||||
Secrets: []string{},
|
||||
ULimits: nil,
|
||||
Volumes: []string{},
|
||||
CapabilitiesAdd: []string{},
|
||||
CapabilitiesDrop: []string{},
|
||||
DependsOn: []string{},
|
||||
Deploy: nil,
|
||||
Environments: []string{},
|
||||
ExtraHosts: []string{},
|
||||
Image: "",
|
||||
Labels: []string{},
|
||||
Networks: map[string]*dockerCompose.ServiceNetwork{},
|
||||
Ports: []string{},
|
||||
Secrets: []string{},
|
||||
ULimits: nil,
|
||||
Volumes: []string{},
|
||||
},
|
||||
expectedResult: true,
|
||||
},
|
||||
@ -370,74 +292,19 @@ func TestService_Equal(t *testing.T) {
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{Slice: []string{"app"}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: nil,
|
||||
DependsOn: []string{},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{Slice: []string{"app"}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{Slice: []string{"app"}},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{Slice: []string{}},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{Slice: []string{"app"}},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{Slice: []string{"app"}},
|
||||
},
|
||||
expectedResult: true,
|
||||
},
|
||||
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{}},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
expectedResult: true,
|
||||
},
|
||||
@ -551,19 +418,19 @@ func TestService_Equal(t *testing.T) {
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/tcp"},
|
||||
Ports: []string{"80:80/tcp"},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/tcp"},
|
||||
Ports: []string{"80:80/tcp"},
|
||||
},
|
||||
expectedResult: true,
|
||||
},
|
||||
{
|
||||
equalableA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/tcp"},
|
||||
Ports: []string{"80:80/tcp"},
|
||||
},
|
||||
equalableB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/udp"},
|
||||
Ports: []string{"80:80/udp"},
|
||||
},
|
||||
expectedResult: false,
|
||||
},
|
||||
@ -731,46 +598,46 @@ func TestService_MergeExistingWin(t *testing.T) {
|
||||
// DependsOn
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
DependsOn: []string{},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
DependsOn: []string{},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: nil,
|
||||
DependsOn: []string{""},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
|
||||
@ -1241,13 +1108,13 @@ func TestService_MergeExistingWin(t *testing.T) {
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: nil,
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
},
|
||||
{
|
||||
@ -1255,102 +1122,65 @@ func TestService_MergeExistingWin(t *testing.T) {
|
||||
Ports: nil,
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:8080"},
|
||||
Ports: []string{"10080:80"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/tcp"},
|
||||
Ports: []string{"80:80/tcp"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/tcp"},
|
||||
Ports: []string{"80:80/tcp"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/udp"},
|
||||
Ports: []string{"10080:80/udp"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"0.0.0.0:6300:6300/tcp"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
"0.0.0.0:6300:6300/tcp",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"15005:15005",
|
||||
},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
},
|
||||
|
||||
@ -1715,46 +1545,46 @@ func TestService_MergeLastWin(t *testing.T) {
|
||||
// DependsOn
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
DependsOn: []string{},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{},
|
||||
DependsOn: []string{},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
DependsOnContainer: nil,
|
||||
DependsOn: []string{""},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
DependsOnContainer: &dockerCompose.DependsOnContainer{DependsOn: map[string]*dockerCompose.ServiceDependsOn{"app": {Condition: "service_started"}}},
|
||||
DependsOn: []string{"app"},
|
||||
},
|
||||
},
|
||||
|
||||
@ -2186,13 +2016,13 @@ func TestService_MergeLastWin(t *testing.T) {
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: nil,
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
},
|
||||
{
|
||||
@ -2200,113 +2030,76 @@ func TestService_MergeLastWin(t *testing.T) {
|
||||
Ports: nil,
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{},
|
||||
Ports: []string{},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:10080"},
|
||||
Ports: []string{"10080:80"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:10080"},
|
||||
Ports: []string{"10080:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/tcp"},
|
||||
Ports: []string{"80:80/tcp"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/udp"},
|
||||
Ports: []string{"10080:80/udp"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80/udp"},
|
||||
Ports: []string{"10080:80/udp"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{""},
|
||||
Ports: []string{""},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"80:80"},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"0.0.0.0:6300:6300/tcp"},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
"0.0.0.0:6300:6300/tcp",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
serviceDeploymentA: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:5005/tcp",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
},
|
||||
},
|
||||
serviceDeploymentB: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:15005",
|
||||
},
|
||||
},
|
||||
expectedService: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:15005:15005",
|
||||
"0.0.0.0:18080:8080/tcp",
|
||||
},
|
||||
Ports: []string{"80:80"},
|
||||
},
|
||||
},
|
||||
|
||||
@ -2579,203 +2372,6 @@ func TestService_MergeLastWin(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestService_RemovePortByDst(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s *dockerCompose.Service
|
||||
removePortsByDst []string
|
||||
expectedPorts []dockerCompose.Port
|
||||
}{
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"0.0.0.0:443:172.25.18.20:443/tcp",
|
||||
"10.11.12.13:53:53/tcp",
|
||||
"10.11.12.13:53:53/udp",
|
||||
},
|
||||
},
|
||||
removePortsByDst: []string{
|
||||
"53",
|
||||
},
|
||||
expectedPorts: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"0.0.0.0:443:172.25.18.20:443/tcp",
|
||||
},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"0.0.0.0:443:172.25.18.20:443/tcp",
|
||||
"10.11.12.13:53:53/tcp",
|
||||
"10.11.12.13:53:53/udp",
|
||||
},
|
||||
},
|
||||
removePortsByDst: []string{
|
||||
"172.25.18.20:443",
|
||||
},
|
||||
expectedPorts: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"10.11.12.13:53:53/tcp",
|
||||
"10.11.12.13:53:53/udp",
|
||||
},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:443:443/tcp",
|
||||
},
|
||||
},
|
||||
removePortsByDst: []string{
|
||||
"443",
|
||||
},
|
||||
expectedPorts: []dockerCompose.Port{},
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
for _, removePortByDst := range testCase.removePortsByDst {
|
||||
testCase.s.RemovePortByDst(removePortByDst)
|
||||
}
|
||||
require.Equal(testCase.expectedPorts, testCase.s.Ports, "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestService_RemovePortBySrc(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s *dockerCompose.Service
|
||||
removePortsBySrc []string
|
||||
expectedPorts []dockerCompose.Port
|
||||
}{
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"0.0.0.0:443:172.25.18.20:443/tcp",
|
||||
"10.11.12.13:53:53/tcp",
|
||||
"10.11.12.13:53:53/udp",
|
||||
},
|
||||
},
|
||||
removePortsBySrc: []string{
|
||||
"10.11.12.13:53",
|
||||
},
|
||||
expectedPorts: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"0.0.0.0:443:172.25.18.20:443/tcp",
|
||||
},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"0.0.0.0:443:172.25.18.20:443/tcp",
|
||||
"10.11.12.13:53:53/tcp",
|
||||
"10.11.12.13:53:53/udp",
|
||||
},
|
||||
},
|
||||
removePortsBySrc: []string{
|
||||
"0.0.0.0:443",
|
||||
},
|
||||
expectedPorts: []dockerCompose.Port{
|
||||
"80:80/tcp",
|
||||
"10.11.12.13:53:53/tcp",
|
||||
"10.11.12.13:53:53/udp",
|
||||
},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{
|
||||
"0.0.0.0:443:443/tcp",
|
||||
},
|
||||
},
|
||||
removePortsBySrc: []string{
|
||||
"0.0.0.0:443",
|
||||
},
|
||||
expectedPorts: []dockerCompose.Port{},
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
for _, removePortBySrc := range testCase.removePortsBySrc {
|
||||
testCase.s.RemovePortBySrc(removePortBySrc)
|
||||
}
|
||||
require.Equal(testCase.expectedPorts, testCase.s.Ports, "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestService_SetPort(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
testCases := []struct {
|
||||
s *dockerCompose.Service
|
||||
setPorts []string
|
||||
expectedPorts []dockerCompose.Port
|
||||
}{
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"8080:8080"},
|
||||
},
|
||||
setPorts: []string{},
|
||||
expectedPorts: []dockerCompose.Port{"8080:8080"},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"8080:8080"},
|
||||
},
|
||||
setPorts: []string{"8080:8080"},
|
||||
expectedPorts: []dockerCompose.Port{"8080:8080"},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"8080:8080"},
|
||||
},
|
||||
setPorts: []string{"8080:80"},
|
||||
expectedPorts: []dockerCompose.Port{"8080:80"},
|
||||
},
|
||||
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"0.0.0.0:8080:8080"},
|
||||
},
|
||||
setPorts: []string{},
|
||||
expectedPorts: []dockerCompose.Port{"0.0.0.0:8080:8080"},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"0.0.0.0:8080:8080"},
|
||||
},
|
||||
setPorts: []string{"0.0.0.0:8080:8080"},
|
||||
expectedPorts: []dockerCompose.Port{"0.0.0.0:8080:8080"},
|
||||
},
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"0.0.0.0:8080:8080"},
|
||||
},
|
||||
setPorts: []string{"0.0.0.0:8080:80"},
|
||||
expectedPorts: []dockerCompose.Port{"0.0.0.0:8080:80"},
|
||||
},
|
||||
|
||||
{
|
||||
s: &dockerCompose.Service{
|
||||
Ports: []dockerCompose.Port{"0.0.0.0:8080:8080", "0.0.0.0:8443:8443"},
|
||||
},
|
||||
setPorts: []string{"0.0.0.0:8080:80"},
|
||||
expectedPorts: []dockerCompose.Port{"0.0.0.0:8080:80", "0.0.0.0:8443:8443"},
|
||||
},
|
||||
}
|
||||
|
||||
for i, testCase := range testCases {
|
||||
for _, setPort := range testCase.setPorts {
|
||||
testCase.s.SetPort(setPort)
|
||||
}
|
||||
require.ElementsMatch(testCase.expectedPorts, testCase.s.Ports, "TestCase %v", i)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretDeploy_Equal(t *testing.T) {
|
||||
require := require.New(t)
|
||||
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
services:
|
||||
frontend:
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_started
|
||||
image: library/frontend:latest
|
||||
@ -1,3 +0,0 @@
|
||||
services:
|
||||
backend:
|
||||
image: library/backend:latest
|
||||
@ -1,7 +0,0 @@
|
||||
services:
|
||||
backend:
|
||||
image: library/backend:latest
|
||||
frontend:
|
||||
depends_on:
|
||||
- backend
|
||||
image: library/frontend:latest
|
||||
@ -1,5 +0,0 @@
|
||||
services:
|
||||
frontend:
|
||||
depends_on:
|
||||
- backend
|
||||
image: library/frontend:latest
|
||||
@ -1,3 +0,0 @@
|
||||
services:
|
||||
backend:
|
||||
image: library/backend:latest
|
||||
@ -1,7 +0,0 @@
|
||||
services:
|
||||
backend:
|
||||
image: library/backend:latest
|
||||
frontend:
|
||||
depends_on:
|
||||
- backend
|
||||
image: library/frontend:latest
|
||||
@ -1,6 +0,0 @@
|
||||
services:
|
||||
frontend:
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_completed_successfully
|
||||
image: library/frontend:latest
|
||||
@ -1,3 +0,0 @@
|
||||
services:
|
||||
backend:
|
||||
image: library/backend:latest
|
||||
@ -1,8 +0,0 @@
|
||||
services:
|
||||
backend:
|
||||
image: library/backend:latest
|
||||
frontend:
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_completed_successfully
|
||||
image: library/frontend:latest
|
||||
@ -8,7 +8,7 @@ import (
|
||||
"os"
|
||||
|
||||
"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
|
||||
"gopkg.in/yaml.v3"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
func Fetch(urls ...string) ([]*dockerCompose.Config, error) {
|
||||
|
||||
@ -23,14 +23,6 @@
|
||||
"automerge": true,
|
||||
"matchManagers": [ "gomod" ],
|
||||
"matchUpdateTypes": [ "minor", "patch" ]
|
||||
},
|
||||
{
|
||||
"description": "Disable major update version of go modules",
|
||||
"enabled": false,
|
||||
"matchManagers": [ "gomod" ],
|
||||
"matchPackageNames": [
|
||||
"gopkg.in/yaml.v2"
|
||||
]
|
||||
}
|
||||
],
|
||||
"postUpdateOptions": [
|
||||
|
||||
Reference in New Issue
Block a user