mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-09-02 14:17:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename project

Browse Source
This commit is contained in:
Ryan Richard
2020-08-20 10:54:15 -07:00
parent 43888e9e0a
commit 3929fa672e
121 changed files with 1641 additions and 1652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/api_discovery_test.go
+17 -17
View File
@@ -11,40 +11,40 @@ import (
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/suzerain-io/placeholder-name/test/library"
"github.com/suzerain-io/pinniped/test/library"
)
func TestGetAPIResourceList(t *testing.T) {
library.SkipUnlessIntegration(t)
client := library.NewPlaceholderNameClientset(t)
client := library.NewPinnipedClientset(t)
groups, resources, err := client.Discovery().ServerGroupsAndResources()
require.NoError(t, err)
groupName := "placeholder.suzerain-io.github.io"
groupName := "pinniped.dev"
actualGroup := findGroup(groupName, groups)
require.NotNil(t, actualGroup)
expectedGroup := &metav1.APIGroup{
Name: "placeholder.suzerain-io.github.io",
Name: "pinniped.dev",
Versions: []metav1.GroupVersionForDiscovery{
{
GroupVersion: "placeholder.suzerain-io.github.io/v1alpha1",
GroupVersion: "pinniped.dev/v1alpha1",
Version: "v1alpha1",
},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "placeholder.suzerain-io.github.io/v1alpha1",
GroupVersion: "pinniped.dev/v1alpha1",
Version: "v1alpha1",
},
}
require.Equal(t, expectedGroup, actualGroup)
actualPlaceHolderResources := findResources("placeholder.suzerain-io.github.io/v1alpha1", resources)
require.NotNil(t, actualPlaceHolderResources)
actualCrdsPlaceHolderResources := findResources("crds.placeholder.suzerain-io.github.io/v1alpha1", resources)
require.NotNil(t, actualPlaceHolderResources)
actualPinnipedResources := findResources("pinniped.dev/v1alpha1", resources)
require.NotNil(t, actualPinnipedResources)
actualCrdPinnipedResources := findResources("crd.pinniped.dev/v1alpha1", resources)
require.NotNil(t, actualPinnipedResources)
expectedCredentialRequestAPIResource := metav1.APIResource{
Name: "credentialrequests",
@@ -61,10 +61,10 @@ func TestGetAPIResourceList(t *testing.T) {
}
expectedLDCAPIResource := metav1.APIResource{
Name: "logindiscoveryconfigs",
SingularName: "logindiscoveryconfig",
Name: "pinnipeddiscoveryinfos",
SingularName: "pinnipeddiscoveryinfo",
Namespaced: true,
Kind: "LoginDiscoveryConfig",
Kind: "PinnipedDiscoveryInfo",
Verbs: metav1.Verbs([]string{
"delete", "deletecollection", "get", "list", "patch", "create", "update", "watch",
}),
@@ -72,11 +72,11 @@ func TestGetAPIResourceList(t *testing.T) {
StorageVersionHash: "unknown: to be filled in automatically below",
}
require.Len(t, actualPlaceHolderResources.APIResources, 1)
require.Equal(t, expectedCredentialRequestAPIResource, actualPlaceHolderResources.APIResources[0])
require.Len(t, actualPinnipedResources.APIResources, 1)
require.Equal(t, expectedCredentialRequestAPIResource, actualPinnipedResources.APIResources[0])
require.Len(t, actualCrdsPlaceHolderResources.APIResources, 1)
actualAPIResource := actualCrdsPlaceHolderResources.APIResources[0]
require.Len(t, actualCrdPinnipedResources.APIResources, 1)
actualAPIResource := actualCrdPinnipedResources.APIResources[0]
// workaround because its hard to predict the storage version hash (e.g. "t/+v41y+3e4=")
// so just don't worry about comparing that field
expectedLDCAPIResource.StorageVersionHash = actualAPIResource.StorageVersionHash
test/integration/api_serving_certs_test.go
+7 -7
View File
@@ -15,9 +15,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"github.com/suzerain-io/placeholder-name/internal/testutil"
"github.com/suzerain-io/placeholder-name/kubernetes/1.19/api/apis/placeholder/v1alpha1"
"github.com/suzerain-io/placeholder-name/test/library"
"github.com/suzerain-io/pinniped/internal/testutil"
"github.com/suzerain-io/pinniped/kubernetes/1.19/api/apis/pinniped/v1alpha1"
"github.com/suzerain-io/pinniped/test/library"
)
func TestAPIServingCertificateAutoCreationAndRotation(t *testing.T) {
@@ -74,15 +74,15 @@ func TestAPIServingCertificateAutoCreationAndRotation(t *testing.T) {
for _, test := range tests {
test := test
t.Run(test.name, func(t *testing.T) {
namespaceName := library.Getenv(t, "PLACEHOLDER_NAME_NAMESPACE")
namespaceName := library.Getenv(t, "PINNIPED_NAMESPACE")
kubeClient := library.NewClientset(t)
aggregatedClient := library.NewAggregatedClientset(t)
placeholderClient := library.NewPlaceholderNameClientset(t)
pinnipedClient := library.NewPinnipedClientset(t)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
defer cancel()
const apiServiceName = "v1alpha1.placeholder.suzerain-io.github.io"
const apiServiceName = "v1alpha1.pinniped.dev"
// Get the initial auto-generated version of the Secret.
secret, err := kubeClient.CoreV1().Secrets(namespaceName).Get(ctx, "api-serving-cert", metav1.GetOptions{})
@@ -132,7 +132,7 @@ func TestAPIServingCertificateAutoCreationAndRotation(t *testing.T) {
// because the kube API server uses these certs when proxying requests to the aggregated API server,
// so this is effectively checking that the aggregated API server is using these new certs.
aggregatedAPIWorking := func() bool {
_, err = placeholderClient.PlaceholderV1alpha1().CredentialRequests().Create(ctx, &v1alpha1.CredentialRequest{
_, err = pinnipedClient.PinnipedV1alpha1().CredentialRequests().Create(ctx, &v1alpha1.CredentialRequest{
TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{},
Spec: v1alpha1.CredentialRequestSpec{
test/integration/app_availability_test.go
+3 -3
View File
@@ -15,13 +15,13 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/suzerain-io/placeholder-name/test/library"
"github.com/suzerain-io/pinniped/test/library"
)
func TestGetDeployment(t *testing.T) {
library.SkipUnlessIntegration(t)
namespaceName := library.Getenv(t, "PLACEHOLDER_NAME_NAMESPACE")
deploymentName := library.Getenv(t, "PLACEHOLDER_NAME_APP_NAME")
namespaceName := library.Getenv(t, "PINNIPED_NAMESPACE")
deploymentName := library.Getenv(t, "PINNIPED_APP_NAME")
client := library.NewClientset(t)
test/integration/client_test.go
+3 -3
View File
@@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/suzerain-io/placeholder-name/pkg/client"
"github.com/suzerain-io/placeholder-name/test/library"
"github.com/suzerain-io/pinniped/pkg/client"
"github.com/suzerain-io/pinniped/test/library"
)
/*
@@ -56,7 +56,7 @@ var maskKey = func(s string) string { return strings.ReplaceAll(s, "TESTING KEY"
func TestClient(t *testing.T) {
library.SkipUnlessIntegration(t)
tmcClusterToken := library.Getenv(t, "PLACEHOLDER_NAME_TMC_CLUSTER_TOKEN")
tmcClusterToken := library.Getenv(t, "PINNIPED_TMC_CLUSTER_TOKEN")
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
test/integration/credentialrequest_test.go
+5 -5
View File
@@ -22,19 +22,19 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"github.com/suzerain-io/placeholder-name/kubernetes/1.19/api/apis/placeholder/v1alpha1"
"github.com/suzerain-io/placeholder-name/test/library"
"github.com/suzerain-io/pinniped/kubernetes/1.19/api/apis/pinniped/v1alpha1"
"github.com/suzerain-io/pinniped/test/library"
)
func makeRequest(t *testing.T, spec v1alpha1.CredentialRequestSpec) (*v1alpha1.CredentialRequest, error) {
t.Helper()
client := library.NewAnonymousPlaceholderNameClientset(t)
client := library.NewAnonymousPinnipedClientset(t)
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
return client.PlaceholderV1alpha1().CredentialRequests().Create(ctx, &v1alpha1.CredentialRequest{
return client.PinnipedV1alpha1().CredentialRequests().Create(ctx, &v1alpha1.CredentialRequest{
TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{},
Spec: spec,
@@ -63,7 +63,7 @@ func addTestClusterRoleBinding(ctx context.Context, t *testing.T, adminClient ku
func TestSuccessfulCredentialRequest(t *testing.T) {
library.SkipUnlessIntegration(t)
tmcClusterToken := library.Getenv(t, "PLACEHOLDER_NAME_TMC_CLUSTER_TOKEN")
tmcClusterToken := library.Getenv(t, "PINNIPED_TMC_CLUSTER_TOKEN")
response, err := makeRequest(t, v1alpha1.CredentialRequestSpec{
Type: v1alpha1.TokenCredentialType,
test/integration/kubectl_test.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/suzerain-io/placeholder-name/test/library"
"github.com/suzerain-io/pinniped/test/library"
)
func TestGetNodes(t *testing.T) {
test/integration/logindiscoveryconfig_test.go → test/integration/pinnipeddiscoveryinfo_test.go
+19 -19
View File
@@ -15,15 +15,15 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
crdsplaceholderv1alpha1 "github.com/suzerain-io/placeholder-name/kubernetes/1.19/api/apis/crdsplaceholder/v1alpha1"
"github.com/suzerain-io/placeholder-name/test/library"
crdpinnipedv1alpha1 "github.com/suzerain-io/pinniped/kubernetes/1.19/api/apis/crdpinniped/v1alpha1"
"github.com/suzerain-io/pinniped/test/library"
)
func TestSuccessfulLoginDiscoveryConfig(t *testing.T) {
func TestSuccessfulPinnipedDiscoveryInfo(t *testing.T) {
library.SkipUnlessIntegration(t)
namespaceName := library.Getenv(t, "PLACEHOLDER_NAME_NAMESPACE")
namespaceName := library.Getenv(t, "PINNIPED_NAMESPACE")
client := library.NewPlaceholderNameClientset(t)
client := library.NewPinnipedClientset(t)
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
@@ -31,38 +31,38 @@ func TestSuccessfulLoginDiscoveryConfig(t *testing.T) {
config := library.NewClientConfig(t)
expectedLDCSpec := expectedLDCSpec(config)
configList, err := client.
CrdsV1alpha1().
LoginDiscoveryConfigs(namespaceName).
CrdV1alpha1().
PinnipedDiscoveryInfos(namespaceName).
List(ctx, metav1.ListOptions{})
require.NoError(t, err)
require.Len(t, configList.Items, 1)
require.Equal(t, expectedLDCSpec, &configList.Items[0].Spec)
}
func TestReconcilingLoginDiscoveryConfig(t *testing.T) {
func TestReconcilingPinnipedDiscoveryInfo(t *testing.T) {
library.SkipUnlessIntegration(t)
namespaceName := library.Getenv(t, "PLACEHOLDER_NAME_NAMESPACE")
namespaceName := library.Getenv(t, "PINNIPED_NAMESPACE")
client := library.NewPlaceholderNameClientset(t)
client := library.NewPinnipedClientset(t)
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
err := client.
CrdsV1alpha1().
LoginDiscoveryConfigs(namespaceName).
Delete(ctx, "placeholder-name-config", metav1.DeleteOptions{})
CrdV1alpha1().
PinnipedDiscoveryInfos(namespaceName).
Delete(ctx, "pinniped-config", metav1.DeleteOptions{})
require.NoError(t, err)
config := library.NewClientConfig(t)
expectedLDCSpec := expectedLDCSpec(config)
var actualLDC *crdsplaceholderv1alpha1.LoginDiscoveryConfig
var actualLDC *crdpinnipedv1alpha1.PinnipedDiscoveryInfo
for i := 0; i < 10; i++ {
actualLDC, err = client.
CrdsV1alpha1().
LoginDiscoveryConfigs(namespaceName).
Get(ctx, "placeholder-name-config", metav1.GetOptions{})
CrdV1alpha1().
PinnipedDiscoveryInfos(namespaceName).
Get(ctx, "pinniped-config", metav1.GetOptions{})
if err == nil {
break
}
@@ -72,8 +72,8 @@ func TestReconcilingLoginDiscoveryConfig(t *testing.T) {
require.Equal(t, expectedLDCSpec, &actualLDC.Spec)
}
func expectedLDCSpec(config *rest.Config) *crdsplaceholderv1alpha1.LoginDiscoveryConfigSpec {
return &crdsplaceholderv1alpha1.LoginDiscoveryConfigSpec{
func expectedLDCSpec(config *rest.Config) *crdpinnipedv1alpha1.PinnipedDiscoveryInfoSpec {
return &crdpinnipedv1alpha1.PinnipedDiscoveryInfoSpec{
Server: config.Host,
CertificateAuthorityData: base64.StdEncoding.EncodeToString(config.TLSClientConfig.CAData),
}