Code clean up

Signed-off-by: Carlisia <carlisiac@vmware.com>

pkg/cloudprovider/aws/object_store_test.go

@@ -23,11 +23,12 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/heptio/ark/pkg/util/test"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/heptio/velero/pkg/util/test"
 )
 
 func TestIsValidSignatureVersion(t *testing.T) {
@@ -95,9 +96,9 @@ func TestObjectExists(t *testing.T) {
 			s := new(mockS3)
 			defer s.AssertExpectations(t)
 
-			o := &objectStore{
-				logger: test.NewLogger(),
-				s3:     s,
+			o := &ObjectStore{
+				log: test.NewLogger(),
+				s3:  s,
 			}
 
 			bucket := "b"

pkg/cloudprovider/gcp/object_store_test.go

@@ -133,7 +133,7 @@ func TestObjectExists(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			o := NewObjectStore().(*objectStore)
+			o := NewObjectStore(velerotest.NewLogger())
 			w := newFakeWriter(nil)
 			o.bucketWriter = w
 			w.attrsErr = tc.errorResponse

pkg/controller/backup_controller.go

@@ -158,8 +158,7 @@ func (c *backupController) processBackup(key string) error {
 	log.Debug("Running processBackup")
 	ns, name, err := cache.SplitMetaNamespaceKey(key)
 	if err != nil {
-		logContext.WithError(err).Errorf("error splitting key")
-		return nil
+		return errors.Wrap(err, "error splitting queue key")
 	}
 
 	log.Debug("Getting backup")

pkg/controller/backup_controller_test.go

@@ -101,8 +101,6 @@ func TestProcessBackupNonProcessedItems(t *testing.T) {
 				sharedInformers = informers.NewSharedInformerFactory(fake.NewSimpleClientset(), 0)
 				logger          = logging.DefaultLogger(logrus.DebugLevel)
 			)
-			defer backupper.AssertExpectations(t)
-			defer cloudBackups.AssertExpectations(t)
 
 			c := &backupController{
 				genericController: newGenericController("backup-test", logger),