
Yes, this is a huge commit. The middleware allows you to customize the API groups of all of the *.pinniped.dev API groups. Some notes about other small things in this commit: - We removed the internal/client package in favor of pkg/conciergeclient. The two packages do basically the same thing. I don't think we use the former anymore. - We re-enabled cluster-scoped owner assertions in the integration tests. This code was added in internal/ownerref. See a0546942 for when this assertion was removed. - Note: the middlware code is in charge of restoring the GV of a request object, so we should never need to write mutations that do that. - We updated the supervisor secret generation to no longer manually set an owner reference to the deployment since the middleware code now does this. I think we still need some way to make an initial event for the secret generator controller, which involves knowing the namespace and the name of the generated secret, so I still wired the deployment through. We could use a namespace/name tuple here, but I was lazy. Signed-off-by: Andrew Keesler <akeesler@vmware.com> Co-authored-by: Ryan Richard <richardry@vmware.com>
55 lines
1.2 KiB
Go
55 lines
1.2 KiB
Go
// Copyright 2021 the Pinniped contributors. All Rights Reserved.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package kubeclient
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_verb(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
f func() string
|
|
want string
|
|
}{
|
|
{
|
|
name: "error: string format",
|
|
f: func() string {
|
|
return fmt.Errorf("%s", VerbGet).Error()
|
|
},
|
|
want: "get",
|
|
},
|
|
{
|
|
name: "error: value format",
|
|
f: func() string {
|
|
return fmt.Errorf("%v", VerbUpdate).Error()
|
|
},
|
|
want: "update",
|
|
},
|
|
{
|
|
name: "error: go value format",
|
|
f: func() string {
|
|
return fmt.Errorf("%#v", VerbDelete).Error()
|
|
},
|
|
want: `"delete"`,
|
|
},
|
|
{
|
|
name: "error: go value format in middelware request",
|
|
f: func() string {
|
|
return fmt.Errorf("%#v", request{verb: VerbPatch}).Error()
|
|
},
|
|
want: `kubeclient.request{verb:"patch", namespace:"", resource:schema.GroupVersionResource{Group:"", Version:"", Resource:""}, reqFuncs:[]func(kubeclient.Object)(nil), respFuncs:[]func(kubeclient.Object)(nil), subresource:""}`,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
tt := tt
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
require.Equal(t, tt.want, tt.f())
|
|
})
|
|
}
|
|
}
|