add isNotEmpty validation for some fields

hashicorp · Mar 25, 2020 · 63a9f38 · 63a9f38
1 parent e42b33a
commit 63a9f38
Showing 1 changed file with 36 additions and 27 deletions.
diff --git a/azurerm/internal/services/appplatform/resource_arm_spring_cloud_service.go b/azurerm/internal/services/appplatform/resource_arm_spring_cloud_service.go
@@ -74,19 +74,22 @@ func resourceArmSpringCloudService() *schema.Resource {
 							Type:     schema.TypeList,
 							Optional: true,
 							Elem: &schema.Schema{
-								Type: schema.TypeString,
+								Type:         schema.TypeString,
+								ValidateFunc: validation.StringIsNotEmpty,
 							},
 						},
 
 						"http_basic_auth": {
-							Type:     schema.TypeList,
-							Optional: true,
-							MaxItems: 1,
+							Type:          schema.TypeList,
+							Optional:      true,
+							MaxItems:      1,
+							ConflictsWith: []string{"config_server_git_settings.0.ssh_auth"},
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"username": {
-										Type:     schema.TypeString,
-										Required: true,
+										Type:         schema.TypeString,
+										Required:     true,
+										ValidateFunc: validation.StringIsNotEmpty,
 									},
 
 									"password": {
@@ -96,25 +99,27 @@ func resourceArmSpringCloudService() *schema.Resource {
 									},
 								},
 							},
-							ConflictsWith: []string{"config_server_git_settings.0.ssh_auth"},
 						},
 
 						"ssh_auth": {
-							Type:     schema.TypeList,
-							Optional: true,
-							MaxItems: 1,
+							Type:          schema.TypeList,
+							Optional:      true,
+							MaxItems:      1,
+							ConflictsWith: []string{"config_server_git_settings.0.http_basic_auth"},
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"private_key": {
-										Type:      schema.TypeString,
-										Required:  true,
-										Sensitive: true,
+										Type:         schema.TypeString,
+										Required:     true,
+										Sensitive:    true,
+										ValidateFunc: validation.StringIsNotEmpty,
 									},
 
 									"host_key": {
-										Type:      schema.TypeString,
-										Optional:  true,
-										Sensitive: true,
+										Type:         schema.TypeString,
+										Optional:     true,
+										Sensitive:    true,
+										ValidateFunc: validation.StringIsNotEmpty,
 									},
 
 									"host_key_algorithm": {
@@ -135,7 +140,6 @@ func resourceArmSpringCloudService() *schema.Resource {
 									},
 								},
 							},
-							ConflictsWith: []string{"config_server_git_settings.0.http_basic_auth"},
 						},
 
 						"repositories": {
@@ -161,14 +165,16 @@ func resourceArmSpringCloudService() *schema.Resource {
 										Type:     schema.TypeList,
 										Optional: true,
 										Elem: &schema.Schema{
-											Type: schema.TypeString,
+											Type:         schema.TypeString,
+											ValidateFunc: validation.StringIsNotEmpty,
 										},
 									},
 									"search_paths": {
 										Type:     schema.TypeList,
 										Optional: true,
 										Elem: &schema.Schema{
-											Type: schema.TypeString,
+											Type:         schema.TypeString,
+											ValidateFunc: validation.StringIsNotEmpty,
 										},
 									},
 									"http_basic_auth": {
@@ -178,8 +184,9 @@ func resourceArmSpringCloudService() *schema.Resource {
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"username": {
-													Type:     schema.TypeString,
-													Required: true,
+													Type:         schema.TypeString,
+													Required:     true,
+													ValidateFunc: validation.StringIsNotEmpty,
 												},
 
 												"password": {
@@ -197,15 +204,17 @@ func resourceArmSpringCloudService() *schema.Resource {
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"private_key": {
-													Type:      schema.TypeString,
-													Required:  true,
-													Sensitive: true,
+													Type:         schema.TypeString,
+													Required:     true,
+													Sensitive:    true,
+													ValidateFunc: validation.StringIsNotEmpty,
 												},
 
 												"host_key": {
-													Type:      schema.TypeString,
-													Optional:  true,
-													Sensitive: true,
+													Type:         schema.TypeString,
+													Optional:     true,
+													Sensitive:    true,
+													ValidateFunc: validation.StringIsNotEmpty,
 												},
 
 												"host_key_algorithm": {