IF-10733 Support MSS v3 (#112)

* IF-10733 Support MSS v3 * IF-10733 Fix function name * IF-10733 Support MSS v3
nttcom · Jun 6, 2024 · e92b338 · e92b338
1 parent a9513eb
commit e92b338
Show file tree

Hide file tree

Showing 448 changed files with 1,461 additions and 1,461 deletions.
diff --git a/ecl/clientconfig/requests.go b/ecl/clientconfig/requests.go
@@ -2,8 +2,8 @@ package clientconfig
 
 import (
 	"fmt"
-	"github.com/nttcom/eclcloud/v2"
-	"github.com/nttcom/eclcloud/v2/ecl"
+	"github.com/nttcom/eclcloud/v3"
+	"github.com/nttcom/eclcloud/v3/ecl"
 	"os"
 	"reflect"
 	"strings"

diff --git a/ecl/clientconfig/testing/fixtures.go b/ecl/clientconfig/testing/fixtures.go
@@ -1,7 +1,7 @@
 package testing
 
 import (
-	"github.com/nttcom/eclcloud/v2"
+	"github.com/nttcom/eclcloud/v3"
 	"github.com/nttcom/terraform-provider-ecl/ecl/clientconfig"
 )
 

diff --git a/ecl/clientconfig/testing/requests_test.go b/ecl/clientconfig/testing/requests_test.go
@@ -4,10 +4,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/nttcom/eclcloud/v2"
+	"github.com/nttcom/eclcloud/v3"
 	"github.com/nttcom/terraform-provider-ecl/ecl/clientconfig"
 
-	th "github.com/nttcom/eclcloud/v2/testhelper"
+	th "github.com/nttcom/eclcloud/v3/testhelper"
 )
 
 func TestGetCloudFromYAML(t *testing.T) {

diff --git a/ecl/compute_instance_v2_networking.go b/ecl/compute_instance_v2_networking.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2"
-	"github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/networks"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/ports"
+	"github.com/nttcom/eclcloud/v3"
+	"github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/networks"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/ports"
 )
 
 // InstanceNIC is a structured representation of a Eclcloud servers.Server

diff --git a/ecl/config.go b/ecl/config.go
@@ -5,8 +5,8 @@ import (
 	"crypto/x509"
 	"fmt"
 
-	"github.com/nttcom/eclcloud/v2"
-	"github.com/nttcom/eclcloud/v2/ecl"
+	"github.com/nttcom/eclcloud/v3"
+	"github.com/nttcom/eclcloud/v3/ecl"
 
 	"github.com/nttcom/terraform-provider-ecl/ecl/clientconfig"
 
@@ -268,15 +268,15 @@ func (c *Config) networkV2Client(region string) (*eclcloud.ServiceClient, error)
 	})
 }
 
-func (c *Config) securityOrderV2Client(region string) (*eclcloud.ServiceClient, error) {
-	return ecl.NewSecurityOrderV2(c.OsClient, eclcloud.EndpointOpts{
+func (c *Config) securityOrderV3Client(region string) (*eclcloud.ServiceClient, error) {
+	return ecl.NewSecurityOrderV3(c.OsClient, eclcloud.EndpointOpts{
 		Region:       c.determineRegion(region),
 		Availability: c.getEndpointType(),
 	})
 }
 
-func (c *Config) securityPortalV2Client(region string) (*eclcloud.ServiceClient, error) {
-	return ecl.NewSecurityPortalV2(c.OsClient, eclcloud.EndpointOpts{
+func (c *Config) securityPortalV3Client(region string) (*eclcloud.ServiceClient, error) {
+	return ecl.NewSecurityPortalV3(c.OsClient, eclcloud.EndpointOpts{
 		Region:       c.determineRegion(region),
 		Availability: c.getEndpointType(),
 	})

diff --git a/ecl/data_source_ecl_baremetal_availability_zone_v2.go b/ecl/data_source_ecl_baremetal_availability_zone_v2.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones"
+	"github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/ecl/data_source_ecl_baremetal_flavor_v2.go b/ecl/data_source_ecl_baremetal_flavor_v2.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors"
+	"github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/ecl/data_source_ecl_baremetal_keypair_v2.go b/ecl/data_source_ecl_baremetal_keypair_v2.go
@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs"
+	"github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs"
 )
 
 func dataSourceBaremetalKeypairV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_compute_flavor_v2.go b/ecl/data_source_ecl_compute_flavor_v2.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors"
+	"github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/ecl/data_source_ecl_compute_keypair_v2.go b/ecl/data_source_ecl_compute_keypair_v2.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs"
+	"github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs"
 )
 
 func dataSourceComputeKeypairV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_dns_zone_v2.go b/ecl/data_source_ecl_dns_zone_v2.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones"
+	"github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones"
 )
 
 func dataSourceDNSZoneV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_imagestorages_image_v2.go b/ecl/data_source_ecl_imagestorages_image_v2.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"sort"
 
-	"github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images"
+	"github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/ecl/data_source_ecl_mlb_certificate_v1.go b/ecl/data_source_ecl_mlb_certificate_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates"
 )
 
 func certificateFileSchemaForDataSource() *schema.Schema {

diff --git a/ecl/data_source_ecl_mlb_health_monitor_v1.go b/ecl/data_source_ecl_mlb_health_monitor_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors"
 )
 
 func dataSourceMLBHealthMonitorV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_listener_v1.go b/ecl/data_source_ecl_mlb_listener_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners"
 )
 
 func dataSourceMLBListenerV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_load_balancer_v1.go b/ecl/data_source_ecl_mlb_load_balancer_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers"
 )
 
 func reservedFixedIPsSchemaForDataSource() *schema.Schema {

diff --git a/ecl/data_source_ecl_mlb_operation_v1.go b/ecl/data_source_ecl_mlb_operation_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations"
 )
 
 func dataSourceMLBOperationV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_plan_v1.go b/ecl/data_source_ecl_mlb_plan_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans"
 )
 
 func dataSourceMLBPlanV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_policy_v1.go b/ecl/data_source_ecl_mlb_policy_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies"
 )
 
 func dataSourceMLBPolicyV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_route_v1.go b/ecl/data_source_ecl_mlb_route_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes"
 )
 
 func dataSourceMLBRouteV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_rule_v1.go b/ecl/data_source_ecl_mlb_rule_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules"
 )
 
 func conditionsSchemaForDataSource() *schema.Schema {

diff --git a/ecl/data_source_ecl_mlb_system_update_v1.go b/ecl/data_source_ecl_mlb_system_update_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates"
 )
 
 func dataSourceMLBSystemUpdateV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_mlb_target_group_v1.go b/ecl/data_source_ecl_mlb_target_group_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups"
 )
 
 func membersSchemaForDataSource() *schema.Schema {

diff --git a/ecl/data_source_ecl_mlb_tls_policy_v1.go b/ecl/data_source_ecl_mlb_tls_policy_v1.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies"
+	"github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies"
 )
 
 func dataSourceMLBTLSPolicyV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_common_function_gateway_v2.go b/ecl/data_source_ecl_network_common_function_gateway_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways"
 )
 
 func dataSourceNetworkCommonFunctionGatewayV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_common_function_pool_v2.go b/ecl/data_source_ecl_network_common_function_pool_v2.go
@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool"
 )
 
 func dataSourceNetworkCommonFunctionPoolV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_fic_gateway_v2.go b/ecl/data_source_ecl_network_fic_gateway_v2.go
@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways"
 )
 
 func dataSourceNetworkFICGatewayV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_gateway_interface_v2.go b/ecl/data_source_ecl_network_gateway_interface_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces"
 )
 
 func dataSourceNetworkGatewayInterfaceV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_internet_gateway_v2.go b/ecl/data_source_ecl_network_internet_gateway_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways"
 )
 
 func dataSourceNetworkInternetGatewayV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_internet_service_v2.go b/ecl/data_source_ecl_network_internet_service_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services"
 )
 
 func dataSourceNetworkInternetServiceV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_load_balancer_plan_v2.go b/ecl/data_source_ecl_network_load_balancer_plan_v2.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/nttcom/eclcloud/v2"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans"
+	"github.com/nttcom/eclcloud/v3"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/ecl/data_source_ecl_network_network_v2.go b/ecl/data_source_ecl_network_network_v2.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/networks"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets"
+	"github.com/nttcom/eclcloud/v3"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/networks"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets"
 )
 
 func dataSourceNetworkNetworkV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_network_v2_test.go b/ecl/data_source_ecl_network_network_v2_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/ports"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/ports"
 )
 
 func TestAccNetworkV2NetworkDataSource_queries(t *testing.T) {

diff --git a/ecl/data_source_ecl_network_port_v2.go b/ecl/data_source_ecl_network_port_v2.go
@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/ports"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/ports"
 )
 
 func dataSourceNetworkPortV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_public_ip_v2.go b/ecl/data_source_ecl_network_public_ip_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips"
 )
 
 func dataSourceNetworkPublicIPV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_qos_options_v2.go b/ecl/data_source_ecl_network_qos_options_v2.go
@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options"
 )
 
 func dataSourceNetworkQosOptionsV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_static_route_v2.go b/ecl/data_source_ecl_network_static_route_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes"
 )
 
 func dataSourceNetworkStaticRouteV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_network_subnet_v2.go b/ecl/data_source_ecl_network_subnet_v2.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets"
+	"github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets"
 )
 
 func dataSourceNetworkSubnetV2() *schema.Resource {

diff --git a/ecl/data_source_ecl_sss_tenant_v1.go b/ecl/data_source_ecl_sss_tenant_v1.go
@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants"
+	"github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants"
 )
 
 func dataSourceSSSTenantV1() *schema.Resource {

diff --git a/ecl/data_source_ecl_storage_virtualstorage_v1.go b/ecl/data_source_ecl_storage_virtualstorage_v1.go
@@ -3,7 +3,7 @@ package ecl
 import (
 	"fmt"
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages"
+	"github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages"
 	"log"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"log"
-    	"github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones"
+    	"github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones"
     	"github.com/hashicorp/terraform/helper/schema"
     )
@@ Expand Down @@