Merge pull request kubernetes#76587 from SataQiu/fix-golint-e2e-kubeadm-20190415

Fix golint failures of test/e2e_kubeadm/util.go

Author: k8s-ci-robot

test/e2e_kubeadm/util.go

@@ -25,12 +25,13 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
 
-	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gstruct"
 )
 
 // ServiceAccounts utils
 
+// ExpectServiceAccount expects to be able to get the ServiceAccount with specific name from the namespace
 func ExpectServiceAccount(c clientset.Interface, namespace, name string) {
 	_, err := c.CoreV1().
 		ServiceAccounts(namespace).
@@ -40,6 +41,7 @@ func ExpectServiceAccount(c clientset.Interface, namespace, name string) {
 
 // Secret utils
 
+// GetSecret gets Secret with specific name from the namespace
 func GetSecret(c clientset.Interface, namespace, name string) *corev1.Secret {
 	r, err := c.CoreV1().
 		Secrets(namespace).
@@ -50,6 +52,7 @@ func GetSecret(c clientset.Interface, namespace, name string) *corev1.Secret {
 
 // ConfigMaps utils
 
+// GetConfigMap gets ConfigMap with specific name from the namespace
 func GetConfigMap(c clientset.Interface, namespace, name string) *corev1.ConfigMap {
 	r, err := c.CoreV1().
 		ConfigMaps(namespace).
@@ -60,6 +63,7 @@ func GetConfigMap(c clientset.Interface, namespace, name string) *corev1.ConfigM
 
 // Service utils
 
+// ExpectService expects to be able to get the Service with specific name from the namespace
 func ExpectService(c clientset.Interface, namespace, name string) {
 	_, err := c.CoreV1().
 		Services(namespace).
@@ -69,6 +73,7 @@ func ExpectService(c clientset.Interface, namespace, name string) {
 
 // Deployments utils
 
+// GetDeployment gets Deployment with specific name from the namespace
 func GetDeployment(c clientset.Interface, namespace, name string) *appsv1.Deployment {
 	r, err := c.AppsV1().
 		Deployments(namespace).
@@ -79,6 +84,7 @@ func GetDeployment(c clientset.Interface, namespace, name string) *appsv1.Deploy
 
 // DaemonSets utils
 
+// GetDaemonSet gets DaemonSet with specific name from the namespace
 func GetDaemonSet(c clientset.Interface, namespace, name string) *appsv1.DaemonSet {
 	r, err := c.AppsV1().
 		DaemonSets(namespace).
@@ -89,52 +95,58 @@ func GetDaemonSet(c clientset.Interface, namespace, name string) *appsv1.DaemonS
 
 // RBAC utils
 
+// ExpectRole expects to be able to get the Role with specific name from the namespace
 func ExpectRole(c clientset.Interface, namespace, name string) {
 	_, err := c.RbacV1().
 		Roles(namespace).
 		Get(name, metav1.GetOptions{})
 	framework.ExpectNoError(err, "error getting Role %q from namespace %q", name, namespace)
 }
 
+// ExpectRoleBinding expects to be able to get the RoleBinding with specific name from the namespace
 func ExpectRoleBinding(c clientset.Interface, namespace, name string) {
 	_, err := c.RbacV1().
 		RoleBindings(namespace).
 		Get(name, metav1.GetOptions{})
 	framework.ExpectNoError(err, "error getting RoleBinding %q from namespace %q", name, namespace)
 }
 
+// ExpectClusterRole expects to be able to get the ClusterRole with specific name
 func ExpectClusterRole(c clientset.Interface, name string) {
 	_, err := c.RbacV1().
 		ClusterRoles().
 		Get(name, metav1.GetOptions{})
 	framework.ExpectNoError(err, "error getting ClusterRole %q", name)
 }
 
+// ExpectClusterRoleBinding expects to be able to get the ClusterRoleBinding with specific name
 func ExpectClusterRoleBinding(c clientset.Interface, name string) {
 	_, err := c.RbacV1().
 		ClusterRoleBindings().
 		Get(name, metav1.GetOptions{})
 	framework.ExpectNoError(err, "error getting ClusterRoleBindings %q", name)
 }
 
+// ExpectClusterRoleBindingWithSubjectAndRole expects to be able to get the ClusterRoleBinding with specific name, subject and role
 func ExpectClusterRoleBindingWithSubjectAndRole(c clientset.Interface, name, subjectKind, subject, role string) {
 	binding, err := c.RbacV1().
 		ClusterRoleBindings().
 		Get(name, metav1.GetOptions{})
 	framework.ExpectNoError(err, "error getting ClusterRoleBindings %q", name)
-	Expect(binding.Subjects).To(
-		ContainElement(subjectMatcher(
+	gomega.Expect(binding.Subjects).To(
+		gomega.ContainElement(subjectMatcher(
 			subject,
 			subjectKind,
 		)),
 		"ClusterRole %q does not have %s %q as subject", name, subjectKind, subject,
 	)
-	Expect(binding.RoleRef.Name).To(
-		Equal(role),
+	gomega.Expect(binding.RoleRef.Name).To(
+		gomega.Equal(role),
 		"ClusterRole %q does not have %q as role", name, role,
 	)
 }
 
+// ExpectSubjectHasAccessToResource expects that the subject has access to the target resource
 func ExpectSubjectHasAccessToResource(c clientset.Interface, subjectKind, subject string, resource *authv1.ResourceAttributes) {
 	var sar *authv1.SubjectAccessReview
 	switch subjectKind {
@@ -161,14 +173,14 @@ func ExpectSubjectHasAccessToResource(c clientset.Interface, subjectKind, subjec
 	s, err := c.AuthorizationV1().SubjectAccessReviews().Create(sar)
 	framework.ExpectNoError(err, "error getting SubjectAccessReview for %s %s to resource %+v", subjectKind, subject, *sar.Spec.ResourceAttributes)
 
-	Expect(s.Status.Allowed).Should(BeTrue(), "%s %s has no access to resource %+v", subjectKind, subject, *sar.Spec.ResourceAttributes)
+	gomega.Expect(s.Status.Allowed).Should(gomega.BeTrue(), "%s %s has no access to resource %+v", subjectKind, subject, *sar.Spec.ResourceAttributes)
 }
 
 // matchers
 
-func subjectMatcher(name, kind string) OmegaMatcher {
+func subjectMatcher(name, kind string) gomega.OmegaMatcher {
 	return gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
-		"Name": Equal(name),
-		"Kind": Equal(kind),
+		"Name": gomega.Equal(name),
+		"Kind": gomega.Equal(kind),
 	})
 }