Merge pull request #38 from Nepomuceno/azurerm_recovery_services_vault

Added azurerm_recovery_services_vault

.github/workflows/go.yml

@@ -48,6 +48,7 @@ jobs:
     - name: Import GPG key
       id: import_gpg
       uses: crazy-max/ghaction-import-gpg@v2
+      if: startsWith(github.ref, 'refs/tags/')
       env:
         GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
 

azurecaf/models.go

@@ -62,6 +62,9 @@ var (
 
 // Generate a random value to add to the resource names
 func randSeq(length int, seed *int64) string {
+	if length == 0 {
+		return ""
+	}
 	// initialize random seed
 	if seed == nil {
 		value := time.Now().UnixNano()
@@ -83,7 +86,7 @@ var Resources = map[string]ResourceStructure{
 	"acr":    {"azure container registry", "acr", 5, 50, true, alphanum, "^[0-9A-Za-z]{5,50}$", true, "resourceGroup"},
 	"afw":    {"azure firewall", "afw", 1, 80, false, alphanumhup, "^[a-zA-Z][0-9A-Za-z_.-]{0,79}$", true, "resourceGroup"},
 	"agw":    {"application gateway", "agw", 1, 80, false, alphanumhup, "^[0-9a-zA-Z][0-9A-Za-z_.-]{0,78}[0-9a-zA-Z_]$", true, "resourceGroup"},
-	"aks":    {"azure kubernetes service", "aks", 1, 63, false, alphanumu, "^[0-9a-zA-Z][0-9A-Za-z_.-]{0,61}[0-9a-zA-Z]$", true, "resourceGroup"},
+	"aks":    {"azure kubernetes service", "aks", 1, 63, false, alphanumhu, "^[0-9a-zA-Z][0-9A-Za-z_.-]{0,61}[0-9a-zA-Z]$", true, "resourceGroup"},
 	"aksdns": {"aksdns prefix", "aksdns", 3, 45, false, alphanumh, "^[a-zA-Z][0-9A-Za-z-]{0,43}[0-9a-zA-Z]$", true, "resourceGroup"},
 	"aksnpl": {"aks node pool for Linux", "aksnpl", 2, 12, true, alphanum, "^[a-zA-Z][0-9a-z]{0,11}$", true, "resourceGroup"},
 	"aksnpw": {"aks node pool for Windows", "aksnpw", 2, 6, true, alphanum, "^[a-zA-Z][0-9a-z]{0,5}$", true, "resourceGroup"},

azurecaf/resource_name.go

@@ -50,7 +50,7 @@ func resourceName() *schema.Resource {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.IntAtLeast(1),
+				ValidateFunc: validation.IntAtLeast(0),
 				Default:      0,
 			},
 			"result": {
@@ -102,6 +102,12 @@ func resourceName() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
+			"use_slug": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				ForceNew: true,
+				Default:  true,
+			},
 		},
 	}
 }
@@ -283,6 +289,7 @@ func getResourceName(resourceTypeName string, separator string,
 	convention string,
 	cleanInput bool,
 	passthrough bool,
+	useSlug bool,
 	namePrecedence []string) (string, error) {
 
 	resource, err := getResource(resourceTypeName)
@@ -294,7 +301,11 @@ func getResourceName(resourceTypeName string, separator string,
 		return "", err
 	}
 
-	slug := getSlug(resourceTypeName, convention)
+	slug := ""
+	if useSlug {
+		slug = getSlug(resourceTypeName, convention)
+	}
+
 	if cleanInput {
 		prefixes = cleanSlice(prefixes, resource)
 		suffixes = cleanSlice(suffixes, resource)
@@ -331,6 +342,7 @@ func getNameResult(d *schema.ResourceData, meta interface{}) error {
 	resourceTypes := convertInterfaceToString(d.Get("resource_types").([]interface{}))
 	cleanInput := d.Get("clean_input").(bool)
 	passthrough := d.Get("passthrough").(bool)
+	useSlug := d.Get("use_slug").(bool)
 	randomLength := d.Get("random_length").(int)
 	randomSeed := int64(d.Get("random_seed").(int))
 
@@ -345,7 +357,7 @@ func getNameResult(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	if len(resourceType) > 0 {
-		resourceName, err := getResourceName(resourceType, separator, prefixes, name, suffixes, randomSuffix, convention, cleanInput, passthrough, namePrecedence)
+		resourceName, err := getResourceName(resourceType, separator, prefixes, name, suffixes, randomSuffix, convention, cleanInput, passthrough, useSlug, namePrecedence)
 		if err != nil {
 			return err
 		}
@@ -354,7 +366,7 @@ func getNameResult(d *schema.ResourceData, meta interface{}) error {
 	resourceNames := make(map[string]string, len(resourceTypes))
 	for _, resourceTypeName := range resourceTypes {
 		var err error
-		resourceNames[resourceTypeName], err = getResourceName(resourceTypeName, separator, prefixes, name, suffixes, randomSuffix, convention, cleanInput, passthrough, namePrecedence)
+		resourceNames[resourceTypeName], err = getResourceName(resourceTypeName, separator, prefixes, name, suffixes, randomSuffix, convention, cleanInput, passthrough, useSlug, namePrecedence)
 		if err != nil {
 			return err
 		}

azurecaf/resource_name_test.go

@@ -212,7 +212,7 @@ func TestValidResourceType_invalidParameters(t *testing.T) {
 
 func TestGetResourceNameValid(t *testing.T) {
 	namePrecedence := []string{"name", "slug", "random", "suffixes", "prefixes"}
-	resourceName, err := getResourceName("azurerm_resource_group", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, false, namePrecedence)
+	resourceName, err := getResourceName("azurerm_resource_group", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, false, true, namePrecedence)
 	expected := "a-b-rg-myrg-1234"
 
 	if err != nil {
@@ -224,9 +224,25 @@ func TestGetResourceNameValid(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestGetResourceNameValidNoSlug(t *testing.T) {
+	namePrecedence := []string{"name", "slug", "random", "suffixes", "prefixes"}
+	resourceName, err := getResourceName("azurerm_resource_group", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, false, false, namePrecedence)
+	expected := "a-b-myrg-1234"
+
+	if err != nil {
+		t.Logf("getResource Name generated an error %s", err.Error())
+		t.Fail()
+	}
+	if expected != resourceName {
+		t.Logf("invalid name, expected %s got %s", expected, resourceName)
+		t.Fail()
+	}
+}
+
 func TestGetResourceNameInvalidResourceType(t *testing.T) {
 	namePrecedence := []string{"name", "slug", "random", "suffixes", "prefixes"}
-	resourceName, err := getResourceName("azurerm_invalid", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, false, namePrecedence)
+	resourceName, err := getResourceName("azurerm_invalid", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, false, true, namePrecedence)
 	expected := "a-b-rg-myrg-1234"
 
 	if err == nil {
@@ -241,7 +257,7 @@ func TestGetResourceNameInvalidResourceType(t *testing.T) {
 
 func TestGetResourceNamePassthrough(t *testing.T) {
 	namePrecedence := []string{"name", "slug", "random", "suffixes", "prefixes"}
-	resourceName, _ := getResourceName("azurerm_resource_group", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, true, namePrecedence)
+	resourceName, _ := getResourceName("azurerm_resource_group", "-", []string{"a", "b"}, "myrg", nil, "1234", "cafclassic", true, true, true, namePrecedence)
 	expected := "myrg"
 
 	if expected != resourceName {

azurecaf/resource_naming_convention_cafclassic_test.go

@@ -68,7 +68,7 @@ func TestAccCafNamingConvention_Classic(t *testing.T) {
 					testAccCafNamingValidation(
 						"azurecaf_naming_convention.classic_aks",
 						"kubedemo",
-						11,
+						12,
 						"aks"),
 					regexMatch("azurecaf_naming_convention.classic_aks", regexp.MustCompile(Resources["aks"].ValidationRegExp), 1),
 					testAccCafNamingValidation(