prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused filter ContainerHandlers.

Browse Source
This commit is contained in:
Victor Marmol 2014-09-17 15:42:26 -07:00
parent b63d61ca97
commit c326475ede
2 changed files with 0 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
container/filter.go
View File

@ -1,97 +0,0 @@
// Copyright 2014 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package container
import (
"strings"
"github.com/google/cadvisor/info"
)
type containerListFilter struct {
filter func(string) bool
handler ContainerHandler
}
func (self *containerListFilter) ContainerReference() (info.ContainerReference, error) {
return self.handler.ContainerReference()
}
func (self *containerListFilter) GetSpec() (*info.ContainerSpec, error) {
return self.handler.GetSpec()
}
func (self *containerListFilter) GetStats() (*info.ContainerStats, error) {
return self.handler.GetStats()
}
func (self *containerListFilter) ListContainers(listType ListType) ([]info.ContainerReference, error) {
containers, err := self.handler.ListContainers(listType)
if err != nil {
return nil, err
}
if len(containers) == 0 {
return nil, nil
}
ret := make([]info.ContainerReference, 0, len(containers))
for _, c := range containers {
if self.filter(c.Name) {
ret = append(ret, c)
}
}
return ret, nil
}
func (self *containerListFilter) ListThreads(listType ListType) ([]int, error) {
return self.handler.ListThreads(listType)
}
func (self *containerListFilter) ListProcesses(listType ListType) ([]int, error) {
return self.handler.ListProcesses(listType)
}
func (self *containerListFilter) WatchSubcontainers(events chan SubcontainerEvent) error {
return self.handler.WatchSubcontainers(events)
}
func NewWhiteListFilter(handler ContainerHandler, acceptedPaths ...string) ContainerHandler {
filter := func(p string) bool {
for _, path := range acceptedPaths {
if strings.HasPrefix(p, path) {
return true
}
}
return false
}
return &containerListFilter{
filter: filter,
handler: handler,
}
}
func NewBlackListFilter(handler ContainerHandler, forbiddenPaths ...string) ContainerHandler {
filter := func(p string) bool {
for _, path := range forbiddenPaths {
if strings.HasPrefix(p, path) {
return false
}
}
return true
}
return &containerListFilter{
filter: filter,
handler: handler,
}
}

127
container/filter_test.go
View File

@ -1,127 +0,0 @@
// Copyright 2014 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package container
import (
"strings"
"testing"
"github.com/google/cadvisor/info"
"github.com/stretchr/testify/mock"
)
type mockContainerHandler struct {
mock.Mock
}
func (self *mockContainerHandler) GetSpec() (*info.ContainerSpec, error) {
args := self.Called()
return args.Get(0).(*info.ContainerSpec), args.Error(1)
}
func (self *mockContainerHandler) ContainerReference() (info.ContainerReference, error) {
args := self.Called()
return args.Get(0).(info.ContainerReference), args.Error(1)
}
func (self *mockContainerHandler) GetStats() (*info.ContainerStats, error) {
args := self.Called()
return args.Get(0).(*info.ContainerStats), args.Error(1)
}
func (self *mockContainerHandler) ListContainers(listType ListType) ([]info.ContainerReference, error) {
args := self.Called(listType)
return args.Get(0).([]info.ContainerReference), args.Error(1)
}
func (self *mockContainerHandler) ListThreads(listType ListType) ([]int, error) {
args := self.Called(listType)
return args.Get(0).([]int), args.Error(1)
}
func (self *mockContainerHandler) ListProcesses(listType ListType) ([]int, error) {
args := self.Called(listType)
return args.Get(0).([]int), args.Error(1)
}
func TestWhiteListContainerFilter(t *testing.T) {
mockc := &mockContainerHandler{}
mockc.On("ListContainers", LIST_RECURSIVE).Return(
[]info.ContainerReference{
{Name: "/docker/ee0103"},
{Name: "/container/created/by/lmctfy"},
{Name: "/user/something"},
},
nil,
)
filterPaths := []string{
"/docker",
"/container",
}
fc := NewWhiteListFilter(mockc, filterPaths...)
containers, err := fc.ListContainers(LIST_RECURSIVE)
if err != nil {
t.Fatal(err)
}
for _, c := range containers {
legal := false
for _, prefix := range filterPaths {
if strings.HasPrefix(c.Name, prefix) {
legal = true
}
}
if !legal {
t.Errorf("%v is not in the white list", c)
}
}
mockc.AssertExpectations(t)
}
func TestBlackListContainerFilter(t *testing.T) {
mockc := &mockContainerHandler{}
mockc.On("ListContainers", LIST_RECURSIVE).Return(
[]info.ContainerReference{
{Name: "/docker/ee0103"},
{Name: "/container/created/by/lmctfy"},
{Name: "/user/something"},
},
nil,
)
filterPaths := []string{
"/docker",
"/container",
}
fc := NewBlackListFilter(mockc, filterPaths...)
containers, err := fc.ListContainers(LIST_RECURSIVE)
if err != nil {
t.Fatal(err)
}
for _, c := range containers {
legal := true
for _, prefix := range filterPaths {
if strings.HasPrefix(c.Name, prefix) {
legal = false
}
}
if !legal {
t.Errorf("%v is in the black list", c)
}
}
mockc.AssertExpectations(t)
}