Add Azure ObjectStore support to kanister (#5753)

kanisterio · Jun 6, 2019 · 5292adb · 5292adb
1 parent bd17a14
commit 5292adb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/pkg/blockstorage/helpers.go b/pkg/blockstorage/helpers.go
@@ -8,10 +8,12 @@ import (
 
 // Google Cloud environment variable names
 const (
-	GoogleCloudZone  = "CLOUDSDK_COMPUTE_ZONE"
-	GoogleCloudCreds = "GOOGLE_APPLICATION_CREDENTIALS"
-	GoogleProjectID  = "projectID"
-	GoogleServiceKey = "serviceKey"
+	GoogleCloudZone     = "CLOUDSDK_COMPUTE_ZONE"
+	GoogleCloudCreds    = "GOOGLE_APPLICATION_CREDENTIALS"
+	GoogleProjectID     = "projectID"
+	GoogleServiceKey    = "serviceKey"
+	AzureStorageAccount = "AZURE_STORAGE_ACCOUNT_NAME"
+	AzureStorageKey     = "AZURE_STORAGE_ACCOUNT_KEY"
 )
 
 // SanitizeTags are used to sanitize the tags

diff --git a/pkg/location/location.go b/pkg/location/location.go
@@ -99,6 +99,8 @@ func getProviderType(lType crv1alpha1.LocationType) (objectstore.ProviderType, e
 		return objectstore.ProviderTypeS3, nil
 	case crv1alpha1.LocationTypeGCS:
 		return objectstore.ProviderTypeGCS, nil
+	case crv1alpha1.LocationTypeAzure:
+		return objectstore.ProviderTypeAzure, nil
 	default:
 		return "", errors.Errorf("Unsupported Location type: %s", lType)
 	}
@@ -136,6 +138,12 @@ func getOSSecret(pType objectstore.ProviderType, cred param.Credential) (*object
 			ProjectID:  cred.KeyPair.ID,
 			ServiceKey: cred.KeyPair.Secret,
 		}
+	case objectstore.ProviderTypeAzure:
+		secret.Type = objectstore.SecretTypeAzStorageAccount
+		secret.Azure = &objectstore.SecretAzure{
+			StorageAccount: cred.KeyPair.ID,
+			StorageKey:     cred.KeyPair.Secret,
+		}
 	default:
 		return nil, errors.Errorf("unknown or unsupported provider type '%s'", pType)
 	}

diff --git a/pkg/location/location_test.go b/pkg/location/location_test.go
@@ -10,6 +10,7 @@ import (
 	. "gopkg.in/check.v1"
 
 	crv1alpha1 "github.com/kanisterio/kanister/pkg/apis/cr/v1alpha1"
+	"github.com/kanisterio/kanister/pkg/blockstorage"
 	"github.com/kanisterio/kanister/pkg/objectstore"
 	"github.com/kanisterio/kanister/pkg/param"
 	"github.com/kanisterio/kanister/pkg/testutil"
@@ -36,6 +37,7 @@ const (
 
 var _ = Suite(&LocationSuite{osType: objectstore.ProviderTypeS3, region: testRegionS3})
 var _ = Suite(&LocationSuite{osType: objectstore.ProviderTypeGCS, region: ""})
+var _ = Suite(&LocationSuite{osType: objectstore.ProviderTypeAzure, region: ""})
 
 func (s *LocationSuite) SetUpSuite(c *C) {
 	var location crv1alpha1.Location
@@ -45,19 +47,23 @@ func (s *LocationSuite) SetUpSuite(c *C) {
 		testutil.GetEnvOrSkip(c, AWSSecretAccessKey)
 		location = crv1alpha1.Location{
 			Type:   crv1alpha1.LocationTypeS3Compliant,
-			Bucket: testBucketName,
 			Region: s.region,
 		}
 	case objectstore.ProviderTypeGCS:
 		testutil.GetEnvOrSkip(c, GoogleCloudCreds)
 		location = crv1alpha1.Location{
-			Type:   crv1alpha1.LocationTypeGCS,
-			Bucket: testBucketName,
+			Type: crv1alpha1.LocationTypeGCS,
+		}
+	case objectstore.ProviderTypeAzure:
+		testutil.GetEnvOrSkip(c, blockstorage.AzureStorageAccount)
+		testutil.GetEnvOrSkip(c, blockstorage.AzureStorageKey)
+		location = crv1alpha1.Location{
+			Type: crv1alpha1.LocationTypeAzure,
 		}
 	default:
 		c.Fatalf("Unrecognized objectstore '%s'", s.osType)
 	}
-
+	location.Bucket = testBucketName
 	s.profile = *testutil.ObjectStoreProfileOrSkip(c, s.osType, location)
 	var err error
 	ctx := context.Background()

diff --git a/pkg/testutil/fixture.go b/pkg/testutil/fixture.go
@@ -31,6 +31,9 @@ func ObjectStoreProfileOrSkip(c *check.C, osType objectstore.ProviderType, locat
 		c.Check(err, check.IsNil)
 		key = creds.ProjectID
 		val = string(creds.JSON)
+	case objectstore.ProviderTypeAzure:
+		key = GetEnvOrSkip(c, blockstorage.AzureStorageAccount)
+		val = GetEnvOrSkip(c, blockstorage.AzureStorageKey)
 	}
 	return &param.Profile{
 		Location: location,