azurerm_traffic_manager_profile - add expected_status_code_rang… (#5471)

also changes some TypeSets -> TypeLists as the API ignores all but the first element
hashicorp · Jan 22, 2020 · 10638a1 · 10638a1
1 parent 229a796
commit 10638a1
Show file tree

Hide file tree

Showing 6 changed files with 248 additions and 516 deletions.
diff --git a/...erm/internal/services/trafficmanager/data_source_traffic_manager_geographical_location.go b/...erm/internal/services/trafficmanager/data_source_traffic_manager_geographical_location.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2018-04-01/trafficmanager"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
 )
@@ -21,8 +22,9 @@ func dataSourceArmTrafficManagerGeographicalLocation() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"name": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 		},
 	}

diff --git a/azurerm/internal/services/trafficmanager/resource_arm_traffic_manager_endpoint.go b/azurerm/internal/services/trafficmanager/resource_arm_traffic_manager_endpoint.go
@@ -38,15 +38,17 @@ func resourceArmTrafficManagerEndpoint() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 
 			"profile_name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.NoEmptyStrings,
 			},
 
 			"resource_group_name": azure.SchemaResourceGroupNameDiffSuppress(),