Hyphen allowed in des and dsk (Azure#20)

* Hyphen allowed in des and dsk

The value must have a length of at most 80.
The name must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens.

* Add correct syntax for DES & managed disks in resourceDefinition.json

* Undo changes in main.tf

* go run main.go

* terraform fmt

main.tf

@@ -312,9 +312,9 @@ locals {
       regex       = "^[a-zA-Z0-9][a-zA-Z0-9-_.]+[a-zA-Z0-9_]$"
     }
     disk_encryption_set = {
-      name        = substr(join("", compact([local.prefix_safe, "des", local.suffix_safe])), 0, 80)
-      name_unique = substr(join("", compact([local.prefix_safe, "des", local.suffix_unique_safe])), 0, 80)
-      dashes      = false
+      name        = substr(join("-", compact([local.prefix, "des", local.suffix])), 0, 80)
+      name_unique = substr(join("-", compact([local.prefix, "des", local.suffix_unique])), 0, 80)
+      dashes      = true
       slug        = "des"
       min_length  = 1
       max_length  = 80
@@ -352,9 +352,9 @@ locals {
       regex       = "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]+[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"
     }
     managed_disk = {
-      name        = substr(join("", compact([local.prefix_safe, "dsk", local.suffix_safe])), 0, 80)
-      name_unique = substr(join("", compact([local.prefix_safe, "dsk", local.suffix_unique_safe])), 0, 80)
-      dashes      = false
+      name        = substr(join("-", compact([local.prefix, "dsk", local.suffix])), 0, 80)
+      name_unique = substr(join("-", compact([local.prefix, "dsk", local.suffix_unique])), 0, 80)
+      dashes      = true
       slug        = "dsk"
       min_length  = 1
       max_length  = 80

resourceDefinition.json

@@ -316,7 +316,7 @@
     "regex": "^(?=.{1,80}$)[a-zA-Z0-9_]+$",
     "scope": "resourceGroup",
     "slug": "des",
-    "dashes": false
+    "dashes": true
   },
   {
     "name": "image",
@@ -360,7 +360,7 @@
     "regex": "^(?=.{1,80}$)[a-zA-Z0-9_]+$",
     "scope": "resourceGroup",
     "slug": "dsk",
-    "dashes": false
+    "dashes": true
   },
   {
     "name": "virtual_machine",
@@ -2056,4 +2056,4 @@
     "slug": "rlhc",
     "dashes": true
   }
-]
+]