Fix lint error.

Random-Liu · Random-Liu · commit b9cb0b217e0f · 2019-01-24T11:29:56.000-08:00
Signed-off-by: Lantao Liu &lt;lantaol@google.com&gt;
diff --git a/pkg/server/events.go b/pkg/server/events.go
@@ -106,11 +106,11 @@ func convertEvent(e *gogotypes.Any) (string, interface{}, error) {
 		return "", nil, errors.Wrap(err, "failed to unmarshalany")
 	}
 
-	switch evt.(type) {
+	switch e := evt.(type) {
 	case *eventtypes.TaskExit:
-		containerID = evt.(*eventtypes.TaskExit).ContainerID
+		containerID = e.ContainerID
 	case *eventtypes.TaskOOM:
-		containerID = evt.(*eventtypes.TaskOOM).ContainerID
+		containerID = e.ContainerID
 	default:
 		return "", nil, errors.New("unsupported event")
 	}
@@ -185,13 +185,12 @@ func (em *eventMonitor) stop() {
 // handleEvent handles a containerd event.
 func (em *eventMonitor) handleEvent(any interface{}) error {
 	ctx := ctrdutil.NamespacedContext()
-	switch any.(type) {
+	switch e := any.(type) {
 	// If containerd-shim exits unexpectedly, there will be no corresponding event.
 	// However, containerd could not retrieve container state in that case, so it's
 	// fine to leave out that case for now.
 	// TODO(random-liu): [P2] Handle containerd-shim exit.
 	case *eventtypes.TaskExit:
-		e := any.(*eventtypes.TaskExit)
 		cntr, err := em.containerStore.Get(e.ContainerID)
 		if err == nil {
 			if err := handleContainerExit(ctx, e, cntr); err != nil {
@@ -213,7 +212,6 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
 		}
 		return nil
 	case *eventtypes.TaskOOM:
-		e := any.(*eventtypes.TaskOOM)
 		logrus.Infof("TaskOOM event %+v", e)
 		cntr, err := em.containerStore.Get(e.ContainerID)
 		if err != nil {
diff --git a/pkg/util/strings.go b/pkg/util/strings.go
@@ -22,7 +22,7 @@ import "strings"
 // Comparison is case insensitive.
 func InStringSlice(ss []string, str string) bool {
 	for _, s := range ss {
-		if strings.ToLower(s) == strings.ToLower(str) {
+		if strings.EqualFold(s, str) {
 			return true
 		}
 	}
@@ -34,7 +34,7 @@ func InStringSlice(ss []string, str string) bool {
 func SubtractStringSlice(ss []string, str string) []string {
 	var res []string
 	for _, s := range ss {
-		if strings.ToLower(s) == strings.ToLower(str) {
+		if strings.EqualFold(s, str) {
 			continue
 		}
 		res = append(res, s)

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import "strings"`
`22`	`22`	`// Comparison is case insensitive.`
`23`	`23`	`func InStringSlice(ss []string, str string) bool {`
`24`	`24`	`for _, s := range ss {`
`25`		`- if strings.ToLower(s) == strings.ToLower(str) {`
	`25`	`+ if strings.EqualFold(s, str) {`
`26`	`26`	`return true`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -34,7 +34,7 @@ func InStringSlice(ss []string, str string) bool {`
`34`	`34`	`func SubtractStringSlice(ss []string, str string) []string {`
`35`	`35`	`var res []string`
`36`	`36`	`for _, s := range ss {`
`37`		`- if strings.ToLower(s) == strings.ToLower(str) {`
	`37`	`+ if strings.EqualFold(s, str) {`
`38`	`38`	`continue`
`39`	`39`	`}`
`40`	`40`	`res = append(res, s)`