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

plog.TestLogger returns a buffer instead of taking one in

Browse Source
This commit is contained in:
Joshua Casey
2024-11-07 17:46:01 -06:00
parent dc86c9305c
commit 0c131f11f8
17 changed files with 52 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/apicerts/certs_expirer_test.go
+5 -5
View File
@@ -4,14 +4,12 @@
package apicerts
import (
"bytes"
"context"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"crypto/x509"
"errors"
"io"
"strings"
"testing"
"time"
@@ -96,6 +94,8 @@ func TestExpirerControllerFilters(t *testing.T) {
0,
).Core().V1().Secrets()
withInformer := testutil.NewObservableWithInformerOption()
logger, _ := plog.TestLogger(t)
_ = NewCertsExpirerController(
test.namespace,
certsSecretResourceName,
@@ -104,7 +104,7 @@ func TestExpirerControllerFilters(t *testing.T) {
withInformer.WithInformer,
0, // renewBefore, not needed
"", // not needed
plog.TestLogger(t, io.Discard),
logger,
)
unrelated := corev1.Secret{}
@@ -256,7 +256,7 @@ func TestExpirerControllerSync(t *testing.T) {
0,
)
var log bytes.Buffer
logger, log := plog.TestLogger(t)
c := NewCertsExpirerController(
namespace,
@@ -266,7 +266,7 @@ func TestExpirerControllerSync(t *testing.T) {
controllerlib.WithInformer,
test.renewBefore,
fakeTestKey,
plog.TestLogger(t, &log),
logger,
)
// Must start informers before calling TestRunSynchronously().
internal/controller/authenticator/cachecleaner/cachecleaner_test.go
+1 -3
View File
@@ -4,7 +4,6 @@
package cachecleaner
import (
"bytes"
"context"
"testing"
@@ -146,8 +145,7 @@ func TestController(t *testing.T) {
}
webhooks := informers.Authentication().V1alpha1().WebhookAuthenticators()
jwtAuthenticators := informers.Authentication().V1alpha1().JWTAuthenticators()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
controller := New(cache, webhooks, jwtAuthenticators, logger)
internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go
+3 -7
View File
@@ -4,7 +4,6 @@
package jwtcachefiller
import (
"bytes"
"context"
"crypto/ecdsa"
"crypto/elliptic"
@@ -2414,8 +2413,7 @@ func TestController(t *testing.T) {
kubeInformers := kubeinformers.NewSharedInformerFactory(kubernetesfake.NewSimpleClientset(tt.secretsAndConfigMaps...), 0)
cache := authncache.New()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
if tt.cache != nil {
tt.cache(t, cache, tt.wantClose)
@@ -2892,8 +2890,7 @@ func TestControllerFilterSecret(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
@@ -2953,8 +2950,7 @@ func TestControllerFilterConfigMap(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go
+3 -7
View File
@@ -4,7 +4,6 @@
package webhookcachefiller
import (
"bytes"
"context"
"crypto/tls"
"encoding/base64"
@@ -2128,8 +2127,7 @@ func TestController(t *testing.T) {
kubeInformers := kubeinformers.NewSharedInformerFactory(kubernetesfake.NewSimpleClientset(tt.secretsAndConfigMaps...), 0)
cache := authncache.New()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
if tt.cache != nil {
tt.cache(t, cache)
@@ -2375,8 +2373,7 @@ func TestControllerFilterSecret(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
@@ -2439,8 +2436,7 @@ func TestControllerFilterConfigMap(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
internal/controller/conditionsutil/conditions_util_test.go
+1 -3
View File
@@ -4,7 +4,6 @@
package conditionsutil
import (
"bytes"
"strings"
"testing"
"time"
@@ -167,8 +166,7 @@ func TestMergeIDPConditions(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
result := MergeConditions(
test.newConditions,
internal/controller/impersonatorconfig/impersonator_config_test.go
+2 -5
View File
@@ -4,7 +4,6 @@
package impersonatorconfig
import (
"bytes"
"context"
"crypto/tls"
"crypto/x509"
@@ -75,8 +74,7 @@ func TestImpersonatorConfigControllerOptions(t *testing.T) {
servicesInformer := sharedInformerFactory.Core().V1().Services()
secretsInformer := sharedInformerFactory.Core().V1().Secrets()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
_ = NewImpersonatorConfigController(
installedInNamespace,
@@ -569,8 +567,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
// Defer starting the informers until the last possible moment so that the
// nested Before's can keep adding things to the informer caches.
var startInformersAndController = func() {
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
// Set this at the last second to allow for injection of server override.
subject = NewImpersonatorConfigController(
internal/controller/kubecertagent/kubecertagent_test.go
+1 -3
View File
@@ -4,7 +4,6 @@
package kubecertagent
import (
"bytes"
"context"
"fmt"
"slices"
@@ -1156,8 +1155,7 @@ func TestAgentController(t *testing.T) {
kubeInformers := informers.NewSharedInformerFactory(kubeClientset, 0)
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()
internal/controller/kubecertagent/legacypodcleaner_test.go
+1 -3
View File
@@ -4,7 +4,6 @@
package kubecertagent
import (
"bytes"
"context"
"fmt"
"testing"
@@ -149,8 +148,7 @@ func TestLegacyPodCleanerController(t *testing.T) {
}
kubeInformers := informers.NewSharedInformerFactory(kubeClientset, 0)
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
controller := NewLegacyPodCleanerController(
AgentConfig{
Namespace: "concierge",
internal/controller/serviceaccounttokencleanup/legacy_service_account_token_cleanup_controller_test.go
+4 -5
View File
@@ -4,7 +4,6 @@
package serviceaccounttokencleanup
import (
"bytes"
"context"
"errors"
"testing"
@@ -29,14 +28,14 @@ func TestNewServiceAccountTokenCleanupController(t *testing.T) {
observableWithInformerOption := testutil.NewObservableWithInformerOption()
secretsInformer := kubeinformers.NewSharedInformerFactory(nil, 0).Core().V1().Secrets()
var log bytes.Buffer
logger, _ := plog.TestLogger(t)
_ = NewLegacyServiceAccountTokenCleanupController(
namespace,
legacySecretName,
nil, // not needed for this test
secretsInformer,
observableWithInformerOption.WithInformer,
plog.TestLogger(t, &log),
logger,
)
secretsInformerFilter := observableWithInformerOption.GetFilterForInformer(secretsInformer)
@@ -138,14 +137,14 @@ func TestSync(t *testing.T) {
tt.addReactors(kubeAPIClient)
}
var log bytes.Buffer
logger, _ := plog.TestLogger(t)
controller := NewLegacyServiceAccountTokenCleanupController(
tt.namespace,
tt.secretNameToDelete,
kubeAPIClient,
kubeInformers.Core().V1().Secrets(),
controllerlib.WithInformer,
plog.TestLogger(t, &log),
logger,
)
ctx, cancel := context.WithCancel(context.Background())
internal/controller/supervisorconfig/githubupstreamwatcher/github_upstream_watcher_test.go
+5 -11
View File
@@ -4,7 +4,6 @@
package githubupstreamwatcher
import (
"bytes"
"context"
"crypto/x509"
"encoding/base64"
@@ -2451,8 +2450,7 @@ func TestController(t *testing.T) {
),
})
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
gitHubIdentityProviderInformer := supervisorInformers.IDP().V1alpha1().GitHubIdentityProviders()
@@ -2846,8 +2844,7 @@ func TestController_OnlyWantActions(t *testing.T) {
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(tt.secrets...), 0)
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
controller := New(
namespace,
@@ -2967,8 +2964,7 @@ func TestGitHubUpstreamWatcherControllerFilterSecret(t *testing.T) {
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0)
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
observableInformers := testutil.NewObservableWithInformerOption()
secretInformer := kubeInformers.Core().V1().Secrets()
@@ -3024,8 +3020,7 @@ func TestGitHubUpstreamWatcherControllerFilterConfigMaps(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
observableInformers := testutil.NewObservableWithInformerOption()
configMapInformer := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0).Core().V1().ConfigMaps()
@@ -3081,8 +3076,7 @@ func TestGitHubUpstreamWatcherControllerFilterGitHubIDP(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
observableInformers := testutil.NewObservableWithInformerOption()
gitHubIdentityProviderInformer := supervisorinformers.NewSharedInformerFactory(supervisorfake.NewSimpleClientset(), 0).IDP().V1alpha1().GitHubIdentityProviders()
internal/controller/supervisorconfig/oidcupstreamwatcher/oidc_upstream_watcher_test.go
+3 -7
View File
@@ -4,7 +4,6 @@
package oidcupstreamwatcher
import (
"bytes"
"context"
"crypto/x509"
"encoding/base64"
@@ -113,8 +112,7 @@ func TestOIDCUpstreamWatcherControllerFilterSecret(t *testing.T) {
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
withInformer := testutil.NewObservableWithInformerOption()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
New(
cache,
@@ -173,8 +171,7 @@ func TestOIDCUpstreamWatcherControllerFilterConfigMaps(t *testing.T) {
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
withInformer := testutil.NewObservableWithInformerOption()
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, _ := plog.TestLogger(t)
New(
cache,
@@ -1626,8 +1623,7 @@ func TestOIDCUpstreamWatcherControllerSync(t *testing.T) {
&upstreamoidc.ProviderConfig{Name: "initial-entry"},
})
var log bytes.Buffer
logger := plog.TestLogger(t, &log)
logger, log := plog.TestLogger(t)
validatorCache := expiringcache.NewExpiring()
if tt.inputValidatorCache != nil {