Provider function to replace validation.NoZeroValues (#2467)

* Fix for name with only spaces * Removed regex and replaced with TrimSpace * Updated test for new behavior * Saved as LF only * Fix lint error * Update azurerm/data_source_route_table.go Co-Authored-By: jeffreyCline <[email protected]> * Update azurerm/resource_arm_route_table.go Co-Authored-By: jeffreyCline <[email protected]> * Update azurerm/resource_arm_route_table.go Co-Authored-By: jeffreyCline <[email protected]> * Update azurerm/resource_arm_route_table.go Co-Authored-By: jeffreyCline <[email protected]> * Update azurerm/resource_arm_route_table.go Co-Authored-By: jeffreyCline <[email protected]> * Update signature * Added test case * Added special character test cases * Permission to merge per KT
hashicorp · Dec 7, 2018 · 0cc82c2 · 0cc82c2
1 parent 379b6ca
commit 0cc82c2
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 6 deletions.
diff --git a/azurerm/data_source_route_table.go b/azurerm/data_source_route_table.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-04-01/network"
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -17,7 +17,7 @@ func dataSourceArmRouteTable() *schema.Resource {
 			"name": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: validation.NoZeroValues,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 
 			"resource_group_name": resourceGroupNameForDataSourceSchema(),

diff --git a/azurerm/helpers/validate/strings.go b/azurerm/helpers/validate/strings.go
@@ -0,0 +1,20 @@
+package validate
+
+import (
+	"fmt"
+	"strings"
+)
+
+// NoEmptyStrings validates that the string is not just whitespace characters (equal to [\r\n\t\f\v ])
+func NoEmptyStrings(i interface{}, k string) ([]string, []error) {
+	v, ok := i.(string)
+	if !ok {
+		return nil, []error{fmt.Errorf("expected type of %q to be string", k)}
+	}
+
+	if strings.TrimSpace(v) == "" {
+		return nil, []error{fmt.Errorf("%q must not be empty", k)}
+	}
+
+	return nil, nil
+}
diff --git a/azurerm/helpers/validate/strings_test.go b/azurerm/helpers/validate/strings_test.go
@@ -0,0 +1,99 @@
+package validate
+
+import (
+	"testing"
+)
+
+func TestNoEmptyStrings(t *testing.T) {
+	cases := []struct {
+		Value    string
+		TestName string
+		ErrCount int
+	}{
+		{
+			Value:    "!",
+			TestName: "Exclamation",
+			ErrCount: 0,
+		},
+		{
+			Value:    ".",
+			TestName: "Period",
+			ErrCount: 0,
+		},
+		{
+			Value:    "-",
+			TestName: "Hyphen",
+			ErrCount: 0,
+		},
+		{
+			Value:    "_",
+			TestName: "Underscore",
+			ErrCount: 0,
+		},
+		{
+			Value:    "10.1.0.0/16",
+			TestName: "IP",
+			ErrCount: 0,
+		},
+		{
+			Value:    "",
+			TestName: "Empty",
+			ErrCount: 1,
+		},
+		{
+			Value:    " ",
+			TestName: "Space",
+			ErrCount: 1,
+		},
+		{
+			Value:    "     ",
+			TestName: "FiveSpaces",
+			ErrCount: 1,
+		},
+		{
+			Value:    "  1",
+			TestName: "DoubleSpaceOne",
+			ErrCount: 0,
+		},
+		{
+			Value:    "1 ",
+			TestName: "OneSpace",
+			ErrCount: 0,
+		},
+		{
+			Value:    "\r",
+			TestName: "CarriageReturn",
+			ErrCount: 1,
+		},
+		{
+			Value:    "\n",
+			TestName: "NewLine",
+			ErrCount: 1,
+		},
+		{
+			Value:    "\t",
+			TestName: "HorizontalTab",
+			ErrCount: 1,
+		},
+		{
+			Value:    "\f",
+			TestName: "FormFeed",
+			ErrCount: 1,
+		},
+		{
+			Value:    "\v",
+			TestName: "VerticalTab",
+			ErrCount: 1,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.TestName, func(t *testing.T) {
+			_, errors := NoEmptyStrings(tc.Value, tc.TestName)
+
+			if len(errors) != tc.ErrCount {
+				t.Fatalf("Expected NoEmptyStrings to have %d not %d errors for %q", tc.ErrCount, len(errors), tc.TestName)
+			}
+		})
+	}
+}
diff --git a/azurerm/resource_arm_route_table.go b/azurerm/resource_arm_route_table.go
@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -30,7 +31,7 @@ func resourceArmRouteTable() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.NoZeroValues,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 
 			"location": locationSchema(),
@@ -46,13 +47,13 @@ func resourceArmRouteTable() *schema.Resource {
 						"name": {
 							Type:         schema.TypeString,
 							Required:     true,
-							ValidateFunc: validation.NoZeroValues,
+							ValidateFunc: validate.NoEmptyStrings,
 						},
 
 						"address_prefix": {
 							Type:         schema.TypeString,
 							Required:     true,
-							ValidateFunc: validation.NoZeroValues,
+							ValidateFunc: validate.NoEmptyStrings,
 						},
 
 						"next_hop_type": {
@@ -71,7 +72,7 @@ func resourceArmRouteTable() *schema.Resource {
 						"next_hop_in_ip_address": {
 							Type:         schema.TypeString,
 							Optional:     true,
-							ValidateFunc: validation.NoZeroValues,
+							ValidateFunc: validate.NoEmptyStrings,
 						},
 					},
 				},