@@ -22,6 +22,7 @@ import (
2222 apierrors "k8s.io/apimachinery/pkg/api/errors"
2323 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424 "sigs.k8s.io/controller-runtime/pkg/client"
25+ ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2526
2627 secretsv1beta1 "github.com/hashicorp/vault-secrets-operator/api/v1beta1"
2728 "github.com/hashicorp/vault-secrets-operator/common"
@@ -1338,35 +1339,36 @@ func Test_CleanupOrphanedShadowSecrets(t *testing.T) {
13381339 }
13391340
13401341 ctx := context .Background ()
1341- clientBuilder := testutils .NewFakeClientBuilder (). Build ()
1342+ clientBuilder := testutils .NewFakeClientBuilder ()
13421343
13431344 for name , tt := range tests {
13441345 t .Run (name , func (t * testing.T ) {
1346+ client := clientBuilder .Build ()
13451347 r := & HCPVaultSecretsAppReconciler {
1346- Client : clientBuilder ,
1348+ Client : client ,
13471349 BackOffRegistry : NewBackOffRegistry (),
13481350 referenceCache : newResourceReferenceCache (),
13491351 }
13501352
13511353 // create the HCPVaultSecretsApp if the test case has one
13521354 if tt .o != nil {
1353- assert .NoError (t , clientBuilder .Create (ctx , tt .o ))
1355+ assert .NoError (t , client .Create (ctx , tt .o ))
13541356 }
13551357
13561358 // create the secret for the test case
1357- assert .NoError (t , clientBuilder .Create (ctx , tt .secret ))
1359+ assert .NoError (t , client .Create (ctx , tt .secret ))
13581360
13591361 // DeleteTimestamp is a read-only field, so Delete will need to be called to
13601362 // simulate deletion of the HCPVaultSecretsApp
13611363 if tt .isHCPVaultSecretsAppDeletionExpected {
1362- assert .NoError (t , clientBuilder .Delete (ctx , tt .o ))
1364+ assert .NoError (t , client .Delete (ctx , tt .o ))
13631365 }
13641366
13651367 r .cleanupOrphanedShadowSecrets (ctx )
13661368
13671369 if tt .isHCPVaultSecretsAppDeletionExpected {
13681370 deletedHVSApp := & secretsv1beta1.HCPVaultSecretsApp {}
1369- err := r .Get (ctx , client .ObjectKeyFromObject (tt .o ), deletedHVSApp )
1371+ err := r .Get (ctx , ctrlclient .ObjectKeyFromObject (tt .o ), deletedHVSApp )
13701372 assert .True (t , apierrors .IsNotFound (err ))
13711373 }
13721374
@@ -1376,7 +1378,7 @@ func Test_CleanupOrphanedShadowSecrets(t *testing.T) {
13761378 assert .True (t , apierrors .IsNotFound (err ))
13771379 } else {
13781380 secret := & corev1.Secret {}
1379- err := r .Get (ctx , client .ObjectKeyFromObject (tt .secret ), secret )
1381+ err := r .Get (ctx , ctrlclient .ObjectKeyFromObject (tt .secret ), secret )
13801382 assert .False (t , apierrors .IsNotFound (err ))
13811383 }
13821384 })
0 commit comments