From c0f4bd38ffb161ce45c6c4fe13534e97c22490f7 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <me@jessfraz.com>
Date: Wed, 20 Jul 2016 09:39:01 -0400
Subject: [PATCH] enable golint for pkg/security/podsecuritypolicy/capabilities

Signed-off-by: Jess Frazelle <me@jessfraz.com>
---
 pkg/security/podsecuritypolicy/capabilities/mustrunas.go | 6 +++---
 pkg/security/podsecuritypolicy/capabilities/types.go     | 4 ++--
 pkg/security/podsecuritypolicy/factory.go                | 2 +-
 pkg/security/podsecuritypolicy/types.go                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/security/podsecuritypolicy/capabilities/mustrunas.go b/pkg/security/podsecuritypolicy/capabilities/mustrunas.go
index 8c71833d95f..3758330e6a8 100644
--- a/pkg/security/podsecuritypolicy/capabilities/mustrunas.go
+++ b/pkg/security/podsecuritypolicy/capabilities/mustrunas.go
@@ -24,18 +24,18 @@ import (
 	"k8s.io/kubernetes/pkg/util/validation/field"
 )
 
-// defaultCapabilities implements the CapabilitiesStrategy interface
+// defaultCapabilities implements the Strategy interface
 type defaultCapabilities struct {
 	defaultAddCapabilities   []api.Capability
 	requiredDropCapabilities []api.Capability
 	allowedCaps              []api.Capability
 }
 
-var _ CapabilitiesStrategy = &defaultCapabilities{}
+var _ Strategy = &defaultCapabilities{}
 
 // NewDefaultCapabilities creates a new defaultCapabilities strategy that will provide defaults and validation
 // based on the configured initial caps and allowed caps.
-func NewDefaultCapabilities(defaultAddCapabilities, requiredDropCapabilities, allowedCaps []api.Capability) (CapabilitiesStrategy, error) {
+func NewDefaultCapabilities(defaultAddCapabilities, requiredDropCapabilities, allowedCaps []api.Capability) (Strategy, error) {
 	return &defaultCapabilities{
 		defaultAddCapabilities:   defaultAddCapabilities,
 		requiredDropCapabilities: requiredDropCapabilities,
diff --git a/pkg/security/podsecuritypolicy/capabilities/types.go b/pkg/security/podsecuritypolicy/capabilities/types.go
index 0d1e6e2c1f9..53ba089ebc3 100644
--- a/pkg/security/podsecuritypolicy/capabilities/types.go
+++ b/pkg/security/podsecuritypolicy/capabilities/types.go
@@ -21,8 +21,8 @@ import (
 	"k8s.io/kubernetes/pkg/util/validation/field"
 )
 
-// CapabilitiesStrategy defines the interface for all cap constraint strategies.
-type CapabilitiesStrategy interface {
+// Strategy defines the interface for all cap constraint strategies.
+type Strategy interface {
 	// Generate creates the capabilities based on policy rules.
 	Generate(pod *api.Pod, container *api.Container) (*api.Capabilities, error)
 	// Validate ensures that the specified values fall within the range of the strategy.
diff --git a/pkg/security/podsecuritypolicy/factory.go b/pkg/security/podsecuritypolicy/factory.go
index b2e99d810f4..bacc43be6fd 100644
--- a/pkg/security/podsecuritypolicy/factory.go
+++ b/pkg/security/podsecuritypolicy/factory.go
@@ -130,6 +130,6 @@ func createSupplementalGroupStrategy(opts *extensions.SupplementalGroupsStrategy
 }
 
 // createCapabilitiesStrategy creates a new capabilities strategy.
-func createCapabilitiesStrategy(defaultAddCaps, requiredDropCaps, allowedCaps []api.Capability) (capabilities.CapabilitiesStrategy, error) {
+func createCapabilitiesStrategy(defaultAddCaps, requiredDropCaps, allowedCaps []api.Capability) (capabilities.Strategy, error) {
 	return capabilities.NewDefaultCapabilities(defaultAddCaps, requiredDropCaps, allowedCaps)
 }
diff --git a/pkg/security/podsecuritypolicy/types.go b/pkg/security/podsecuritypolicy/types.go
index 1e318662aec..ef875da66b4 100644
--- a/pkg/security/podsecuritypolicy/types.go
+++ b/pkg/security/podsecuritypolicy/types.go
@@ -58,5 +58,5 @@ type ProviderStrategies struct {
 	SELinuxStrategy           selinux.SELinuxStrategy
 	FSGroupStrategy           group.GroupStrategy
 	SupplementalGroupStrategy group.GroupStrategy
-	CapabilitiesStrategy      capabilities.CapabilitiesStrategy
+	CapabilitiesStrategy      capabilities.Strategy
 }