Recreated mocks for newest AWS SDK, fixed yaml import

kms/keysource_test.go

@@ -5,13 +5,14 @@ import (
 	"fmt"
 	"github.com/aws/aws-sdk-go/service/kms"
 	"github.com/stretchr/testify/mock"
+	"go.mozilla.org/sops/kms/mocks"
 	"testing"
 	"testing/quick"
 )
 
 func TestKMS(t *testing.T) {
 	// TODO: make this not terrible and mock KMS with a reverseable operation on the key, or something. Good luck running the tests on a machine that's not mine!
-	mockKMS := &MockKMSAPI{}
+	mockKMS := &mocks.KMSAPI{}
 	defer mockKMS.AssertExpectations(t)
 	kmsSvc = mockKMS
 	encryptOutput := &kms.EncryptOutput{}

yaml/config.go

@@ -7,7 +7,7 @@ import (
 	"path"
 	"regexp"
 
-	"github.com/mozilla-services/yaml.v2"
+	"github.com/mozilla-services/yaml"
 )
 
 type fileSystem interface {

yaml/store.go

@@ -2,7 +2,7 @@ package yaml
 
 import (
 	"fmt"
-	"github.com/mozilla-services/yaml.v2"
+	"github.com/mozilla-services/yaml"
 	"go.mozilla.org/sops"
 	"go.mozilla.org/sops/kms"
 	"go.mozilla.org/sops/pgp"