Fix the tests

kanisterio · Aug 20, 2019 · 697e8c9 · 697e8c9
1 parent a9a2b33
commit 697e8c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/pkg/blockstorage/blockstorage_test.go b/pkg/blockstorage/blockstorage_test.go
@@ -10,9 +10,9 @@ import (
 	. "gopkg.in/check.v1"
 
 	"github.com/kanisterio/kanister/pkg/blockstorage"
-	"github.com/kanisterio/kanister/pkg/blockstorage/awsebs"
 	"github.com/kanisterio/kanister/pkg/blockstorage/getter"
 	ktags "github.com/kanisterio/kanister/pkg/blockstorage/tags"
+	awsconfig "github.com/kanisterio/kanister/pkg/config/aws"
 )
 
 const (
@@ -246,17 +246,17 @@ func (s *BlockStorageProviderSuite) getConfig(c *C, region string) map[string]st
 	config := make(map[string]string)
 	switch s.storageType {
 	case blockstorage.TypeEBS:
-		config[awsebs.ConfigRegion] = region
-		accessKey, ok := os.LookupEnv(awsebs.AccessKeyID)
+		config[awsconfig.ConfigRegion] = region
+		accessKey, ok := os.LookupEnv(awsconfig.AccessKeyID)
 		if !ok {
 			c.Skip("The necessary env variable AWS_ACCESS_KEY_ID is not set.")
 		}
-		secretAccessKey, ok := os.LookupEnv(awsebs.SecretAccessKey)
+		secretAccessKey, ok := os.LookupEnv(awsconfig.SecretAccessKey)
 		if !ok {
 			c.Skip("The necessary env variable AWS_SECRET_ACCESS_KEY is not set.")
 		}
-		config[awsebs.AccessKeyID] = accessKey
-		config[awsebs.SecretAccessKey] = secretAccessKey
+		config[awsconfig.AccessKeyID] = accessKey
+		config[awsconfig.SecretAccessKey] = secretAccessKey
 	case blockstorage.TypeGPD:
 		creds, ok := os.LookupEnv(blockstorage.GoogleCloudCreds)
 		if !ok {

diff --git a/pkg/function/e2e_volume_snapshot_test.go b/pkg/function/e2e_volume_snapshot_test.go
@@ -16,8 +16,8 @@ import (
 	kanister "github.com/kanisterio/kanister/pkg"
 	crv1alpha1 "github.com/kanisterio/kanister/pkg/apis/cr/v1alpha1"
 	"github.com/kanisterio/kanister/pkg/blockstorage"
-	"github.com/kanisterio/kanister/pkg/blockstorage/awsebs"
 	"github.com/kanisterio/kanister/pkg/client/clientset/versioned"
+	awsconfig "github.com/kanisterio/kanister/pkg/config/aws"
 	"github.com/kanisterio/kanister/pkg/kube"
 	"github.com/kanisterio/kanister/pkg/param"
 	"github.com/kanisterio/kanister/pkg/resource"
@@ -327,7 +327,7 @@ func (s *VolumeSnapshotTestSuite) getCreds(c *C, cli kubernetes.Interface, names
 	switch {
 	case pv.Spec.AWSElasticBlockStore != nil:
 		_ = GetEnvOrSkip(c, AWSRegion)
-		return GetEnvOrSkip(c, awsebs.AccessKeyID), GetEnvOrSkip(c, awsebs.SecretAccessKey), crv1alpha1.LocationTypeS3Compliant, nil
+		return GetEnvOrSkip(c, awsconfig.AccessKeyID), GetEnvOrSkip(c, awsconfig.SecretAccessKey), crv1alpha1.LocationTypeS3Compliant, nil
 
 	case pv.Spec.GCEPersistentDisk != nil:
 		serviceKey, err := getServiceKey(c)

diff --git a/pkg/testutil/fixture.go b/pkg/testutil/fixture.go
@@ -11,7 +11,7 @@ import (
 
 	crv1alpha1 "github.com/kanisterio/kanister/pkg/apis/cr/v1alpha1"
 	"github.com/kanisterio/kanister/pkg/blockstorage"
-	"github.com/kanisterio/kanister/pkg/blockstorage/awsebs"
+	awsconfig "github.com/kanisterio/kanister/pkg/config/aws"
 	"github.com/kanisterio/kanister/pkg/objectstore"
 	"github.com/kanisterio/kanister/pkg/param"
 )
@@ -26,8 +26,8 @@ func ObjectStoreProfileOrSkip(c *check.C, osType objectstore.ProviderType, locat
 
 	switch osType {
 	case objectstore.ProviderTypeS3:
-		key = GetEnvOrSkip(c, awsebs.AccessKeyID)
-		val = GetEnvOrSkip(c, awsebs.SecretAccessKey)
+		key = GetEnvOrSkip(c, awsconfig.AccessKeyID)
+		val = GetEnvOrSkip(c, awsconfig.SecretAccessKey)
 	case objectstore.ProviderTypeGCS:
 		GetEnvOrSkip(c, blockstorage.GoogleCloudCreds)
 		creds, err := google.FindDefaultCredentials(context.Background(), compute.ComputeScope)