Merge pull request #413 from terraform-providers/validate_url

Improve hostname validation in provider

nsxt/provider.go

@@ -320,6 +320,10 @@ func configureNsxtClient(d *schema.ResourceData, clients *nsxtClients) error {
 	}
 
 	host := d.Get("host").(string)
+	// Remove schema
+	if strings.HasPrefix(host, "https://") {
+		host = host[len("https://"):]
+	}
 
 	if host == "" {
 		return fmt.Errorf("host must be provided")
@@ -446,7 +450,7 @@ func getConnectorTLSConfig(insecure bool, clientCertFile string, clientKeyFile s
 }
 
 func configurePolicyConnectorData(d *schema.ResourceData, clients *nsxtClients) error {
-	hostIP := d.Get("host").(string)
+	host := d.Get("host").(string)
 	username := d.Get("username").(string)
 	password := d.Get("password").(string)
 	vmcAccessToken := d.Get("vmc_token").(string)
@@ -458,11 +462,14 @@ func configurePolicyConnectorData(d *schema.ResourceData, clients *nsxtClients)
 	policyEnforcementPoint := d.Get("enforcement_point").(string)
 	policyGlobalManager := d.Get("global_manager").(bool)
 
-	if hostIP == "" {
+	if host == "" {
 		return fmt.Errorf("host must be provided")
 	}
 
-	host := fmt.Sprintf("https://%s", hostIP)
+	if !strings.HasPrefix(host, "https://") {
+		host = fmt.Sprintf("https://%s", host)
+	}
+
 	securityCtx := core.NewSecurityContextImpl()
 	securityContextNeeded := true
 	if len(clientAuthCertFile) > 0 && !clients.CommonConfig.RemoteAuth {

nsxt/validators.go

@@ -459,10 +459,13 @@ func validateNsxtProviderHostFormat() schema.SchemaValidateFunc {
 			return
 		}
 
-		if strings.HasPrefix(v, "https://") || strings.HasPrefix(v, "http://") {
-			es = append(es, fmt.Errorf("not expecting http:// or https:// in the host, but got %s", v))
+		withSchema := v
+		if !strings.HasPrefix(v, "https://") {
+			// Add schema for validation
+			withSchema = fmt.Sprintf("https://%s", v)
 		}
 
+		s, es = validation.IsURLWithHTTPS(withSchema, k)
 		return
 	}
 }