mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-09-05 23:57:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename idp.concierge.pinniped.dev to authentication.concierge.pinniped.dev.

Browse Source 
Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer
2020-10-30 14:07:40 -05:00
parent 81390bba89
commit e69183aa8a
133 changed files with 1067 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/identityprovider/idpcache/cache_test.go
+2 -2
View File
@@ -17,7 +17,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
idpv1alpha "go.pinniped.dev/generated/1.19/apis/concierge/idp/v1alpha1"
authv1alpha "go.pinniped.dev/generated/1.19/apis/concierge/authentication/v1alpha1"
loginapi "go.pinniped.dev/generated/1.19/apis/concierge/login"
"go.pinniped.dev/internal/mocks/mocktokenauthenticator"
)
@@ -76,7 +76,7 @@ func TestAuthenticateTokenCredentialRequest(t *testing.T) {
},
Spec: loginapi.TokenCredentialRequestSpec{
IdentityProvider: corev1.TypedLocalObjectReference{
APIGroup: &idpv1alpha.SchemeGroupVersion.Group,
APIGroup: &authv1alpha.SchemeGroupVersion.Group,
Kind: "WebhookIdentityProvider",
Name: "test-name",
},
internal/controller/identityprovider/webhookcachecleaner/webhookcachecleaner.go
+4 -4
View File
@@ -11,8 +11,8 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog/v2"
idpv1alpha1 "go.pinniped.dev/generated/1.19/apis/concierge/idp/v1alpha1"
idpinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions/idp/v1alpha1"
auth1alpha1 "go.pinniped.dev/generated/1.19/apis/concierge/authentication/v1alpha1"
idpinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions/authentication/v1alpha1"
pinnipedcontroller "go.pinniped.dev/internal/controller"
"go.pinniped.dev/internal/controller/identityprovider/idpcache"
"go.pinniped.dev/internal/controllerlib"
@@ -51,7 +51,7 @@ func (c *controller) Sync(_ controllerlib.Context) error {
}
// Index the current webhooks by key.
webhooksByKey := map[controllerlib.Key]*idpv1alpha1.WebhookIdentityProvider{}
webhooksByKey := map[controllerlib.Key]*auth1alpha1.WebhookIdentityProvider{}
for _, webhook := range webhooks {
key := controllerlib.Key{Namespace: webhook.Namespace, Name: webhook.Name}
webhooksByKey[key] = webhook
@@ -59,7 +59,7 @@ func (c *controller) Sync(_ controllerlib.Context) error {
// Delete any entries from the cache which are no longer in the cluster.
for _, key := range c.cache.Keys() {
if key.APIGroup != idpv1alpha1.SchemeGroupVersion.Group || key.Kind != "WebhookIdentityProvider" {
if key.APIGroup != auth1alpha1.SchemeGroupVersion.Group || key.Kind != "WebhookIdentityProvider" {
continue
}
if _, exists := webhooksByKey[controllerlib.Key{Namespace: key.Namespace, Name: key.Name}]; !exists {
internal/controller/identityprovider/webhookcachecleaner/webhookcachecleaner_test.go
+9 -9
View File
@@ -12,7 +12,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
idpv1alpha "go.pinniped.dev/generated/1.19/apis/concierge/idp/v1alpha1"
authv1alpha "go.pinniped.dev/generated/1.19/apis/concierge/authentication/v1alpha1"
pinnipedfake "go.pinniped.dev/generated/1.19/client/clientset/versioned/fake"
pinnipedinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions"
"go.pinniped.dev/internal/controller/identityprovider/idpcache"
@@ -24,19 +24,19 @@ func TestController(t *testing.T) {
t.Parallel()
testKey1 := idpcache.Key{
APIGroup: "idp.concierge.pinniped.dev",
APIGroup: "authentication.concierge.pinniped.dev",
Kind: "WebhookIdentityProvider",
Namespace: "test-namespace",
Name: "test-name-one",
}
testKey2 := idpcache.Key{
APIGroup: "idp.concierge.pinniped.dev",
APIGroup: "authentication.concierge.pinniped.dev",
Kind: "WebhookIdentityProvider",
Namespace: "test-namespace",
Name: "test-name-two",
}
testKeyNonwebhook := idpcache.Key{
APIGroup: "idp.concierge.pinniped.dev",
APIGroup: "authentication.concierge.pinniped.dev",
Kind: "SomeOtherIdentityProvider",
Namespace: "test-namespace",
Name: "test-name-one",
@@ -54,7 +54,7 @@ func TestController(t *testing.T) {
name: "no change",
initialCache: map[idpcache.Key]idpcache.Value{testKey1: nil},
webhookIDPs: []runtime.Object{
&idpv1alpha.WebhookIdentityProvider{
&authv1alpha.WebhookIdentityProvider{
ObjectMeta: metav1.ObjectMeta{
Namespace: testKey1.Namespace,
Name: testKey1.Name,
@@ -67,13 +67,13 @@ func TestController(t *testing.T) {
name: "IDPs not yet added",
initialCache: nil,
webhookIDPs: []runtime.Object{
&idpv1alpha.WebhookIdentityProvider{
&authv1alpha.WebhookIdentityProvider{
ObjectMeta: metav1.ObjectMeta{
Namespace: testKey1.Namespace,
Name: testKey1.Name,
},
},
&idpv1alpha.WebhookIdentityProvider{
&authv1alpha.WebhookIdentityProvider{
ObjectMeta: metav1.ObjectMeta{
Namespace: testKey2.Namespace,
Name: testKey2.Name,
@@ -90,7 +90,7 @@ func TestController(t *testing.T) {
testKeyNonwebhook: nil,
},
webhookIDPs: []runtime.Object{
&idpv1alpha.WebhookIdentityProvider{
&authv1alpha.WebhookIdentityProvider{
ObjectMeta: metav1.ObjectMeta{
Namespace: testKey1.Namespace,
Name: testKey1.Name,
@@ -116,7 +116,7 @@ func TestController(t *testing.T) {
}
testLog := testlogger.New(t)
controller := New(cache, informers.IDP().V1alpha1().WebhookIdentityProviders(), testLog)
controller := New(cache, informers.Authentication().V1alpha1().WebhookIdentityProviders(), testLog)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
internal/controller/identityprovider/webhookcachefiller/webhookcachefiller.go
+5 -5
View File
@@ -20,8 +20,8 @@ import (
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/klog/v2"
idpv1alpha1 "go.pinniped.dev/generated/1.19/apis/concierge/idp/v1alpha1"
idpinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions/idp/v1alpha1"
auth1alpha1 "go.pinniped.dev/generated/1.19/apis/concierge/authentication/v1alpha1"
idpinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions/authentication/v1alpha1"
pinnipedcontroller "go.pinniped.dev/internal/controller"
"go.pinniped.dev/internal/controller/identityprovider/idpcache"
"go.pinniped.dev/internal/controllerlib"
@@ -69,7 +69,7 @@ func (c *controller) Sync(ctx controllerlib.Context) error {
}
c.cache.Store(idpcache.Key{
APIGroup: idpv1alpha1.GroupName,
APIGroup: auth1alpha1.GroupName,
Kind: "WebhookIdentityProvider",
Namespace: ctx.Key.Namespace,
Name: ctx.Key.Name,
@@ -81,7 +81,7 @@ func (c *controller) Sync(ctx controllerlib.Context) error {
// newWebhookAuthenticator creates a webhook from the provided API server url and caBundle
// used to validate TLS connections.
func newWebhookAuthenticator(
spec *idpv1alpha1.WebhookIdentityProviderSpec,
spec *auth1alpha1.WebhookIdentityProviderSpec,
tempfileFunc func(string, string) (*os.File, error),
marshalFunc func(clientcmdapi.Config, string) error,
) (*webhook.WebhookTokenAuthenticator, error) {
@@ -122,7 +122,7 @@ func newWebhookAuthenticator(
return webhook.New(temp.Name(), version, implicitAuds, customDial)
}
func getCABundle(spec *idpv1alpha1.TLSSpec) ([]byte, error) {
func getCABundle(spec *auth1alpha1.TLSSpec) ([]byte, error) {
if spec == nil {
return nil, nil
}
internal/controller/identityprovider/webhookcachefiller/webhookcachefiller_test.go
+13 -13
View File
@@ -19,7 +19,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
idpv1alpha1 "go.pinniped.dev/generated/1.19/apis/concierge/idp/v1alpha1"
auth1alpha1 "go.pinniped.dev/generated/1.19/apis/concierge/authentication/v1alpha1"
pinnipedfake "go.pinniped.dev/generated/1.19/client/clientset/versioned/fake"
pinnipedinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions"
"go.pinniped.dev/internal/controller/identityprovider/idpcache"
@@ -50,12 +50,12 @@ func TestController(t *testing.T) {
name: "invalid webhook",
syncKey: controllerlib.Key{Namespace: "test-namespace", Name: "test-name"},
webhookIDPs: []runtime.Object{
&idpv1alpha1.WebhookIdentityProvider{
&auth1alpha1.WebhookIdentityProvider{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test-namespace",
Name: "test-name",
},
Spec: idpv1alpha1.WebhookIdentityProviderSpec{
Spec: auth1alpha1.WebhookIdentityProviderSpec{
Endpoint: "invalid url",
},
},
@@ -66,14 +66,14 @@ func TestController(t *testing.T) {
name: "valid webhook",
syncKey: controllerlib.Key{Namespace: "test-namespace", Name: "test-name"},
webhookIDPs: []runtime.Object{
&idpv1alpha1.WebhookIdentityProvider{
&auth1alpha1.WebhookIdentityProvider{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test-namespace",
Name: "test-name",
},
Spec: idpv1alpha1.WebhookIdentityProviderSpec{
Spec: auth1alpha1.WebhookIdentityProviderSpec{
Endpoint: "https://example.com",
TLS: &idpv1alpha1.TLSSpec{CertificateAuthorityData: ""},
TLS: &auth1alpha1.TLSSpec{CertificateAuthorityData: ""},
},
},
},
@@ -93,7 +93,7 @@ func TestController(t *testing.T) {
cache := idpcache.New()
testLog := testlogger.New(t)
controller := New(cache, informers.IDP().V1alpha1().WebhookIdentityProviders(), testLog)
controller := New(cache, informers.Authentication().V1alpha1().WebhookIdentityProviders(), testLog)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
@@ -124,22 +124,22 @@ func TestNewWebhookAuthenticator(t *testing.T) {
t.Run("marshal failure", func(t *testing.T) {
marshalError := func(_ clientcmdapi.Config, _ string) error { return fmt.Errorf("some marshal error") }
res, err := newWebhookAuthenticator(&idpv1alpha1.WebhookIdentityProviderSpec{}, ioutil.TempFile, marshalError)
res, err := newWebhookAuthenticator(&auth1alpha1.WebhookIdentityProviderSpec{}, ioutil.TempFile, marshalError)
require.Nil(t, res)
require.EqualError(t, err, "unable to marshal kubeconfig: some marshal error")
})
t.Run("invalid base64", func(t *testing.T) {
res, err := newWebhookAuthenticator(&idpv1alpha1.WebhookIdentityProviderSpec{
res, err := newWebhookAuthenticator(&auth1alpha1.WebhookIdentityProviderSpec{
Endpoint: "https://example.com",
TLS: &idpv1alpha1.TLSSpec{CertificateAuthorityData: "invalid-base64"},
TLS: &auth1alpha1.TLSSpec{CertificateAuthorityData: "invalid-base64"},
}, ioutil.TempFile, clientcmd.WriteToFile)
require.Nil(t, res)
require.EqualError(t, err, "invalid TLS configuration: illegal base64 data at input byte 7")
})
t.Run("valid config with no TLS spec", func(t *testing.T) {
res, err := newWebhookAuthenticator(&idpv1alpha1.WebhookIdentityProviderSpec{
res, err := newWebhookAuthenticator(&auth1alpha1.WebhookIdentityProviderSpec{
Endpoint: "https://example.com",
}, ioutil.TempFile, clientcmd.WriteToFile)
require.NotNil(t, res)
@@ -154,9 +154,9 @@ func TestNewWebhookAuthenticator(t *testing.T) {
_, err = w.Write([]byte(`{}`))
require.NoError(t, err)
})
spec := &idpv1alpha1.WebhookIdentityProviderSpec{
spec := &auth1alpha1.WebhookIdentityProviderSpec{
Endpoint: url,
TLS: &idpv1alpha1.TLSSpec{
TLS: &auth1alpha1.TLSSpec{
CertificateAuthorityData: base64.StdEncoding.EncodeToString([]byte(caBundle)),
},
}