fix: Adding in resourceGroup and bucketName to get Velero Azure plugi…

…n operational

feat: Added in half implementation of AKSBucketProvider

Encapsulated the storage account parsing down close the CLI which appears to be the only part that requires them as separate arguments
... to get Velero boot operational

Signed-off-by: Chris Mellard <[email protected]>

Fixing up cherry pick empty commit error that has different response for cherry-pick vs rebase

pkg/cloud/aks/aks.go

@@ -3,10 +3,13 @@ package aks
 import (
 	b64 "encoding/base64"
 	"encoding/json"
+	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/jenkins-x/jx-logging/pkg/log"
 	"github.com/jenkins-x/jx/v2/pkg/util"
+	"github.com/pkg/errors"
 )
 
 // AzureRunner an Azure CLI runner to interact with Azure
@@ -28,6 +31,10 @@ type acr struct {
 	Name  string `json:"name"`
 }
 
+type containerExists struct {
+	Exists bool `json:"exists"`
+}
+
 type password struct {
 	Name  string `json:"name"`
 	Value string `json:"value"`
@@ -46,6 +53,10 @@ type config struct {
 	Auths map[string]*auth `json:"auths,omitempty"`
 }
 
+var (
+	azureContainerURIRegExp = regexp.MustCompile(`https://(?P<first>\w+)\.blob\.core\.windows\.net/(?P<second>\w+)`)
+)
+
 // NewAzureRunnerWithCommander specific the command runner for Azure CLI.
 func NewAzureRunnerWithCommander(runner util.Commander) *AzureRunner {
 	return &AzureRunner{
@@ -242,3 +253,108 @@ func (az *AzureRunner) azureCLI(args ...string) (string, error) {
 	az.Runner.SetArgs(args)
 	return az.Runner.RunWithoutRetry()
 }
+
+func parseContainerURL(bucketURL string) (string, string, error) {
+	match := azureContainerURIRegExp.FindStringSubmatch(bucketURL)
+	if len(match) == 3 {
+		return match[1], match[2], nil
+	}
+	return "", "", errors.New(fmt.Sprintf("Azure Blob Container Url %s could not be parsed to determine storage account and container name", bucketURL))
+}
+
+// ContainerExists checks if an Azure Storage Container exists
+func (az *AzureRunner) ContainerExists(bucketURL string) (bool, error) {
+	storageAccount, bucketName, err := parseContainerURL(bucketURL)
+	if err != nil {
+		return false, err
+	}
+
+	accessKey, err := az.GetStorageAccessKey(storageAccount)
+	if err != nil {
+		return false, err
+	}
+
+	bucketExistsArgs := []string{
+		"storage",
+		"container",
+		"exists",
+		"-n",
+		bucketName,
+		"--account-name",
+		storageAccount,
+		"--account-key",
+		accessKey,
+	}
+
+	cmdResult, err := az.azureCLI(bucketExistsArgs...)
+
+	if err != nil {
+		log.Logger().Infof("Error checking bucket exists: %s, %s", cmdResult, err)
+		return false, err
+	}
+
+	containerExists := containerExists{}
+	err = json.Unmarshal([]byte(cmdResult), &containerExists)
+	if err != nil {
+		return false, errors.Wrap(err, "unmarshalling Azure container exists command")
+	}
+	return containerExists.Exists, nil
+
+}
+
+// CreateContainer creates a Blob container within Azure Storage
+func (az *AzureRunner) CreateContainer(bucketURL string) error {
+	storageAccount, bucketName, err := parseContainerURL(bucketURL)
+	if err != nil {
+		return err
+	}
+
+	accessKey, err := az.GetStorageAccessKey(storageAccount)
+	if err != nil {
+		return err
+	}
+
+	createContainerArgs := []string{
+		"storage",
+		"container",
+		"create",
+		"-n",
+		bucketName,
+		"--account-name",
+		storageAccount,
+		"--fail-on-exist",
+		"--account-key",
+		accessKey,
+	}
+
+	cmdResult, err := az.azureCLI(createContainerArgs...)
+
+	if err != nil {
+		log.Logger().Infof("Error creating bucket: %s, %s", cmdResult, err)
+		return err
+	}
+
+	return nil
+}
+
+// GetStorageAccessKey retrieves access keys for an Azure storage account
+func (az *AzureRunner) GetStorageAccessKey(storageAccount string) (string, error) {
+	getStorageAccessKeyArgs := []string{
+		"storage",
+		"account",
+		"keys",
+		"list",
+		"-n",
+		storageAccount,
+		"--query",
+		"[?keyName=='key1'].value | [0]",
+	}
+
+	cmdResult, err := az.azureCLI(getStorageAccessKeyArgs...)
+
+	if err != nil {
+		return "", err
+	}
+
+	return cmdResult, nil
+}

pkg/cloud/aks/interface.go

@@ -0,0 +1,8 @@
+package aks
+
+// AzureStorage Interface for Azure Storage commands
+type AzureStorage interface {
+	ContainerExists(bucketURL string) (bool, error)
+	CreateContainer(bucketURL string) error
+	GetStorageAccessKey(storageAccount string) (string, error)
+}