Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GenerateName in test #301

Merged
merged 1 commit into from
Oct 29, 2019
+151 −0
Merged

Fix GenerateName in test #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions cmd/controller/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ import (
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt"
"testing"
"time"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
krand "k8s.io/apimachinery/pkg/util/rand"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
ktesting "k8s.io/client-go/testing"
Expand All @@ -29,9 +32,20 @@ func hasAction(fake *fake.Clientset, verb, resource string) bool {
return findAction(fake, verb, resource) != nil
}

// generateNameReactor implements the logic required for the GenerateName field to work when using
// the fake client. Add it with client.PrependReactor to your fake client.
func generateNameReactor(action ktesting.Action) (handled bool, ret runtime.Object, err error) {
s := action.(ktesting.CreateAction).GetObject().(*v1.Secret)
if s.Name == "" && s.GenerateName != "" {
s.Name = fmt.Sprintf("%s-%s", s.GenerateName, krand.String(16))
}
return false, nil, nil
}

func TestInitKeyRegistry(t *testing.T) {
rand := testRand()
client := fake.NewSimpleClientset()
client.PrependReactor("create", "secrets", generateNameReactor)

registry, err := initKeyRegistry(client, rand, "namespace", "prefix", "label", 1024)
if err != nil {
Expand Down Expand Up @@ -59,6 +73,8 @@ func TestInitKeyRegistry(t *testing.T) {
func TestInitKeyRotation(t *testing.T) {
rand := testRand()
client := fake.NewSimpleClientset()
client.PrependReactor("create", "secrets", generateNameReactor)

registry, err := initKeyRegistry(client, rand, "namespace", "prefix", "label", 1024)
if err != nil {
t.Fatalf("initKeyRegistry() returned err: %v", err)
Expand Down Expand Up @@ -95,6 +111,8 @@ func TestInitKeyRotation(t *testing.T) {
func TestInitKeyRotationTick(t *testing.T) {
rand := testRand()
client := fake.NewSimpleClientset()
client.PrependReactor("create", "secrets", generateNameReactor)

registry, err := initKeyRegistry(client, rand, "namespace", "prefix", "label", 1024)
if err != nil {
t.Fatalf("initKeyRegistry() returned err: %v", err)
Expand Down Expand Up @@ -138,6 +156,8 @@ func TestReuseKey(t *testing.T) {
}

client := fake.NewSimpleClientset()
client.PrependReactor("create", "secrets", generateNameReactor)

_, err = writeKey(client, key, []*x509.Certificate{cert}, "namespace", SealedSecretsKeyLabel, "prefix")
if err != nil {
t.Errorf("writeKey() failed with: %v", err)
Expand Down Expand Up @@ -180,6 +200,8 @@ func TestRenewStaleKey(t *testing.T) {
oldAge = period - staleness
)
client := fake.NewSimpleClientset()
client.PrependReactor("create", "secrets", generateNameReactor)

_, err = writeKey(client, key, []*x509.Certificate{cert}, "namespace", SealedSecretsKeyLabel, "prefix",
writeKeyWithCreationTime(metav1.NewTime(time.Now().Add(-oldAge))))
if err != nil {
Expand Down Expand Up @@ -250,6 +272,7 @@ func TestLegacySecret(t *testing.T) {
}

client := fake.NewSimpleClientset()
client.PrependReactor("create", "secrets", generateNameReactor)

_, err = writeLegacyKey(client, key, []*x509.Certificate{cert}, "namespace", "prefix")
if err != nil {
Expand Down
127 changes: 127 additions & 0 deletions vendor/k8s.io/apimachinery/pkg/util/rand/rand.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ k8s.io/apimachinery/pkg/util/json
k8s.io/apimachinery/pkg/util/mergepatch
k8s.io/apimachinery/pkg/util/naming
k8s.io/apimachinery/pkg/util/net
k8s.io/apimachinery/pkg/util/rand
k8s.io/apimachinery/pkg/util/runtime
k8s.io/apimachinery/pkg/util/sets
k8s.io/apimachinery/pkg/util/strategicpatch
Expand Down