diff --git a/equinix/data_source_fabric_cloud_router_acc_test.go b/equinix/data_source_fabric_cloud_router_acc_test.go index 08881d295..97ea34b01 100644 --- a/equinix/data_source_fabric_cloud_router_acc_test.go +++ b/equinix/data_source_fabric_cloud_router_acc_test.go @@ -2,10 +2,11 @@ package equinix_test import ( "fmt" + "testing" + "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" _ "github.com/hashicorp/terraform-plugin-testing/terraform" - "testing" ) func TestAccDataSourceFabricCloudRouter_PFCR(t *testing.T) { diff --git a/equinix/data_source_fabric_connection.go b/equinix/data_source_fabric_connection.go index e6914f2fc..3edb125af 100644 --- a/equinix/data_source_fabric_connection.go +++ b/equinix/data_source_fabric_connection.go @@ -2,6 +2,7 @@ package equinix import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/equinix/data_source_fabric_connection_acc_test.go b/equinix/data_source_fabric_connection_acc_test.go index d463fbeea..89392f57d 100644 --- a/equinix/data_source_fabric_connection_acc_test.go +++ b/equinix/data_source_fabric_connection_acc_test.go @@ -2,9 +2,10 @@ package equinix_test import ( "fmt" + "testing" + "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "testing" ) func TestAccFabricDataSourceConnection_PFCR(t *testing.T) { diff --git a/equinix/data_source_fabric_network_acc_test.go b/equinix/data_source_fabric_network_acc_test.go index 274cefe6a..5e33d14e2 100644 --- a/equinix/data_source_fabric_network_acc_test.go +++ b/equinix/data_source_fabric_network_acc_test.go @@ -2,10 +2,11 @@ package equinix_test import ( "fmt" + "testing" + "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" _ "github.com/hashicorp/terraform-plugin-testing/terraform" - "testing" ) func TestAccDataSourceFabricNetwork_PFCR(t *testing.T) { diff --git a/equinix/data_source_fabric_port_acc_test.go b/equinix/data_source_fabric_port_acc_test.go index d43606312..bf56149a4 100644 --- a/equinix/data_source_fabric_port_acc_test.go +++ b/equinix/data_source_fabric_port_acc_test.go @@ -3,10 +3,11 @@ package equinix_test import ( "encoding/json" "fmt" - "github.com/equinix/equinix-sdk-go/services/fabricv4" "os" "testing" + "github.com/equinix/equinix-sdk-go/services/fabricv4" + "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/equinix/data_source_fabric_service_profile.go b/equinix/data_source_fabric_service_profile.go index 13e05f71a..f43de5401 100644 --- a/equinix/data_source_fabric_service_profile.go +++ b/equinix/data_source_fabric_service_profile.go @@ -2,6 +2,7 @@ package equinix import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" diff --git a/equinix/data_source_fabric_service_profile_acc_test.go b/equinix/data_source_fabric_service_profile_acc_test.go index e41e48508..622642559 100644 --- a/equinix/data_source_fabric_service_profile_acc_test.go +++ b/equinix/data_source_fabric_service_profile_acc_test.go @@ -2,9 +2,10 @@ package equinix_test import ( "fmt" + "testing" + "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "testing" ) func testAccFabricReadServiceProfileConfig(spName string, portUUID string, portType string, portMetroCode string) string { diff --git a/equinix/provider.go b/equinix/provider.go index 199744767..6904a39cb 100644 --- a/equinix/provider.go +++ b/equinix/provider.go @@ -6,9 +6,9 @@ import ( "strings" "time" + "github.com/equinix/ecx-go/v2" "github.com/equinix/terraform-provider-equinix/internal/config" "github.com/equinix/terraform-provider-equinix/internal/resources/metal/vrf" - "github.com/equinix/ecx-go/v2" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/equinix/provider_test.go b/equinix/provider_test.go index 91e9ee15f..6c052c761 100644 --- a/equinix/provider_test.go +++ b/equinix/provider_test.go @@ -4,8 +4,6 @@ import ( "context" "fmt" "os" - "regexp" - "strings" "testing" "github.com/equinix/terraform-provider-equinix/internal/config" diff --git a/equinix/resource_fabric_cloud_router.go b/equinix/resource_fabric_cloud_router.go index 380e0c11f..d9dc1d44a 100644 --- a/equinix/resource_fabric_cloud_router.go +++ b/equinix/resource_fabric_cloud_router.go @@ -3,13 +3,14 @@ package equinix import ( "context" "fmt" + "log" + "strings" + "time" + "github.com/equinix/equinix-sdk-go/services/fabricv4" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "log" - "strings" - "time" equinix_errors "github.com/equinix/terraform-provider-equinix/internal/errors" equinix_fabric_schema "github.com/equinix/terraform-provider-equinix/internal/fabric/schema" diff --git a/equinix/resource_fabric_cloud_router_acc_test.go b/equinix/resource_fabric_cloud_router_acc_test.go index 4b55e1aa9..df0902065 100644 --- a/equinix/resource_fabric_cloud_router_acc_test.go +++ b/equinix/resource_fabric_cloud_router_acc_test.go @@ -3,10 +3,11 @@ package equinix_test import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/equinix/terraform-provider-equinix/equinix" "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/equinix/resource_fabric_connection_acc_test.go b/equinix/resource_fabric_connection_acc_test.go index 6a03a42a1..4e2455d21 100644 --- a/equinix/resource_fabric_connection_acc_test.go +++ b/equinix/resource_fabric_connection_acc_test.go @@ -4,13 +4,14 @@ import ( "context" "encoding/json" "fmt" - "github.com/equinix/terraform-provider-equinix/equinix" - "github.com/equinix/terraform-provider-equinix/internal/acceptance" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "os" "testing" "time" + "github.com/equinix/terraform-provider-equinix/equinix" + "github.com/equinix/terraform-provider-equinix/internal/acceptance" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" ) diff --git a/equinix/resource_fabric_network.go b/equinix/resource_fabric_network.go index 60c0a1fc2..e7625b70a 100755 --- a/equinix/resource_fabric_network.go +++ b/equinix/resource_fabric_network.go @@ -3,6 +3,7 @@ package equinix import ( "context" "fmt" + "github.com/equinix/equinix-sdk-go/services/fabricv4" "github.com/equinix/terraform-provider-equinix/internal/config" equinix_errors "github.com/equinix/terraform-provider-equinix/internal/errors" @@ -11,10 +12,11 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" "log" "time" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func fabricNetworkChangeSch() map[string]*schema.Schema { diff --git a/equinix/resource_fabric_network_acc_test.go b/equinix/resource_fabric_network_acc_test.go index 8d0e76984..9c409962b 100644 --- a/equinix/resource_fabric_network_acc_test.go +++ b/equinix/resource_fabric_network_acc_test.go @@ -3,10 +3,11 @@ package equinix_test import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/equinix/terraform-provider-equinix/equinix" "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/equinix/resource_fabric_port.go b/equinix/resource_fabric_port.go index 5130f363e..d88bca345 100644 --- a/equinix/resource_fabric_port.go +++ b/equinix/resource_fabric_port.go @@ -4,11 +4,12 @@ import ( "context" "errors" "fmt" - "github.com/equinix/equinix-sdk-go/services/fabricv4" "log" "runtime/debug" "strings" + "github.com/equinix/equinix-sdk-go/services/fabricv4" + equinix_errors "github.com/equinix/terraform-provider-equinix/internal/errors" equinix_fabric_schema "github.com/equinix/terraform-provider-equinix/internal/fabric/schema" equinix_schema "github.com/equinix/terraform-provider-equinix/internal/schema" diff --git a/equinix/resource_fabric_routing_protocol.go b/equinix/resource_fabric_routing_protocol.go index e2591759b..c87894aec 100644 --- a/equinix/resource_fabric_routing_protocol.go +++ b/equinix/resource_fabric_routing_protocol.go @@ -3,13 +3,14 @@ package equinix import ( "context" "fmt" - "github.com/equinix/equinix-sdk-go/services/fabricv4" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "log" "strconv" "strings" "time" + "github.com/equinix/equinix-sdk-go/services/fabricv4" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + equinix_errors "github.com/equinix/terraform-provider-equinix/internal/errors" equinix_fabric_schema "github.com/equinix/terraform-provider-equinix/internal/fabric/schema" equinix_schema "github.com/equinix/terraform-provider-equinix/internal/schema" diff --git a/equinix/resource_fabric_routing_protocol_acc_test.go b/equinix/resource_fabric_routing_protocol_acc_test.go index 5c0fb4e9e..cce65627d 100644 --- a/equinix/resource_fabric_routing_protocol_acc_test.go +++ b/equinix/resource_fabric_routing_protocol_acc_test.go @@ -3,10 +3,11 @@ package equinix_test import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/equinix/terraform-provider-equinix/equinix" "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/equinix/resource_fabric_service_profile.go b/equinix/resource_fabric_service_profile.go index 9e3eb3cec..6dacbc48b 100644 --- a/equinix/resource_fabric_service_profile.go +++ b/equinix/resource_fabric_service_profile.go @@ -3,13 +3,14 @@ package equinix import ( "context" "fmt" - "github.com/equinix/equinix-sdk-go/services/fabricv4" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "log" "strconv" "strings" "time" + "github.com/equinix/equinix-sdk-go/services/fabricv4" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/equinix/terraform-provider-equinix/internal/converters" equinix_errors "github.com/equinix/terraform-provider-equinix/internal/errors" equinix_fabric_schema "github.com/equinix/terraform-provider-equinix/internal/fabric/schema" diff --git a/equinix/resource_fabric_service_profile_acc_test.go b/equinix/resource_fabric_service_profile_acc_test.go index 7c43e63cb..792d553fd 100644 --- a/equinix/resource_fabric_service_profile_acc_test.go +++ b/equinix/resource_fabric_service_profile_acc_test.go @@ -3,11 +3,12 @@ package equinix_test import ( "context" "fmt" + "testing" + "time" + "github.com/equinix/terraform-provider-equinix/equinix" "github.com/equinix/terraform-provider-equinix/internal/acceptance" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "testing" - "time" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" diff --git a/internal/errors/errors.go b/internal/errors/errors.go index 9a2f43cb5..15f1835a8 100644 --- a/internal/errors/errors.go +++ b/internal/errors/errors.go @@ -2,10 +2,11 @@ package errors import ( "fmt" - "github.com/equinix/equinix-sdk-go/services/fabricv4" "net/http" "strings" + "github.com/equinix/equinix-sdk-go/services/fabricv4" + "github.com/equinix/rest-go" "github.com/packethost/packngo" ) diff --git a/internal/fabric/schema/fabric_common_mapping_helpers.go b/internal/fabric/schema/fabric_common_mapping_helpers.go index 387248bd1..f7826ba5c 100644 --- a/internal/fabric/schema/fabric_common_mapping_helpers.go +++ b/internal/fabric/schema/fabric_common_mapping_helpers.go @@ -1,10 +1,11 @@ package schema import ( + "strconv" + "github.com/equinix/equinix-sdk-go/services/fabricv4" "github.com/equinix/terraform-provider-equinix/internal/converters" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "strconv" ) func OrderTerraformToGo(orderTerraform []interface{}) fabricv4.Order { diff --git a/internal/resources/metal/project/models.go b/internal/resources/metal/project/models.go index f50de7118..4d0cc4116 100644 --- a/internal/resources/metal/project/models.go +++ b/internal/resources/metal/project/models.go @@ -2,11 +2,12 @@ package project import ( "context" - "github.com/equinix/equinix-sdk-go/services/metalv1" "path" "strings" "time" + "github.com/equinix/equinix-sdk-go/services/metalv1" + fwtypes "github.com/equinix/terraform-provider-equinix/internal/framework/types" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/internal/sweep/sweep_test.go b/internal/sweep/sweep_test.go index 8a725898f..2942e15d1 100644 --- a/internal/sweep/sweep_test.go +++ b/internal/sweep/sweep_test.go @@ -1,9 +1,10 @@ package sweep_test import ( - "github.com/equinix/terraform-provider-equinix/internal/resources/metal/vlan" "testing" + "github.com/equinix/terraform-provider-equinix/internal/resources/metal/vlan" + "github.com/equinix/terraform-provider-equinix/internal/resources/metal/connection" "github.com/equinix/terraform-provider-equinix/internal/resources/metal/device" "github.com/equinix/terraform-provider-equinix/internal/resources/metal/organization"