feat: use filters for -only-exposed / -only-published

Author: buchdag

cmd/docker-gen/main.go

@@ -180,8 +180,6 @@ func main() {
 			NotifyCmd:        notifyCmd,
 			NotifyOutput:     notifyOutput,
 			NotifyContainers: make(map[string]int),
-			OnlyExposed:      onlyExposed,
-			OnlyPublished:    onlyPublished,
 			ContainerFilter:  containerFilter,
 			Interval:         interval,
 			KeepBlankLines:   keepBlankLines,
@@ -196,8 +194,25 @@ func main() {
 			cfg.NotifyContainersFilter = notifyContainerFilter
 			cfg.NotifyContainersSignal = notifyContainerSignal
 		}
-		if len(containerFilter) == 0 && !includeStopped {
-			cfg.ContainerFilter = map[string][]string{"status": {"running"}}
+		if len(cfg.ContainerFilter["status"]) == 0 {
+			if includeStopped {
+				cfg.ContainerFilter["status"] = []string{
+					"created",
+					"restarting",
+					"running",
+					"removing",
+					"paused",
+					"exited",
+					"dead",
+				}
+			} else {
+				cfg.ContainerFilter["status"] = []string{"running"}
+			}
+		}
+		if onlyPublished && len(cfg.ContainerFilter["publish"]) == 0 {
+			cfg.ContainerFilter["publish"] = []string{"1-65535"}
+		} else if onlyExposed && len(cfg.ContainerFilter["expose"]) == 0 {
+			cfg.ContainerFilter["expose"] = []string{"1-65535"}
 		}
 		configs = config.ConfigFile{
 			Config: []config.Config{cfg},

internal/config/config.go

@@ -16,8 +16,6 @@ type Config struct {
 	NotifyContainers       map[string]int
 	NotifyContainersFilter map[string][]string
 	NotifyContainersSignal int
-	OnlyExposed            bool
-	OnlyPublished          bool
 	ContainerFilter        map[string][]string
 	Interval               int
 	KeepBlankLines         bool

internal/context/context.go

@@ -105,16 +105,6 @@ func (r *RuntimeContainer) Equals(o RuntimeContainer) bool {
 	return r.ID == o.ID && r.Image == o.Image
 }
 
-func (r *RuntimeContainer) PublishedAddresses() []Address {
-	mapped := []Address{}
-	for _, address := range r.Addresses {
-		if address.HostPort != "" {
-			mapped = append(mapped, address)
-		}
-	}
-	return mapped
-}
-
 type DockerImage struct {
 	Registry   string
 	Repository string

internal/context/context_test.go

@@ -132,37 +132,6 @@ func TestGetCurrentContainerEmpty(t *testing.T) {
 	assert.Equal(t, "", GetCurrentContainerID())
 }
 
-func TestPublishedAddresses(t *testing.T) {
-	container := &RuntimeContainer{
-		Addresses: []Address{
-			{
-				IP:       "172.19.0.1",
-				HostPort: "80",
-			},
-			{
-				IP: "172.19.0.2",
-			},
-			{
-				IP:       "172.19.0.3",
-				HostPort: "8080",
-			},
-		},
-	}
-
-	expected := []Address{
-		{
-			IP:       "172.19.0.1",
-			HostPort: "80",
-		},
-		{
-			IP:       "172.19.0.3",
-			HostPort: "8080",
-		},
-	}
-
-	assert.ElementsMatch(t, expected, container.PublishedAddresses())
-}
-
 func TestRuntimeContainerEquals(t *testing.T) {
 	rc1 := &RuntimeContainer{
 		ID: "baz",

internal/generator/generator_test.go

@@ -206,7 +206,7 @@ func TestGenerateFromEvents(t *testing.T) {
 	//          │ start │            │ stop │             │ start │
 	//          └───────┘            └──────┘             └───────┘
 
-	expectedCounters := []int{1, 5, 6, 7}
+	expectedCounters := []int{1, 8, 9, 10}
 
 	for i, counter := range expectedCounters {
 		value, _ = os.ReadFile(destFiles[i].Name())

internal/template/template.go

@@ -150,24 +150,7 @@ func removeBlankLines(reader io.Reader, writer io.Writer) {
 }
 
 func GenerateFile(config config.Config, containers context.Context) bool {
-	filteredContainers := context.Context{}
-	if config.OnlyPublished {
-		for _, container := range containers {
-			if len(container.PublishedAddresses()) > 0 {
-				filteredContainers = append(filteredContainers, container)
-			}
-		}
-	} else if config.OnlyExposed {
-		for _, container := range containers {
-			if len(container.Addresses) > 0 {
-				filteredContainers = append(filteredContainers, container)
-			}
-		}
-	} else {
-		filteredContainers = containers
-	}
-
-	contents := executeTemplate(config.Template, filteredContainers)
+	contents := executeTemplate(config.Template, containers)
 
 	if !config.KeepBlankLines {
 		buf := new(bytes.Buffer)
@@ -186,8 +169,7 @@ func GenerateFile(config config.Config, containers context.Context) bool {
 			if err != nil {
 				log.Fatalf("Unable to write to dest file %s: %s\n", config.Dest, err)
 			}
-
-			log.Printf("Generated '%s' from %d containers", config.Dest, len(filteredContainers))
+			log.Printf("Generated '%s' from %d containers", config.Dest, len(containers))
 			return true
 		}
 		return false