fix: filter networks by gordon.managed label in addition to prefix
- commit
- 43d08175e67ba034bd8515412e4fbc423b8c9caf
- author
- brice · · 2026-03-14 03:46 UTC
- parent
- b9de1ae
- signature
- unsigned
2 files · +5 -3
M internal/usecase/container/routes_test.go +4 -2
| @@ -157,9 +157,10 @@ func TestService_ListNetworks(t *testing.T) { | |||
| 157 | 157 | ctx := testContext() | |
| 158 | 158 | ||
| 159 | 159 | runtime.EXPECT().ListNetworks(mock.Anything).Return([]*domain.NetworkInfo{ | |
| 160 | - | {Name: "gordon-app"}, | |
| 160 | + | {Name: "gordon-app", Labels: map[string]string{domain.LabelManaged: "true"}}, | |
| 161 | 161 | {Name: "bridge"}, | |
| 162 | - | {Name: "gordon-shared"}, | |
| 162 | + | {Name: "gordon-shared", Labels: map[string]string{domain.LabelManaged: "true"}}, | |
| 163 | + | {Name: "gordon-unmanaged"}, | |
| 163 | 164 | }, nil) | |
| 164 | 165 | ||
| 165 | 166 | networks, err := svc.ListNetworks(ctx) | |
| @@ -168,4 +169,5 @@ func TestService_ListNetworks(t *testing.T) { | |||
| 168 | 169 | assert.Len(t, networks, 2) | |
| 169 | 170 | assert.Equal(t, "gordon-app", networks[0].Name) | |
| 170 | 171 | assert.Equal(t, "gordon-shared", networks[1].Name) | |
| 172 | + | assert.NotContains(t, []string{networks[0].Name, networks[1].Name}, "gordon-unmanaged") | |
| 171 | 173 | } | |
| @@ -157,9 +157,10 @@ func TestService_ListNetworks(t *testing.T) { | |||||
| 157 | ctx := testContext() | 157 | ctx := testContext() | ||
| 158 | 158 | ||||
| 159 | runtime.EXPECT().ListNetworks(mock.Anything).Return([]*domain.NetworkInfo{ | 159 | runtime.EXPECT().ListNetworks(mock.Anything).Return([]*domain.NetworkInfo{ | ||
| 160 | - | {Name: "gordon-app"}, | 160 | + | {Name: "gordon-app", Labels: map[string]string{domain.LabelManaged: "true"}}, |
| 161 | {Name: "bridge"}, | 161 | {Name: "bridge"}, | ||
| 162 | - | {Name: "gordon-shared"}, | 162 | + | {Name: "gordon-shared", Labels: map[string]string{domain.LabelManaged: "true"}}, |
| 163 | + | {Name: "gordon-unmanaged"}, | |||
| 163 | }, nil) | 164 | }, nil) | ||
| 164 | 165 | ||||
| 165 | networks, err := svc.ListNetworks(ctx) | 166 | networks, err := svc.ListNetworks(ctx) | ||
| @@ -168,4 +169,5 @@ func TestService_ListNetworks(t *testing.T) { | |||||
| 168 | assert.Len(t, networks, 2) | 169 | assert.Len(t, networks, 2) | ||
| 169 | assert.Equal(t, "gordon-app", networks[0].Name) | 170 | assert.Equal(t, "gordon-app", networks[0].Name) | ||
| 170 | assert.Equal(t, "gordon-shared", networks[1].Name) | 171 | assert.Equal(t, "gordon-shared", networks[1].Name) | ||
| 172 | + | assert.NotContains(t, []string{networks[0].Name, networks[1].Name}, "gordon-unmanaged") | |||
| 171 | } | 173 | } | ||
M internal/usecase/container/service.go +1 -1
| @@ -1038,7 +1038,7 @@ func (s *Service) ListNetworks(ctx context.Context) ([]*domain.NetworkInfo, erro | |||
| 1038 | 1038 | ||
| 1039 | 1039 | var filtered []*domain.NetworkInfo | |
| 1040 | 1040 | for _, network := range networks { | |
| 1041 | - | if strings.HasPrefix(network.Name, cfg.NetworkPrefix+"-") { | |
| 1041 | + | if strings.HasPrefix(network.Name, cfg.NetworkPrefix+"-") && network.Labels[domain.LabelManaged] == "true" { | |
| 1042 | 1042 | filtered = append(filtered, network) | |
| 1043 | 1043 | } | |
| 1044 | 1044 | } | |
| @@ -1038,7 +1038,7 @@ func (s *Service) ListNetworks(ctx context.Context) ([]*domain.NetworkInfo, erro | |||||
| 1038 | 1038 | ||||
| 1039 | var filtered []*domain.NetworkInfo | 1039 | var filtered []*domain.NetworkInfo | ||
| 1040 | for _, network := range networks { | 1040 | for _, network := range networks { | ||
| 1041 | - | if strings.HasPrefix(network.Name, cfg.NetworkPrefix+"-") { | 1041 | + | if strings.HasPrefix(network.Name, cfg.NetworkPrefix+"-") && network.Labels[domain.LabelManaged] == "true" { |
| 1042 | filtered = append(filtered, network) | 1042 | filtered = append(filtered, network) | ||
| 1043 | } | 1043 | } | ||
| 1044 | } | 1044 | } | ||