add azure support

Author: pasha-codefresh

codefresh/context/storage.go

@@ -5,29 +5,39 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func ConvertStorageContext(context []interface{}) map[string]interface{} {
+func convertStorageContext(context []interface{}, auth map[string]interface{}) map[string]interface{} {
+	data := make(map[string]interface{})
+	data["auth"] = auth
+	return data
+}
+
+func ConvertJsonConfigStorageContext(context []interface{}) map[string]interface{} {
 	contextData := context[0].(map[string]interface{})
 	contextAuth := contextData["auth"].([]interface{})[0].(map[string]interface{})
-	data := make(map[string]interface{})
 	auth := make(map[string]interface{})
 	auth["type"] = contextAuth["type"]
 	auth["jsonConfig"] = contextAuth["json_config"]
-	data["auth"] = auth
-	return data
+	return convertStorageContext(context, auth)
+}
+
+func ConvertAzureStorageContext(context []interface{}) map[string]interface{} {
+	contextData := context[0].(map[string]interface{})
+	contextAuth := contextData["auth"].([]interface{})[0].(map[string]interface{})
+	auth := make(map[string]interface{})
+	auth["type"] = contextAuth["type"]
+	auth["account_name"] = contextAuth["account_name"]
+	auth["account_key"] = contextAuth["account_key"]
+	return convertStorageContext(context, auth)
 }
 
-func FlattenStorageContextConfig(spec cfClient.ContextSpec) []interface{} {
+func flattenStorageContextConfig(spec cfClient.ContextSpec, auth map[string]interface{}) []interface{} {
 
 	var res = make([]interface{}, 0)
 	m := make(map[string]interface{})
 
 	dataList := make([]interface{}, 0)
 	data := make(map[string]interface{})
 
-	auth := make(map[string]interface{})
-	auth["json_config"] = spec.Data["auth"].(map[string]interface{})["jsonConfig"]
-	auth["type"] = spec.Data["type"]
-
 	authList := make([]interface{}, 0)
 	authList = append(authList, auth)
 
@@ -41,6 +51,22 @@ func FlattenStorageContextConfig(spec cfClient.ContextSpec) []interface{} {
 
 }
 
+func FlattenJsonConfigStorageContextConfig(spec cfClient.ContextSpec) []interface{} {
+	auth := make(map[string]interface{})
+	auth["json_config"] = spec.Data["auth"].(map[string]interface{})["jsonConfig"]
+	auth["type"] = spec.Data["type"]
+	return flattenStorageContextConfig(spec, auth)
+}
+
+func FlattenAzureStorageContextConfig(spec cfClient.ContextSpec) []interface{} {
+	auth := make(map[string]interface{})
+	authParams := spec.Data["auth"].(map[string]interface{})
+	auth["account_name"] = authParams["account_name"]
+	auth["account_key"] = authParams["account_key"]
+	auth["type"] = spec.Data["type"]
+	return flattenStorageContextConfig(spec, auth)
+}
+
 func storageSchema(authSchema *schema.Schema) *schema.Schema {
 	return &schema.Schema{
 		Type:     schema.TypeList,

codefresh/resource_context.go

@@ -241,8 +241,10 @@ func flattenContextSpec(spec cfClient.ContextSpec) []interface{} {
 		m[normalizeFieldName(currentContextType)] = flattenContextConfig(spec)
 	case contextYaml, contextSecretYaml:
 		m[normalizeFieldName(currentContextType)] = flattenContextYaml(spec)
-	case contextGoogleStorage, contextS3Storage, contextAzureStorage:
-		m[normalizeFieldName(currentContextType)] = storageContext.FlattenStorageContextConfig(spec)
+	case contextGoogleStorage, contextS3Storage:
+		m[normalizeFieldName(currentContextType)] = storageContext.FlattenJsonConfigStorageContextConfig(spec)
+	case contextAzureStorage:
+		m[normalizeFieldName(currentContextType)] = storageContext.FlattenAzureStorageContextConfig(spec)
 	default:
 		log.Printf("[DEBUG] Invalid context type = %v", currentContextType)
 		return nil
@@ -291,13 +293,13 @@ func mapResourceToContext(d *schema.ResourceData) *cfClient.Context {
 		_ = yaml.Unmarshal([]byte(data.(string)), &normalizedContextData)
 	} else if data, ok := d.GetOk("spec.0." + normalizeFieldName(contextGoogleStorage) + ".0.data"); ok {
 		normalizedContextType = contextGoogleStorage
-		normalizedContextData = storageContext.ConvertStorageContext(data.([]interface{}))
+		normalizedContextData = storageContext.ConvertJsonConfigStorageContext(data.([]interface{}))
 	} else if data, ok := d.GetOk("spec.0." + normalizeFieldName(contextS3Storage) + ".0.data"); ok {
 		normalizedContextType = contextS3Storage
-		normalizedContextData = storageContext.ConvertStorageContext(data.([]interface{}))
+		normalizedContextData = storageContext.ConvertJsonConfigStorageContext(data.([]interface{}))
 	} else if data, ok := d.GetOk("spec.0." + normalizeFieldName(contextAzureStorage) + ".0.data"); ok {
 		normalizedContextType = contextAzureStorage
-		normalizedContextData = storageContext.ConvertStorageContext(data.([]interface{}))
+		normalizedContextData = storageContext.ConvertAzureStorageContext(data.([]interface{}))
 	}
 
 	return &cfClient.Context{