djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lint error from previous commit

Browse Source
This commit is contained in:
Ryan Richard 2020-09-21 12:30:53 -07:00
parent cfb76a538c
commit 0d3ad0085d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/common_test.go
View File

@ -33,7 +33,7 @@ func accessAsUserTest(
clientUnderTest kubernetes.Interface, clientUnderTest kubernetes.Interface,
) func(t *testing.T) { ) func(t *testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
addTestClusterUserCanViewEverythingRoleBinding(t, ctx, adminClient, testUsername) addTestClusterUserCanViewEverythingRoleBinding(ctx, t, adminClient, testUsername)
// Use the client which is authenticated as the test user to list namespaces // Use the client which is authenticated as the test user to list namespaces
var listNamespaceResponse *v1.NamespaceList var listNamespaceResponse *v1.NamespaceList
@ -56,7 +56,7 @@ func accessAsUserWithKubectlTest(
expectedNamespace string, expectedNamespace string,
) func(t *testing.T) { ) func(t *testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
addTestClusterUserCanViewEverythingRoleBinding(t, ctx, adminClient, testUsername) addTestClusterUserCanViewEverythingRoleBinding(ctx, t, adminClient, testUsername)
// Use the given kubeconfig with kubectl to list namespaces as the test user // Use the given kubeconfig with kubectl to list namespaces as the test user
var kubectlCommandOutput string var kubectlCommandOutput string
@ -84,7 +84,7 @@ func accessAsGroupTest(
clientUnderTest kubernetes.Interface, clientUnderTest kubernetes.Interface,
) func(t *testing.T) { ) func(t *testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
addTestClusterGroupCanViewEverythingRoleBinding(t, ctx, adminClient, testGroup) addTestClusterGroupCanViewEverythingRoleBinding(ctx, t, adminClient, testGroup)
// Use the client which is authenticated as the test user to list namespaces // Use the client which is authenticated as the test user to list namespaces
var listNamespaceResponse *v1.NamespaceList var listNamespaceResponse *v1.NamespaceList
@ -107,7 +107,7 @@ func accessAsGroupWithKubectlTest(
expectedNamespace string, expectedNamespace string,
) func(t *testing.T) { ) func(t *testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
addTestClusterGroupCanViewEverythingRoleBinding(t, ctx, adminClient, testGroup) addTestClusterGroupCanViewEverythingRoleBinding(ctx, t, adminClient, testGroup)
// Use the given kubeconfig with kubectl to list namespaces as the test user // Use the given kubeconfig with kubectl to list namespaces as the test user
var kubectlCommandOutput string var kubectlCommandOutput string
@ -123,7 +123,7 @@ func accessAsGroupWithKubectlTest(
} }
} }
func addTestClusterUserCanViewEverythingRoleBinding(t *testing.T, ctx context.Context, adminClient kubernetes.Interface, testUsername string) { func addTestClusterUserCanViewEverythingRoleBinding(ctx context.Context, t *testing.T, adminClient kubernetes.Interface, testUsername string) {
addTestClusterRoleBinding(ctx, t, adminClient, &rbacv1.ClusterRoleBinding{ addTestClusterRoleBinding(ctx, t, adminClient, &rbacv1.ClusterRoleBinding{
TypeMeta: metav1.TypeMeta{}, TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -142,7 +142,7 @@ func addTestClusterUserCanViewEverythingRoleBinding(t *testing.T, ctx context.Co
}) })
} }
func addTestClusterGroupCanViewEverythingRoleBinding(t *testing.T, ctx context.Context, adminClient kubernetes.Interface, testGroup string) { func addTestClusterGroupCanViewEverythingRoleBinding(ctx context.Context, t *testing.T, adminClient kubernetes.Interface, testGroup string) {
addTestClusterRoleBinding(ctx, t, adminClient, &rbacv1.ClusterRoleBinding{ addTestClusterRoleBinding(ctx, t, adminClient, &rbacv1.ClusterRoleBinding{
TypeMeta: metav1.TypeMeta{}, TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{

5
test/integration/credentialrequest_test.go
View File

@ -12,10 +12,11 @@ import (
"time" "time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"go.pinniped.dev/generated/1.19/apis/login/v1alpha1"
"go.pinniped.dev/test/library"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"go.pinniped.dev/generated/1.19/apis/login/v1alpha1"
"go.pinniped.dev/test/library"
) )
func TestSuccessfulCredentialRequest(t *testing.T) { func TestSuccessfulCredentialRequest(t *testing.T) {