Merge pull request #28 from jeremyrickard/update-templating-paths

Update for better user specified arm templates

Author: jeremyrickard

pkg/azure/arm/arm.go

@@ -34,15 +34,13 @@ type Deployer interface {
 		location string,
 		template []byte,
 		armParams map[string]interface{},
-		tags map[string]string,
 	) (map[string]interface{}, error)
 	Update(
 		deploymentName string,
 		resourceGroupName string,
 		location string,
 		template []byte,
 		armParams map[string]interface{},
-		tags map[string]string,
 	) (map[string]interface{}, error)
 	Delete(deploymentName string, resourceGroupName string) error
 }
@@ -76,7 +74,6 @@ func (d *deployer) Deploy(
 	location string,
 	template []byte,
 	armParams map[string]interface{},
-	tags map[string]string,
 ) (map[string]interface{}, error) {
 
 	// Get the deployment and its current status
@@ -105,7 +102,6 @@ func (d *deployer) Deploy(
 			location,
 			template,
 			armParams,
-			tags,
 		); err != nil {
 			return nil, fmt.Errorf(
 				`error deploying "%s" in resource group "%s": %s`,
@@ -165,7 +161,6 @@ func (d *deployer) Update(
 	location string,
 	template []byte,
 	armParams map[string]interface{},
-	tags map[string]string,
 ) (map[string]interface{}, error) {
 	// Get the deployment's current status
 	_, ds, err := d.getDeploymentAndStatus(
@@ -223,7 +218,6 @@ func (d *deployer) Update(
 			location,
 			template,
 			armParams,
-			tags,
 		)
 		if err != nil {
 			return nil, fmt.Errorf(
@@ -329,7 +323,6 @@ func (d *deployer) doDeployment(
 	location string,
 	armTemplate []byte,
 	armParams map[string]interface{},
-	tags map[string]string,
 ) (*resourcesSDK.DeploymentExtended, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -363,22 +356,11 @@ func (d *deployer) doDeployment(
 		return nil, fmt.Errorf("error unmarshaling ARM template: %s", err)
 	}
 
-	// Deal with the possibility that tags == nil
-	if tags == nil {
-		tags = make(map[string]string)
-	}
-
-	// Augment the provided tags with heritage information
-	tags["heritage"] = "porter-azure-mixin"
-
 	// Deal with the possiiblity that params == nil
 	if armParams == nil {
 		armParams = make(map[string]interface{})
 	}
 
-	// Augment the params with tags
-	armParams["tags"] = tags
-
 	// Convert a simple map[string]interface{} to the more complex
 	// map[string]map[string]interface{} required by the deployments client
 	armParamsMap := map[string]interface{}{}

pkg/azure/arm/template.go

@@ -19,7 +19,7 @@ func GetTemplate(kind string) ([]byte, error) {
 
 func (d deployer) FindTemplate(kind, template string) ([]byte, error) {
 	if kind == "arm" {
-		template := fmt.Sprintf("/cnab/arm/templates/%s", template)
+		template := fmt.Sprintf("/cnab/app/%s", template)
 		f, err := d.context.FileSystem.Open(template)
 		if err != nil {
 			return nil, errors.Wrap(err, fmt.Sprintf("couldn't find template %s", template))

pkg/azure/arm/template_test.go

@@ -30,18 +30,14 @@ const mysqlTemplate = `{
         },
         "sslEnforcement": {
             "type": "string"
-        },
-		"tags": {
-			"type": "object"
-		}
+        }
     },
     "resources": [
         {
             "apiVersion": "2017-12-01-preview",
             "kind": "",
             "location": "[parameters('location')]",
             "name": "[parameters('serverName')]",
-			"tags": "[parameters('tags')]",
             "properties": {
                 "version": "[parameters('version')]",
                 "administratorLogin": "[parameters('administratorLogin')]",

pkg/azure/arm/templates/aci.template

@@ -43,9 +43,6 @@
             "defaultValue" : "OnFailure",
 			"type": "String"
 		},
-        "tags": {
-			"type": "object"
-		},
 		"environmentVariables" : {
 			"type" : "array",
 			"defaultValue" : {
@@ -71,7 +68,6 @@
 	"resources": [{
 		"name": "[variables('name')]",
 		"type": "Microsoft.ContainerInstance/containerGroups",
-        "tags": "[parameters('tags')]",
 		"apiVersion": "[variables('APIversion')]",
 		"location": "[variables('location')]",
 		"properties": {

pkg/azure/arm/templates/aks.template

@@ -76,9 +76,6 @@
             "metadata": {
                 "description": "The version of Kubernetes."
             }
-        },
-        "tags": {
-            "type": "object"
         }
     },
     "resources": [
@@ -87,7 +84,6 @@
             "type": "Microsoft.ContainerService/managedClusters",
             "location": "[parameters('location')]",
             "name": "[parameters('clusterName')]",
-            "tags": "[parameters('tags')]",
             "properties": {
                 "kubernetesVersion": "[parameters('kubernetesVersion')]",
                 "dnsPrefix": "[parameters('dnsPrefix')]",

pkg/azure/arm/templates/cosmosdb.template

@@ -50,17 +50,13 @@
             "metadata": {
                 "description": "Conditional to enable api specific capabilities if MongoDB is the API chosen."
             }
-        },
-        "tags": {
-            "type": "object"
         }
     },
     "variables": {},
     "resources": [
         {
             "apiVersion": "[parameters('apiVersion')]",
             "kind": "[parameters('kind')]",
-            "tags": "[parameters('tags')]",
             "type": "Microsoft.DocumentDB/databaseAccounts",
             "name": "[parameters('name')]",
             "location": "[parameters('location')]",

pkg/azure/arm/templates/mysql.template

@@ -22,18 +22,14 @@
         },
         "sslEnforcement": {
             "type": "string"
-        },
-		"tags": {
-			"type": "object"
-		}
+        }
     },
     "resources": [
         {
             "apiVersion": "2017-12-01-preview",
             "kind": "",
             "location": "[parameters('location')]",
             "name": "[parameters('serverName')]",
-			"tags": "[parameters('tags')]",
             "properties": {
                 "version": "[parameters('version')]",
                 "administratorLogin": "[parameters('administratorLogin')]",

pkg/azure/arm/templates/storage.template

@@ -10,9 +10,6 @@
     },
     "storageContainerName": {
       "type": "string"
-    },
-    "tags": {
-      "type": "object"
     }
   },
   "resources": [
@@ -25,7 +22,6 @@
       },
       "kind": "StorageV2",
       "location": "[parameters('location')]",
-      "tags": "[parameters('tags')]",
       "identity": {
         "type": "SystemAssigned"
       },

pkg/azure/install.go

@@ -60,7 +60,6 @@ func (m *Mixin) Install() error {
 		step.Parameters["location"].(string),
 		t,
 		step.Parameters, //arm params
-		nil,             //Tags not supported right now
 	)
 	if err != nil {
 		return err