Fix linter warnings

Cornelius Weig · Cornelius Weig · commit be87076627fd · 2019-03-25T14:04:56.000+01:00
diff --git a/pkg/ketall/filter/filter.go b/pkg/ketall/filter/filter.go
@@ -43,7 +43,7 @@ func ApplyFilter(o runtime.Object) runtime.Object {
 		return o
 	}
 
-	filtered, err := FilterByPredicate(o, predicate)
+	filtered, err := ByPredicate(o, predicate)
 	if err != nil {
 		logrus.Warnf("%s", errors.Wrapf(err, "filtering failed"))
 		return o
@@ -52,7 +52,7 @@ func ApplyFilter(o runtime.Object) runtime.Object {
 	return filtered
 }
 
-func FilterByPredicate(o runtime.Object, p Predicate) (runtime.Object, error) {
+func ByPredicate(o runtime.Object, p Predicate) (runtime.Object, error) {
 	if !meta.IsListType(o) {
 		if p(o) {
 			return o, nil
@@ -67,7 +67,7 @@ func FilterByPredicate(o runtime.Object, p Predicate) (runtime.Object, error) {
 
 	var items []runtime.Object
 	for _, item := range allItems {
-		item, err := FilterByPredicate(item, p)
+		item, err := ByPredicate(item, p)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/ketall/filter/filter_test.go b/pkg/ketall/filter/filter_test.go
@@ -18,13 +18,14 @@ package filter
 
 import (
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/corneliusweig/ketall/pkg/ketall/util"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"testing"
-	"time"
 )
 
 type FakeV1Obj struct {
@@ -76,7 +77,7 @@ func TestFilterByPredicate(t *testing.T) {
 
 			predicate, _ := AgePredicate(test.humanDuration)
 
-			filtered, err := FilterByPredicate(util.ToV1List(givenObjs), predicate)
+			filtered, err := ByPredicate(util.ToV1List(givenObjs), predicate)
 			actualObjs, _ := meta.ExtractList(filtered)
 			assert.NoError(t, err)
 			assert.Equal(t, test.expectedNames, toNames(actualObjs))
diff --git a/pkg/ketall/util/util.go b/pkg/ketall/util/util.go
@@ -17,7 +17,7 @@ limitations under the License.
 package util
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`package util`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "k8s.io/api/core/v1"`
	`20`	`+ v1 "k8s.io/api/core/v1"`
`21`	`21`	`"k8s.io/apimachinery/pkg/runtime"`
`22`	`22`	`)`
`23`	`23`