Resolves #12: option to override pre-tag name instead of using Resour…

…ce Group name
Badgerati · May 16, 2017 · b022b62 · b022b62
1 parent b4d5ddd
commit b022b62
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 7 deletions.
diff --git a/examples/basic-vm-pretag/Foggfile b/examples/basic-vm-pretag/Foggfile
@@ -0,0 +1,14 @@
+{
+    "SubscriptionName": "<SUB_NAME_HERE>",
+    "Groups": [
+        {
+            "ResourceGroupName": "basic-pretag-rg",
+            "Location": "westeurope",
+            "TemplatePath": ".\\template.json",
+            "VNetAddress": "10.6.0.0/16",
+            "SubnetAddresses": {
+                "vm": "10.6.0.0/24"
+            }
+        }
+    ]
+}
diff --git a/examples/basic-vm-pretag/template.json b/examples/basic-vm-pretag/template.json
@@ -0,0 +1,35 @@
+{
+    "pretag": "pretag",
+    "template": [
+        {
+            "tag": "vm",
+            "type": "vm",
+            "count": 1,
+            "provisioners": [
+                "remoting"
+            ],
+            "usePublicIP": true,
+            "os": {
+                "size": "Standard_DS1_v2",
+                "type": "Windows",
+                "publisher": "MicrosoftWindowsServer",
+                "offer": "WindowsServer",
+                "skus": "2016-Datacenter"
+            }
+        }
+    ],
+    "provisioners": {
+        "remoting": "dsc: @{remoting}"
+    },
+    "firewall": {
+        "inbound": [
+            {
+                "name": "RDP",
+                "priority": 4095,
+                "source": "*:*",
+                "destination": "@{subnet}:3389",
+                "access": "Allow"
+            }
+        ]
+    }
+}
diff --git a/src/Fogg.ps1 b/src/Fogg.ps1
@@ -177,6 +177,12 @@ try
         # Check the template section
         $vmCount = Test-Template -Template $template.template -FoggObject $FoggObject -OS $template.os
 
+        # If we have a pretag on the template, set against this FoggObject
+        if (![string]::IsNullOrWhiteSpace($template.pretag))
+        {
+            $FoggObject.PreTag = $template.pretag.ToLowerInvariant()
+        }
+
 
         # If we're using an existng virtual network, ensure it actually exists
         if ($FoggObject.UseExistingVNet)
@@ -223,7 +229,7 @@ try
             foreach ($vm in $vms)
             {
                 $tag = $vm.tag.ToLowerInvariant()
-                $tagname = "$($FoggObject.ShortRGName)-$($tag)"
+                $tagname = "$($FoggObject.PreTag)-$($tag)"
                 $snetname = "$($tagname)-snet"
                 $subnet = $FoggObject.SubnetAddressMap[$tag]
 

diff --git a/src/Modules/FoggAzure.psm1 b/src/Modules/FoggAzure.psm1
@@ -161,7 +161,7 @@ function New-FoggStorageAccount
         $StorageTag = 'prm'
     }
 
-    $Name = ("$($FoggObject.ShortRGName)-$($StorageTag)-sa") -ireplace '-', ''
+    $Name = ("$($FoggObject.PreTag)-$($StorageTag)-sa") -ireplace '-', ''
 
     Write-Information "Creating storage account $($Name) in resource group $($FoggObject.ResourceGroupName)"
 
@@ -874,7 +874,7 @@ function New-FoggVirtualNetwork
         $FoggObject
     )
 
-    $Name = "$($FoggObject.ShortRGName)-vnet"
+    $Name = "$($FoggObject.PreTag)-vnet"
 
     Write-Information "Creating virtual network $($Name) in $($FoggObject.ResourceGroupName)"
 

diff --git a/src/Modules/FoggTools.psm1 b/src/Modules/FoggTools.psm1
@@ -942,7 +942,7 @@ function New-FoggGroupObject
     # create fogg object with params
     $group = @{}
     $group.ResourceGroupName = $ResourceGroupName
-    $group.ShortRGName = (Remove-RGTag $ResourceGroupName)
+    $group.PreTag = (Remove-RGTag $ResourceGroupName)
     $group.Location = $Location
     $group.VNetAddress = $VNetAddress
     $group.VNetResourceGroupName = $VNetResourceGroupName
@@ -962,7 +962,7 @@ function New-FoggGroupObject
 
     # post param alterations
     $groupObj.ResourceGroupName = $groupObj.ResourceGroupName.ToLowerInvariant()
-    $groupObj.ShortRGName = $groupObj.ShortRGName.ToLowerInvariant()
+    $groupObj.PreTag = $groupObj.PreTag.ToLowerInvariant()
 
     # return object
     return $groupObj
@@ -1038,7 +1038,7 @@ function New-DeployTemplateVM
     )
 
     $tag = $VMTemplate.tag.ToLowerInvariant()
-    $tagname = "$($FoggObject.ShortRGName)-$($tag)"
+    $tagname = "$($FoggObject.PreTag)-$($tag)"
     $usePublicIP = [bool]$VMTemplate.usePublicIP
     $subnetId = ($VNet.Subnets | Where-Object { $_.Name -ieq "$($tagname)-snet" }).Id
 
@@ -1123,7 +1123,7 @@ function New-DeployTemplateVPN
     )
 
     $tag = $VPNTemplate.tag.ToLowerInvariant()
-    $tagname = "$($FoggObject.ShortRGName)-$($tag)"
+    $tagname = "$($FoggObject.PreTag)-$($tag)"
 
     $gatewaySubnetId = ($VNet.Subnets | Where-Object { $_.Name -ieq 'GatewaySubnet' }).Id
     $gatewayIP = $FoggObject.SubnetAddressMap["$($tag)-gip"]