From 5fbec544d7fb34afeb8b74f670301dc8cbba1a90 Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Mon, 21 Dec 2015 09:54:24 +0000
Subject: [PATCH] Fixing yet more gofmt errors with imports

---
 builtin/providers/docker/resource_docker_container.go | 3 ++-
 builtin/providers/postgresql/config.go                | 1 +
 builtin/providers/vcd/resource_vcd_dnat.go            | 1 +
 builtin/providers/vcd/resource_vcd_firewall_rules.go  | 5 +++--
 builtin/providers/vcd/resource_vcd_network.go         | 3 ++-
 builtin/providers/vcd/resource_vcd_snat.go            | 1 +
 builtin/providers/vcd/resource_vcd_vapp.go            | 3 ++-
 builtin/providers/vcd/structure.go                    | 5 +++--
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/builtin/providers/docker/resource_docker_container.go b/builtin/providers/docker/resource_docker_container.go
index 242462e1a..323850499 100644
--- a/builtin/providers/docker/resource_docker_container.go
+++ b/builtin/providers/docker/resource_docker_container.go
@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"fmt"
 
+	"regexp"
+
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
-	"regexp"
 )
 
 func resourceDockerContainer() *schema.Resource {
diff --git a/builtin/providers/postgresql/config.go b/builtin/providers/postgresql/config.go
index 454c01614..8bf7b2daa 100644
--- a/builtin/providers/postgresql/config.go
+++ b/builtin/providers/postgresql/config.go
@@ -3,6 +3,7 @@ package postgresql
 import (
 	"database/sql"
 	"fmt"
+
 	_ "github.com/lib/pq" //PostgreSQL db
 )
 
diff --git a/builtin/providers/vcd/resource_vcd_dnat.go b/builtin/providers/vcd/resource_vcd_dnat.go
index 5c2e8006c..b764e13ba 100644
--- a/builtin/providers/vcd/resource_vcd_dnat.go
+++ b/builtin/providers/vcd/resource_vcd_dnat.go
@@ -2,6 +2,7 @@ package vcd
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/builtin/providers/vcd/resource_vcd_firewall_rules.go b/builtin/providers/vcd/resource_vcd_firewall_rules.go
index 913bff8be..325af24cd 100644
--- a/builtin/providers/vcd/resource_vcd_firewall_rules.go
+++ b/builtin/providers/vcd/resource_vcd_firewall_rules.go
@@ -2,10 +2,11 @@ package vcd
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
-	types "github.com/hmrc/vmware-govcd/types/v56"
 	"log"
 	"strings"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	types "github.com/hmrc/vmware-govcd/types/v56"
 )
 
 func resourceVcdFirewallRules() *schema.Resource {
diff --git a/builtin/providers/vcd/resource_vcd_network.go b/builtin/providers/vcd/resource_vcd_network.go
index 531afd878..389f37b6a 100644
--- a/builtin/providers/vcd/resource_vcd_network.go
+++ b/builtin/providers/vcd/resource_vcd_network.go
@@ -5,10 +5,11 @@ import (
 
 	"bytes"
 	"fmt"
+	"strings"
+
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 	types "github.com/hmrc/vmware-govcd/types/v56"
-	"strings"
 )
 
 func resourceVcdNetwork() *schema.Resource {
diff --git a/builtin/providers/vcd/resource_vcd_snat.go b/builtin/providers/vcd/resource_vcd_snat.go
index c2ae89121..4ad018c86 100644
--- a/builtin/providers/vcd/resource_vcd_snat.go
+++ b/builtin/providers/vcd/resource_vcd_snat.go
@@ -2,6 +2,7 @@ package vcd
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/builtin/providers/vcd/resource_vcd_vapp.go b/builtin/providers/vcd/resource_vcd_vapp.go
index 50fc93563..8c98ecf21 100644
--- a/builtin/providers/vcd/resource_vcd_vapp.go
+++ b/builtin/providers/vcd/resource_vcd_vapp.go
@@ -2,9 +2,10 @@ package vcd
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	types "github.com/hmrc/vmware-govcd/types/v56"
-	"log"
 )
 
 func resourceVcdVApp() *schema.Resource {
diff --git a/builtin/providers/vcd/structure.go b/builtin/providers/vcd/structure.go
index d4ac65eae..6a15f0c65 100644
--- a/builtin/providers/vcd/structure.go
+++ b/builtin/providers/vcd/structure.go
@@ -2,11 +2,12 @@ package vcd
 
 import (
 	"fmt"
+	"strconv"
+	"time"
+
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	types "github.com/hmrc/vmware-govcd/types/v56"
-	"strconv"
-	"time"
 )
 
 func expandIPRange(configured []interface{}) types.IPRanges {