use ImageName instead, add unit test for empty ImageName filter.

Author: Foxite

pkg/container/container.go

@@ -326,8 +326,3 @@ func (c Container) VerifyConfiguration() error {
 
 	return nil
 }
-
-// Image returns the image tag of the container as reported by the runtime config
-func (c Container) Image() string {
-	return c.runtimeConfig().Image
-}

pkg/container/mocks/FilterableContainer.go

@@ -79,8 +79,8 @@ func (_m *FilterableContainer) Scope() (string, bool) {
 	return r0, r1
 }
 
-// Image provides a mock function with given fields:
-func (_m *FilterableContainer) Image() string {
+// ImageName provides a mock function with given fields:
+func (_m *FilterableContainer) ImageName() string {
 	ret := _m.Called()
 
 	var r0 string

pkg/filters/filters.go

@@ -77,7 +77,7 @@ func FilterByImage(images []string, baseFilter t.Filter) t.Filter {
 	}
 
 	return func(c t.FilterableContainer) bool {
-		image := strings.Split(c.Image(), ":")[0]
+		image := strings.Split(c.ImageName(), ":")[0]
 		for _, targetImage := range images {
 			if image == targetImage {
 				return baseFilter(c)

pkg/filters/filters_test.go

@@ -111,31 +111,36 @@ func TestFilterByDisabledLabel(t *testing.T) {
 }
 
 func TestFilterByImage(t *testing.T) {
+	filterEmpty := FilterByImage(nil, NoFilter)
 	filterSingle := FilterByImage([]string{"registry"}, NoFilter)
 	filterMultiple := FilterByImage([]string{"registry", "bla"}, NoFilter)
 	assert.NotNil(t, filterSingle)
 	assert.NotNil(t, filterMultiple)
 
 	container := new(mocks.FilterableContainer)
-	container.On("Image").Return("registry:2")
+	container.On("ImageName").Return("registry:2")
+	assert.True(t, filterEmpty(container))
 	assert.True(t, filterSingle(container))
 	assert.True(t, filterMultiple(container))
 	container.AssertExpectations(t)
 
 	container = new(mocks.FilterableContainer)
-	container.On("Image").Return("registry:latest")
+	container.On("ImageName").Return("registry:latest")
+	assert.True(t, filterEmpty(container))
 	assert.True(t, filterSingle(container))
 	assert.True(t, filterMultiple(container))
 	container.AssertExpectations(t)
 
 	container = new(mocks.FilterableContainer)
-	container.On("Image").Return("abcdef1234")
+	container.On("ImageName").Return("abcdef1234")
+	assert.True(t, filterEmpty(container))
 	assert.False(t, filterSingle(container))
 	assert.False(t, filterMultiple(container))
 	container.AssertExpectations(t)
 
 	container = new(mocks.FilterableContainer)
-	container.On("Image").Return("bla:latest")
+	container.On("ImageName").Return("bla:latest")
+	assert.True(t, filterEmpty(container))
 	assert.False(t, filterSingle(container))
 	assert.True(t, filterMultiple(container))
 	container.AssertExpectations(t)

pkg/types/filterable_container.go

@@ -7,5 +7,5 @@ type FilterableContainer interface {
 	IsWatchtower() bool
 	Enabled() (bool, bool)
 	Scope() (string, bool)
-	Image() string
+	ImageName() string
 }