From 9ed4395d3cc402b8bd25c3b039d5023505bee353 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Thu, 3 Aug 2017 15:52:33 +0800 Subject: [PATCH] Remove 0,1,3 from rand.String, to avoid 'bad words' --- .../serviceaccount/tokens_controller_test.go | 16 ++++++++-------- .../k8s.io/apimachinery/pkg/util/rand/rand.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go index 88fe9b6db4..2508253f6d 100644 --- a/pkg/controller/serviceaccount/tokens_controller_test.go +++ b/pkg/controller/serviceaccount/tokens_controller_test.go @@ -73,7 +73,7 @@ func tokenSecretReferences() []v1.ObjectReference { // addTokenSecretReference adds a reference to the ServiceAccountToken that will be created func addTokenSecretReference(refs []v1.ObjectReference) []v1.ObjectReference { - return addNamedTokenSecretReference(refs, "default-token-p7w9c") + return addNamedTokenSecretReference(refs, "default-token-stdpg") } // addNamedTokenSecretReference adds a reference to the named ServiceAccountToken @@ -118,9 +118,9 @@ func opaqueSecret() *v1.Secret { } // createdTokenSecret returns the ServiceAccountToken secret posted when creating a new token secret. -// Named "default-token-p7w9c", since that is the first generated name after rand.Seed(1) +// Named "default-token-stdpg", since that is the first generated name after rand.Seed(1) func createdTokenSecret(overrideName ...string) *v1.Secret { - return namedCreatedTokenSecret("default-token-p7w9c") + return namedCreatedTokenSecret("default-token-stdpg") } // namedTokenSecret returns the ServiceAccountToken secret posted when creating a new token secret with the given name. @@ -264,12 +264,12 @@ func TestTokenCreation(t *testing.T) { // Attempt 2 core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"), - core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-x50vb")), + core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-jk9rt")), // Attempt 3 core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"), - core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-scq98")), - core.NewUpdateAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, serviceAccount(addNamedTokenSecretReference(emptySecretReferences(), "default-token-scq98"))), + core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-684pg")), + core.NewUpdateAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, serviceAccount(addNamedTokenSecretReference(emptySecretReferences(), "default-token-684pg"))), }, }, "new serviceaccount with no secrets encountering unending create error": { @@ -293,10 +293,10 @@ func TestTokenCreation(t *testing.T) { core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, createdTokenSecret()), // Retry 1 core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"), - core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-x50vb")), + core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-jk9rt")), // Retry 2 core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"), - core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-scq98")), + core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, namedCreatedTokenSecret("default-token-684pg")), }, }, "new serviceaccount with missing secrets": { diff --git a/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go b/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go index db109c2cd2..daa0e1b2c8 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go @@ -72,7 +72,7 @@ func Perm(n int) []int { // We omit vowels from the set of available characters to reduce the chances // of "bad words" being formed. -var alphanums = []rune("bcdfghjklmnpqrstvwxz0123456789") +var alphanums = []rune("bcdfghjklmnpqrstvwxz2456789") // String generates a random alphanumeric string, without vowels, which is n // characters long. This will panic if n is less than zero.