From e92b3389e0b9441b9897411ad2aa082c5b163ac8 Mon Sep 17 00:00:00 2001 From: ikegami-shota <102566991+ikegami-shota@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:20:56 +0900 Subject: [PATCH 1/5] IF-10733 Support MSS v3 (#112) * IF-10733 Support MSS v3 * IF-10733 Fix function name * IF-10733 Support MSS v3 --- ecl/clientconfig/requests.go | 4 +- ecl/clientconfig/testing/fixtures.go | 2 +- ecl/clientconfig/testing/requests_test.go | 4 +- ecl/compute_instance_v2_networking.go | 8 +- ecl/config.go | 12 +- ...urce_ecl_baremetal_availability_zone_v2.go | 2 +- ecl/data_source_ecl_baremetal_flavor_v2.go | 2 +- ecl/data_source_ecl_baremetal_keypair_v2.go | 2 +- ecl/data_source_ecl_compute_flavor_v2.go | 2 +- ecl/data_source_ecl_compute_keypair_v2.go | 2 +- ecl/data_source_ecl_dns_zone_v2.go | 2 +- ecl/data_source_ecl_imagestorages_image_v2.go | 2 +- ecl/data_source_ecl_mlb_certificate_v1.go | 2 +- ecl/data_source_ecl_mlb_health_monitor_v1.go | 2 +- ecl/data_source_ecl_mlb_listener_v1.go | 2 +- ecl/data_source_ecl_mlb_load_balancer_v1.go | 2 +- ecl/data_source_ecl_mlb_operation_v1.go | 2 +- ecl/data_source_ecl_mlb_plan_v1.go | 2 +- ecl/data_source_ecl_mlb_policy_v1.go | 2 +- ecl/data_source_ecl_mlb_route_v1.go | 2 +- ecl/data_source_ecl_mlb_rule_v1.go | 2 +- ecl/data_source_ecl_mlb_system_update_v1.go | 2 +- ecl/data_source_ecl_mlb_target_group_v1.go | 2 +- ecl/data_source_ecl_mlb_tls_policy_v1.go | 2 +- ..._ecl_network_common_function_gateway_v2.go | 2 +- ...rce_ecl_network_common_function_pool_v2.go | 2 +- ecl/data_source_ecl_network_fic_gateway_v2.go | 2 +- ...source_ecl_network_gateway_interface_v2.go | 2 +- ..._source_ecl_network_internet_gateway_v2.go | 2 +- ..._source_ecl_network_internet_service_v2.go | 2 +- ...ource_ecl_network_load_balancer_plan_v2.go | 4 +- ecl/data_source_ecl_network_network_v2.go | 6 +- ...data_source_ecl_network_network_v2_test.go | 2 +- ecl/data_source_ecl_network_port_v2.go | 2 +- ecl/data_source_ecl_network_public_ip_v2.go | 2 +- ecl/data_source_ecl_network_qos_options_v2.go | 2 +- ...data_source_ecl_network_static_route_v2.go | 2 +- ecl/data_source_ecl_network_subnet_v2.go | 2 +- ecl/data_source_ecl_sss_tenant_v1.go | 2 +- ...ta_source_ecl_storage_virtualstorage_v1.go | 2 +- ecl/data_source_ecl_storage_volume_v1.go | 2 +- ecl/data_source_ecl_storage_volumetype_v1.go | 2 +- ecl/data_source_ecl_vna_appliance_plan_v1.go | 4 +- ecl/data_source_ecl_vna_appliance_v1.go | 2 +- ecl/fixtures.go | 8 +- ...curity_network_based_device_ha_v3_test.go} | 32 +-- ...ty_network_based_device_single_v3_test.go} | 30 +-- ecl/provider.go | 8 +- ecl/resource_ecl_baremetal_keypair_v2.go | 2 +- ecl/resource_ecl_baremetal_keypair_v2_test.go | 2 +- ecl/resource_ecl_baremetal_server_v2.go | 8 +- ...ource_ecl_baremetal_server_v2_mock_test.go | 2 +- ecl/resource_ecl_baremetal_server_v2_test.go | 2 +- ecl/resource_ecl_compute_instance_v2.go | 20 +- ecl/resource_ecl_compute_instance_v2_test.go | 14 +- ecl/resource_ecl_compute_keypair_v2.go | 2 +- ecl/resource_ecl_compute_keypair_v2_test.go | 2 +- ecl/resource_ecl_compute_volume_attach_v2.go | 2 +- ..._ecl_compute_volume_attach_v2_mock_test.go | 2 +- ...ource_ecl_compute_volume_attach_v2_test.go | 6 +- ecl/resource_ecl_compute_volume_v2.go | 8 +- ecl/resource_ecl_compute_volume_v2_test.go | 4 +- ...rce_ecl_dedicated_hypervisor_license_v1.go | 4 +- ...cl_dedicated_hypervisor_license_v1_test.go | 2 +- ...urce_ecl_dedicated_hypervisor_server_v1.go | 4 +- ...edicated_hypervisor_server_v1_mock_test.go | 2 +- ...ecl_dedicated_hypervisor_server_v1_test.go | 4 +- ecl/resource_ecl_dns_recordset_v2.go | 4 +- ecl/resource_ecl_dns_recordset_v2_test.go | 2 +- ecl/resource_ecl_dns_zone_v2.go | 4 +- ecl/resource_ecl_dns_zone_v2_test.go | 2 +- ecl/resource_ecl_imagestorages_image_v2.go | 6 +- ...esource_ecl_imagestorages_image_v2_test.go | 2 +- ecl/resource_ecl_imagestorages_member_v2.go | 4 +- ...source_ecl_imagestorages_member_v2_test.go | 2 +- ..._ecl_network_common_function_gateway_v2.go | 4 +- ...network_common_function_gateway_v2_test.go | 2 +- ...source_ecl_network_gateway_interface_v2.go | 4 +- ...e_ecl_network_gateway_interface_v2_test.go | 4 +- ...esource_ecl_network_internet_gateway_v2.go | 4 +- ...l_network_internet_gateway_v2_mock_test.go | 2 +- ...ce_ecl_network_internet_gateway_v2_test.go | 2 +- ecl/resource_ecl_network_load_balancer_v2.go | 10 +- ...ource_ecl_network_load_balancer_v2_test.go | 12 +- ecl/resource_ecl_network_network_v2.go | 4 +- ecl/resource_ecl_network_network_v2_test.go | 8 +- ecl/resource_ecl_network_port_v2.go | 4 +- ecl/resource_ecl_network_port_v2_test.go | 6 +- ecl/resource_ecl_network_public_ip_v2.go | 4 +- ecl/resource_ecl_network_public_ip_v2_test.go | 2 +- ecl/resource_ecl_network_static_route_v2.go | 4 +- ...source_ecl_network_static_route_v2_test.go | 4 +- ecl/resource_ecl_network_subnet_v2.go | 4 +- ecl/resource_ecl_network_subnet_v2_test.go | 2 +- ...nnectivity_tenant_connection_request_v2.go | 6 +- ...ivity_tenant_connection_request_v2_test.go | 4 +- ...vider_connectivity_tenant_connection_v2.go | 4 +- ...ectivity_tenant_connection_v2_mock_test.go | 2 +- ..._connectivity_tenant_connection_v2_test.go | 4 +- ecl/resource_ecl_rca_user_v1.go | 2 +- ecl/resource_ecl_rca_user_v1_test.go | 4 +- ...=> resource_ecl_security_host_based_v3.go} | 46 ++-- ...e_ecl_security_host_based_v3_mock_test.go} | 136 +++++------ ...source_ecl_security_host_based_v3_test.go} | 104 ++++---- ...cl_security_network_based_device_ha_v3.go} | 38 +-- ...y_network_based_device_ha_v3_mock_test.go} | 230 +++++++++--------- ...curity_network_based_device_ha_v3_test.go} | 198 +++++++-------- ...ecurity_network_based_device_single_v3.go} | 38 +-- ...twork_based_device_single_v3_mock_test.go} | 192 +++++++-------- ...ty_network_based_device_single_v3_test.go} | 142 +++++------ ...l_security_network_based_waf_single_v3.go} | 10 +- ..._network_based_waf_single_v3_mock_test.go} | 190 +++++++-------- ...urity_network_based_waf_single_v3_test.go} | 110 ++++----- ecl/resource_ecl_sss_approval_request_v1.go | 2 +- ...source_ecl_sss_approval_request_v1_test.go | 2 +- ecl/resource_ecl_sss_tenant_v1.go | 2 +- ecl/resource_ecl_sss_tenant_v1_test.go | 2 +- ecl/resource_ecl_sss_user_v1.go | 2 +- ecl/resource_ecl_sss_user_v1_test.go | 2 +- ecl/resource_ecl_storage_virtualstorage_v1.go | 6 +- ...urce_ecl_storage_virtualstorage_v1_test.go | 2 +- ecl/resource_ecl_storage_volume_v1.go | 4 +- ecl/resource_ecl_storage_volume_v1_test.go | 4 +- ecl/resource_ecl_vna_appliance_v1.go | 4 +- ...resource_ecl_vna_appliance_v1_mock_test.go | 2 +- ecl/resource_ecl_vna_appliance_v1_test.go | 6 +- ecl/security.go | 20 +- ecl/security_ha.go | 16 +- ecl/types.go | 22 +- ecl/util.go | 2 +- ecl/vna.go | 4 +- go.mod | 2 +- go.sum | 4 +- .../nttcom/eclcloud/{v2 => v3}/LICENSE | 0 .../eclcloud/{v2 => v3}/auth_options.go | 0 .../nttcom/eclcloud/{v2 => v3}/doc.go | 0 .../eclcloud/{v2 => v3}/ecl/auth_env.go | 2 +- .../ecl/baremetal/v2/availabilityzones/doc.go | 0 .../v2}/availabilityzones/requests.go | 4 +- .../baremetal/v2/availabilityzones/results.go | 2 +- .../baremetal/v2/availabilityzones/urls.go | 2 +- .../ecl/baremetal/v2/flavors/doc.go | 0 .../ecl/baremetal/v2/flavors/requests.go | 4 +- .../ecl/baremetal/v2/flavors/results.go | 4 +- .../ecl/baremetal/v2/flavors/urls.go | 2 +- .../ecl/baremetal/v2/keypairs/doc.go | 0 .../ecl/baremetal/v2/keypairs/requests.go | 4 +- .../ecl/baremetal/v2/keypairs/results.go | 4 +- .../ecl/baremetal/v2}/keypairs/urls.go | 2 +- .../ecl/baremetal/v2/servers/doc.go | 0 .../ecl/baremetal/v2/servers/requests.go | 4 +- .../ecl/baremetal/v2/servers/result.go | 4 +- .../ecl/baremetal/v2/servers/urls.go | 2 +- .../nttcom/eclcloud/{v2 => v3}/ecl/client.go | 22 +- .../v2/extensions/availabilityzones/doc.go | 0 .../extensions}/availabilityzones/requests.go | 4 +- .../extensions/availabilityzones/results.go | 4 +- .../v2/extensions/availabilityzones/urls.go | 2 +- .../v2/extensions/bootfromvolume/doc.go | 0 .../v2/extensions/bootfromvolume/requests.go | 4 +- .../v2/extensions/bootfromvolume/results.go | 2 +- .../v2/extensions/bootfromvolume/urls.go | 2 +- .../ecl/compute/v2/extensions/keypairs/doc.go | 0 .../v2/extensions/keypairs/requests.go | 6 +- .../compute/v2/extensions/keypairs/results.go | 4 +- .../compute/v2/extensions}/keypairs/urls.go | 2 +- .../compute/v2/extensions/startstop/doc.go | 0 .../v2/extensions/startstop/requests.go | 2 +- .../v2/extensions/startstop/results.go | 2 +- .../compute/v2/extensions/volumeattach/doc.go | 0 .../v2/extensions/volumeattach/requests.go | 4 +- .../v2/extensions/volumeattach/results.go | 4 +- .../v2/extensions/volumeattach/urls.go | 2 +- .../{v2 => v3}/ecl/compute/v2/flavors/doc.go | 0 .../ecl/compute/v2/flavors/requests.go | 4 +- .../ecl/compute/v2/flavors/results.go | 4 +- .../{v2 => v3}/ecl/compute/v2/flavors/urls.go | 2 +- .../{v2 => v3}/ecl/compute/v2/images/doc.go | 0 .../ecl/compute/v2/images/requests.go | 4 +- .../ecl/compute/v2/images/results.go | 4 +- .../{v2 => v3}/ecl/compute/v2/images/urls.go | 2 +- .../{v2 => v3}/ecl/compute/v2/servers/doc.go | 0 .../ecl/compute/v2/servers/errors.go | 2 +- .../ecl/compute/v2/servers/requests.go | 8 +- .../ecl/compute/v2/servers/results.go | 4 +- .../{v2 => v3}/ecl/compute/v2/servers/urls.go | 2 +- .../{v2 => v3}/ecl/compute/v2/servers/util.go | 2 +- .../ecl/computevolume/v2/volumes/doc.go | 0 .../ecl/computevolume/v2/volumes/requests.go | 4 +- .../ecl/computevolume/v2/volumes/results.go | 4 +- .../ecl/computevolume/v2}/volumes/urls.go | 2 +- .../ecl/computevolume/v2/volumes/util.go | 2 +- .../dedicated_hypervisor/v1/licenses/doc.go | 0 .../v1/licenses/requests.go | 4 +- .../v1/licenses/results.go | 4 +- .../dedicated_hypervisor/v1/licenses/urls.go | 2 +- .../dedicated_hypervisor/v1/servers/doc.go | 0 .../v1/servers/requests.go | 4 +- .../v1/servers/results.go | 4 +- .../dedicated_hypervisor/v1/servers/urls.go | 2 +- .../{v2 => v3}/ecl/dns/v2/recordsets/doc.go | 0 .../ecl/dns/v2/recordsets/requests.go | 4 +- .../ecl/dns/v2/recordsets/results.go | 4 +- .../{v2 => v3}/ecl/dns/v2/recordsets/urls.go | 2 +- .../{v2 => v3}/ecl/dns/v2/zones/doc.go | 0 .../{v2 => v3}/ecl/dns/v2/zones/requests.go | 4 +- .../{v2 => v3}/ecl/dns/v2/zones/results.go | 4 +- .../{v2 => v3}/ecl/dns/v2/zones/urls.go | 2 +- .../nttcom/eclcloud/{v2 => v3}/ecl/doc.go | 0 .../{v2 => v3}/ecl/endpoint_location.go | 4 +- .../nttcom/eclcloud/{v2 => v3}/ecl/errors.go | 4 +- .../{v2 => v3}/ecl/identity/v3/tokens/doc.go | 0 .../ecl/identity/v3/tokens/requests.go | 2 +- .../ecl/identity/v3/tokens/results.go | 2 +- .../{v2 => v3}/ecl/identity/v3/tokens/urls.go | 2 +- .../ecl/imagestorage/v2/imagedata/doc.go | 0 .../ecl/imagestorage/v2/imagedata/requests.go | 2 +- .../ecl/imagestorage/v2/imagedata/results.go | 2 +- .../ecl/imagestorage/v2/imagedata/urls.go | 2 +- .../ecl/imagestorage/v2/images/doc.go | 0 .../ecl/imagestorage/v2/images/requests.go | 4 +- .../ecl/imagestorage/v2/images/results.go | 6 +- .../ecl/imagestorage/v2/images/types.go | 0 .../ecl/imagestorage/v2/images/urls.go | 4 +- .../ecl/imagestorage/v2/members/doc.go | 0 .../ecl/imagestorage/v2/members/requests.go | 4 +- .../ecl/imagestorage/v2/members/results.go | 4 +- .../ecl/imagestorage/v2/members/urls.go | 2 +- .../v1/certificates/doc.go | 0 .../v1/certificates/requests.go | 4 +- .../v1/certificates/results.go | 4 +- .../v1/certificates/urls.go | 2 +- .../v1/health_monitors/doc.go | 0 .../v1/health_monitors/requests.go | 4 +- .../v1/health_monitors/results.go | 4 +- .../v1/health_monitors/urls.go | 2 +- .../managed_load_balancer/v1/listeners/doc.go | 0 .../v1/listeners/requests.go | 4 +- .../v1/listeners/results.go | 4 +- .../v1/listeners/urls.go | 2 +- .../v1/load_balancers/doc.go | 0 .../v1/load_balancers/requests.go | 4 +- .../v1/load_balancers/results.go | 4 +- .../v1/load_balancers/urls.go | 2 +- .../v1/operations/doc.go | 0 .../v1/operations/requests.go | 4 +- .../v1/operations/results.go | 4 +- .../v1/operations/urls.go | 2 +- .../ecl/managed_load_balancer/v1/plans/doc.go | 0 .../v1/plans/requests.go | 4 +- .../managed_load_balancer/v1/plans/results.go | 4 +- .../managed_load_balancer/v1/plans/urls.go | 2 +- .../managed_load_balancer/v1/policies/doc.go | 0 .../v1/policies/requests.go | 4 +- .../v1/policies/results.go | 4 +- .../managed_load_balancer/v1/policies/urls.go | 2 +- .../managed_load_balancer/v1/routes/doc.go | 0 .../v1/routes/requests.go | 4 +- .../v1/routes/results.go | 4 +- .../managed_load_balancer/v1/routes/urls.go | 2 +- .../ecl/managed_load_balancer/v1/rules/doc.go | 0 .../v1/rules/requests.go | 4 +- .../managed_load_balancer/v1/rules/results.go | 4 +- .../managed_load_balancer/v1/rules/urls.go | 2 +- .../v1/system_updates/doc.go | 0 .../v1/system_updates/requests.go | 4 +- .../v1/system_updates/results.go | 4 +- .../v1/system_updates/urls.go | 2 +- .../v1/target_groups/doc.go | 0 .../v1/target_groups/requests.go | 4 +- .../v1/target_groups/results.go | 4 +- .../v1/target_groups/urls.go | 2 +- .../v1/tls_policies/doc.go | 0 .../v1/tls_policies/requests.go | 4 +- .../v1/tls_policies/results.go | 4 +- .../v1/tls_policies/urls.go | 2 +- .../v2/common_function_gateways/doc.go | 0 .../v2/common_function_gateways/requests.go | 4 +- .../v2/common_function_gateways/results.go | 4 +- .../v2/common_function_gateways/urls.go | 2 +- .../network/v2/common_function_pool/doc.go | 0 .../v2/common_function_pool/requests.go | 4 +- .../v2/common_function_pool/results.go | 4 +- .../network/v2/common_function_pool/urls.go | 2 +- .../ecl/network/v2/fic_gateways/doc.go | 0 .../ecl/network/v2/fic_gateways/requests.go | 4 +- .../ecl/network/v2/fic_gateways/results.go | 4 +- .../ecl/network/v2/fic_gateways/urls.go | 2 +- .../ecl/network/v2/gateway_interfaces/doc.go | 0 .../network/v2/gateway_interfaces/requests.go | 4 +- .../network/v2/gateway_interfaces/results.go | 4 +- .../ecl/network/v2/gateway_interfaces/urls.go | 2 +- .../ecl/network/v2/internet_gateways/doc.go | 0 .../network/v2/internet_gateways/requests.go | 4 +- .../network/v2/internet_gateways/results.go | 4 +- .../ecl/network/v2/internet_gateways/urls.go | 2 +- .../ecl/network/v2/internet_services/doc.go | 0 .../network/v2/internet_services/requests.go | 4 +- .../network/v2/internet_services/results.go | 4 +- .../ecl/network/v2/internet_services/urls.go | 2 +- .../v2/load_balancer_interfaces/doc.go | 0 .../v2/load_balancer_interfaces/requests.go | 4 +- .../v2/load_balancer_interfaces/results.go | 4 +- .../v2/load_balancer_interfaces/urls.go | 2 +- .../ecl/network/v2/load_balancer_plans/doc.go | 0 .../v2/load_balancer_plans/requests.go | 4 +- .../network/v2/load_balancer_plans/results.go | 4 +- .../network/v2/load_balancer_plans/urls.go | 2 +- .../v2/load_balancer_syslog_servers/doc.go | 0 .../load_balancer_syslog_servers/requests.go | 4 +- .../load_balancer_syslog_servers/results.go | 4 +- .../v2/load_balancer_syslog_servers/urls.go | 2 +- .../ecl/network/v2/load_balancers/doc.go | 0 .../ecl/network/v2/load_balancers/requests.go | 4 +- .../ecl/network/v2/load_balancers/results.go | 8 +- .../ecl/network/v2/load_balancers/urls.go | 2 +- .../{v2 => v3}/ecl/network/v2/networks/doc.go | 0 .../ecl/network/v2/networks/requests.go | 4 +- .../ecl/network/v2/networks/results.go | 4 +- .../ecl/network/v2/networks/urls.go | 2 +- .../{v2 => v3}/ecl/network/v2/ports/doc.go | 0 .../ecl/network/v2/ports/requests.go | 4 +- .../ecl/network/v2/ports/results.go | 4 +- .../{v2 => v3}/ecl/network/v2/ports/urls.go | 2 +- .../ecl/network/v2/public_ips/doc.go | 0 .../ecl/network/v2/public_ips/requests.go | 4 +- .../ecl/network/v2/public_ips/results.go | 4 +- .../ecl/network/v2/public_ips/urls.go | 2 +- .../ecl/network/v2/qos_options/doc.go | 0 .../ecl/network/v2/qos_options/requests.go | 4 +- .../ecl/network/v2/qos_options/results.go | 4 +- .../ecl/network/v2/qos_options/urls.go | 2 +- .../ecl/network/v2/static_routes/doc.go | 0 .../ecl/network/v2/static_routes/requests.go | 4 +- .../ecl/network/v2/static_routes/results.go | 4 +- .../ecl/network/v2/static_routes/urls.go | 2 +- .../{v2 => v3}/ecl/network/v2/subnets/doc.go | 0 .../ecl/network/v2/subnets/requests.go | 4 +- .../ecl/network/v2/subnets/results.go | 4 +- .../{v2 => v3}/ecl/network/v2/subnets/urls.go | 2 +- .../v2/tenant_connection_requests/doc.go | 0 .../v2/tenant_connection_requests/requests.go | 4 +- .../v2/tenant_connection_requests/results.go | 4 +- .../v2/tenant_connection_requests/urls.go | 2 +- .../v2/tenant_connections/doc.go | 0 .../v2/tenant_connections/requests.go | 4 +- .../v2/tenant_connections/results.go | 4 +- .../v2/tenant_connections/urls.go | 2 +- .../{v2 => v3}/ecl/rca/v1/users/doc.go | 0 .../{v2 => v3}/ecl/rca/v1/users/requests.go | 4 +- .../{v2 => v3}/ecl/rca/v1/users/results.go | 4 +- .../{v2 => v3}/ecl/rca/v1/users/urls.go | 2 +- .../ecl/security_order/v3}/host_based/doc.go | 0 .../security_order/v3}/host_based/requests.go | 2 +- .../security_order/v3}/host_based/results.go | 2 +- .../ecl/security_order/v3}/host_based/urls.go | 2 +- .../v3}/network_based_device_ha/doc.go | 0 .../v3}/network_based_device_ha/requests.go | 4 +- .../v3}/network_based_device_ha/results.go | 4 +- .../v3}/network_based_device_ha/urls.go | 2 +- .../v3}/network_based_device_single/doc.go | 0 .../network_based_device_single/requests.go | 4 +- .../network_based_device_single/results.go | 4 +- .../v3}/network_based_device_single/urls.go | 2 +- .../v3}/service_order_status/doc.go | 0 .../v3}/service_order_status/requests.go | 2 +- .../v3}/service_order_status/results.go | 2 +- .../v3}/service_order_status/urls.go | 2 +- .../v3}/device_interfaces/doc.go | 0 .../v3}/device_interfaces/requests.go | 4 +- .../v3}/device_interfaces/results.go | 4 +- .../v3}/device_interfaces/urls.go | 2 +- .../ecl/security_portal/v3}/devices/doc.go | 0 .../security_portal/v3}/devices/requests.go | 4 +- .../security_portal/v3}/devices/results.go | 4 +- .../ecl/security_portal/v3}/devices/urls.go | 2 +- .../ecl/security_portal/v3}/ha_ports/doc.go | 0 .../security_portal/v3}/ha_ports/requests.go | 2 +- .../security_portal/v3}/ha_ports/results.go | 4 +- .../ecl/security_portal/v3}/ha_ports/urls.go | 2 +- .../ecl/security_portal/v3}/ports/doc.go | 0 .../ecl/security_portal/v3}/ports/requests.go | 2 +- .../ecl/security_portal/v3}/ports/results.go | 4 +- .../ecl/security_portal/v3}/ports/urls.go | 2 +- .../ecl/security_portal/v3}/processes/doc.go | 0 .../security_portal/v3}/processes/requests.go | 2 +- .../security_portal/v3}/processes/results.go | 2 +- .../ecl/security_portal/v3}/processes/urls.go | 2 +- .../ecl/sss/v1/approval_requests/doc.go | 0 .../ecl/sss/v1/approval_requests/requests.go | 4 +- .../ecl/sss/v1/approval_requests/results.go | 4 +- .../ecl/sss/v1/approval_requests/urls.go | 2 +- .../{v2 => v3}/ecl/sss/v1/tenants/doc.go | 0 .../{v2 => v3}/ecl/sss/v1/tenants/errors.go | 0 .../{v2 => v3}/ecl/sss/v1/tenants/requests.go | 4 +- .../{v2 => v3}/ecl/sss/v1/tenants/results.go | 4 +- .../{v2 => v3}/ecl/sss/v1/tenants/urls.go | 2 +- .../{v2 => v3}/ecl/sss/v1/users/doc.go | 0 .../{v2 => v3}/ecl/sss/v1/users/requests.go | 4 +- .../{v2 => v3}/ecl/sss/v1/users/results.go | 4 +- .../{v2 => v3}/ecl/sss/v1/users/urls.go | 2 +- .../ecl/storage/v1/virtualstorages/doc.go | 0 .../storage/v1/virtualstorages/requests.go | 4 +- .../ecl/storage/v1/virtualstorages/results.go | 4 +- .../ecl/storage/v1/virtualstorages/urls.go | 2 +- .../ecl/storage/v1/virtualstorages/util.go | 2 +- .../{v2 => v3}/ecl/storage/v1/volumes/doc.go | 0 .../ecl/storage/v1/volumes/requests.go | 8 +- .../ecl/storage/v1/volumes/results.go | 4 +- .../v2 => v3/ecl/storage/v1}/volumes/urls.go | 2 +- .../{v2 => v3}/ecl/storage/v1/volumes/util.go | 2 +- .../ecl/storage/v1/volumetypes/doc.go | 0 .../ecl/storage/v1/volumetypes/requests.go | 4 +- .../ecl/storage/v1/volumetypes/results.go | 4 +- .../ecl/storage/v1/volumetypes/urls.go | 2 +- .../{v2 => v3}/ecl/utils/base_endpoint.go | 0 .../{v2 => v3}/ecl/utils/choose_version.go | 2 +- .../ecl/vna/v1/appliance_plans/doc.go | 0 .../ecl/vna/v1/appliance_plans/requests.go | 4 +- .../ecl/vna/v1/appliance_plans/results.go | 4 +- .../ecl/vna/v1/appliance_plans/urls.go | 2 +- .../{v2 => v3}/ecl/vna/v1/appliances/doc.go | 0 .../ecl/vna/v1/appliances/requests.go | 4 +- .../ecl/vna/v1/appliances/results.go | 4 +- .../{v2 => v3}/ecl/vna/v1/appliances/urls.go | 2 +- .../eclcloud/{v2 => v3}/endpoint_search.go | 0 .../nttcom/eclcloud/{v2 => v3}/errors.go | 0 .../eclcloud/{v2 => v3}/internal/pkg.go | 0 .../eclcloud/{v2 => v3}/internal/util.go | 0 .../eclcloud/{v2 => v3}/pagination/http.go | 2 +- .../eclcloud/{v2 => v3}/pagination/linked.go | 2 +- .../eclcloud/{v2 => v3}/pagination/marker.go | 2 +- .../eclcloud/{v2 => v3}/pagination/pager.go | 2 +- .../eclcloud/{v2 => v3}/pagination/pkg.go | 0 .../eclcloud/{v2 => v3}/pagination/single.go | 2 +- .../nttcom/eclcloud/{v2 => v3}/params.go | 0 .../eclcloud/{v2 => v3}/provider_client.go | 0 .../nttcom/eclcloud/{v2 => v3}/results.go | 0 .../eclcloud/{v2 => v3}/service_client.go | 0 .../{v2 => v3}/testhelper/convenience.go | 0 .../eclcloud/{v2 => v3}/testhelper/doc.go | 0 .../{v2 => v3}/testhelper/http_responses.go | 0 .../nttcom/eclcloud/{v2 => v3}/util.go | 0 vendor/modules.txt | 154 ++++++------ ...rkdown => security_host_based_v3.markdown} | 14 +- ...urity_network_based_device_ha_v3.markdown} | 20 +- ...y_network_based_device_single_v3.markdown} | 20 +- ...rity_network_based_waf_single_v3.markdown} | 18 +- 448 files changed, 1461 insertions(+), 1461 deletions(-) rename ecl/{import_ecl_security_network_based_device_ha_v2_test.go => import_ecl_security_network_based_device_ha_v3_test.go} (69%) rename ecl/{import_ecl_security_network_based_device_single_v2_test.go => import_ecl_security_network_based_device_single_v3_test.go} (65%) rename ecl/{resource_ecl_security_host_based_v2.go => resource_ecl_security_host_based_v3.go} (87%) rename ecl/{resource_ecl_security_host_based_v2_mock_test.go => resource_ecl_security_host_based_v3_mock_test.go} (74%) rename ecl/{resource_ecl_security_host_based_v2_test.go => resource_ecl_security_host_based_v3_test.go} (63%) rename ecl/{resource_ecl_security_network_based_device_ha_v2.go => resource_ecl_security_network_based_device_ha_v3.go} (89%) rename ecl/{resource_ecl_security_network_based_device_ha_v2_mock_test.go => resource_ecl_security_network_based_device_ha_v3_mock_test.go} (86%) rename ecl/{resource_ecl_security_network_based_device_ha_v2_test.go => resource_ecl_security_network_based_device_ha_v3_test.go} (68%) rename ecl/{resource_ecl_security_network_based_device_single_v2.go => resource_ecl_security_network_based_device_single_v3.go} (87%) rename ecl/{resource_ecl_security_network_based_device_single_v2_mock_test.go => resource_ecl_security_network_based_device_single_v3_mock_test.go} (84%) rename ecl/{resource_ecl_security_network_based_device_single_v2_test.go => resource_ecl_security_network_based_device_single_v3_test.go} (62%) rename ecl/{resource_ecl_security_network_based_waf_single_v2.go => resource_ecl_security_network_based_waf_single_v3.go} (58%) rename ecl/{resource_ecl_security_network_based_waf_single_v2_mock_test.go => resource_ecl_security_network_based_waf_single_v3_mock_test.go} (83%) rename ecl/{resource_ecl_security_network_based_waf_single_v2_test.go => resource_ecl_security_network_based_waf_single_v3_test.go} (60%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/LICENSE (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/auth_options.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/auth_env.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/availabilityzones/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/compute/v2/extensions => v3/ecl/baremetal/v2}/availabilityzones/requests.go (80%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/availabilityzones/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/availabilityzones/urls.go (76%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/flavors/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/flavors/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/flavors/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/flavors/urls.go (87%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/keypairs/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/keypairs/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/keypairs/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/compute/v2/extensions => v3/ecl/baremetal/v2}/keypairs/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/servers/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/servers/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/servers/result.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/baremetal/v2/servers/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/client.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/availabilityzones/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/baremetal/v2 => v3/ecl/compute/v2/extensions}/availabilityzones/requests.go (80%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/availabilityzones/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/availabilityzones/urls.go (76%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/bootfromvolume/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/bootfromvolume/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/bootfromvolume/results.go (82%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/bootfromvolume/urls.go (75%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/keypairs/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/keypairs/requests.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/keypairs/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/baremetal/v2 => v3/ecl/compute/v2/extensions}/keypairs/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/startstop/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/startstop/requests.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/startstop/results.go (90%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/volumeattach/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/volumeattach/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/volumeattach/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/extensions/volumeattach/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/flavors/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/flavors/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/flavors/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/flavors/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/images/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/images/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/images/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/images/urls.go (89%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/servers/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/servers/errors.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/servers/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/servers/results.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/servers/urls.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/compute/v2/servers/util.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/computevolume/v2/volumes/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/computevolume/v2/volumes/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/computevolume/v2/volumes/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/storage/v1 => v3/ecl/computevolume/v2}/volumes/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/computevolume/v2/volumes/util.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/licenses/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/licenses/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/licenses/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/licenses/urls.go (89%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/servers/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/servers/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/servers/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dedicated_hypervisor/v1/servers/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/recordsets/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/recordsets/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/recordsets/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/recordsets/urls.go (87%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/zones/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/zones/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/zones/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/dns/v2/zones/urls.go (83%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/endpoint_location.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/errors.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/identity/v3/tokens/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/identity/v3/tokens/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/identity/v3/tokens/results.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/identity/v3/tokens/urls.go (73%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/imagedata/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/imagedata/requests.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/imagedata/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/imagedata/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/images/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/images/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/images/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/images/types.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/images/urls.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/members/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/members/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/members/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/imagestorage/v2/members/urls.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/certificates/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/certificates/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/certificates/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/certificates/urls.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/health_monitors/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/health_monitors/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/health_monitors/results.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/health_monitors/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/listeners/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/listeners/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/listeners/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/listeners/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/load_balancers/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/load_balancers/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/load_balancers/results.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/load_balancers/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/operations/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/operations/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/operations/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/operations/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/plans/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/plans/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/plans/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/plans/urls.go (91%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/policies/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/policies/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/policies/results.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/policies/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/routes/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/routes/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/routes/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/routes/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/rules/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/rules/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/rules/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/rules/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/system_updates/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/system_updates/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/system_updates/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/system_updates/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/target_groups/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/target_groups/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/target_groups/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/target_groups/urls.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/tls_policies/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/tls_policies/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/tls_policies/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/managed_load_balancer/v1/tls_policies/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_gateways/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_gateways/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_gateways/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_gateways/urls.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_pool/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_pool/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_pool/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/common_function_pool/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/fic_gateways/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/fic_gateways/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/fic_gateways/results.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/fic_gateways/urls.go (85%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/gateway_interfaces/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/gateway_interfaces/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/gateway_interfaces/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/gateway_interfaces/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_gateways/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_gateways/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_gateways/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_gateways/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_services/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_services/requests.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_services/results.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/internet_services/urls.go (90%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_interfaces/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_interfaces/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_interfaces/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_interfaces/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_plans/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_plans/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_plans/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_plans/urls.go (91%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_syslog_servers/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_syslog_servers/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_syslog_servers/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancer_syslog_servers/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancers/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancers/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancers/results.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/load_balancers/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/networks/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/networks/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/networks/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/networks/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/ports/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/ports/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/ports/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/ports/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/public_ips/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/public_ips/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/public_ips/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/public_ips/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/qos_options/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/qos_options/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/qos_options/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/qos_options/urls.go (85%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/static_routes/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/static_routes/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/static_routes/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/static_routes/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/subnets/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/subnets/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/subnets/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/network/v2/subnets/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connection_requests/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connection_requests/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go (94%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connections/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connections/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connections/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/provider_connectivity/v2/tenant_connections/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/rca/v1/users/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/rca/v1/users/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/rca/v1/users/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/rca/v1/users/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/host_based/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/host_based/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/host_based/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/host_based/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_ha/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_ha/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_ha/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_ha/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_single/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_single/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_single/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/network_based_device_single/urls.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/service_order_status/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/service_order_status/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/service_order_status/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_order/v2 => v3/ecl/security_order/v3}/service_order_status/urls.go (91%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/device_interfaces/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/device_interfaces/requests.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/device_interfaces/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/device_interfaces/urls.go (86%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/devices/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/devices/requests.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/devices/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/devices/urls.go (79%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ha_ports/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ha_ports/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ha_ports/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ha_ports/urls.go (85%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ports/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ports/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ports/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/ports/urls.go (87%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/processes/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/processes/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/processes/results.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/security_portal/v2 => v3/ecl/security_portal/v3}/processes/urls.go (86%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/approval_requests/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/approval_requests/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/approval_requests/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/approval_requests/urls.go (90%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/tenants/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/tenants/errors.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/tenants/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/tenants/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/tenants/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/users/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/users/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/users/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/sss/v1/users/urls.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/virtualstorages/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/virtualstorages/requests.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/virtualstorages/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/virtualstorages/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/virtualstorages/util.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumes/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumes/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumes/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2/ecl/computevolume/v2 => v3/ecl/storage/v1}/volumes/urls.go (92%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumes/util.go (93%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumetypes/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumetypes/requests.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumetypes/results.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/storage/v1/volumetypes/urls.go (88%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/utils/base_endpoint.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/utils/choose_version.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliance_plans/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliance_plans/requests.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliance_plans/results.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliance_plans/urls.go (91%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliances/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliances/requests.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliances/results.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/ecl/vna/v1/appliances/urls.go (95%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/endpoint_search.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/errors.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/internal/pkg.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/internal/util.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/pagination/http.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/pagination/linked.go (98%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/pagination/marker.go (97%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/pagination/pager.go (99%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/pagination/pkg.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/pagination/single.go (96%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/params.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/provider_client.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/results.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/service_client.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/testhelper/convenience.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/testhelper/doc.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/testhelper/http_responses.go (100%) rename vendor/github.com/nttcom/eclcloud/{v2 => v3}/util.go (100%) rename website/docs/r/{security_host_based_v2.markdown => security_host_based_v3.markdown} (73%) rename website/docs/r/{security_network_based_device_ha_v2.markdown => security_network_based_device_ha_v3.markdown} (93%) rename website/docs/r/{security_network_based_device_single_v2.markdown => security_network_based_device_single_v3.markdown} (87%) rename website/docs/r/{security_network_based_waf_single_v2.markdown => security_network_based_waf_single_v3.markdown} (83%) diff --git a/ecl/clientconfig/requests.go b/ecl/clientconfig/requests.go index 5dbab136..313c6fc1 100644 --- 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 index 85e7bac6..b1691115 100644 --- 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 index 993bd0cc..1eece0bf 100644 --- 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 index afba7909..2208df1e 100644 --- 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 index f29cf032..9f74925c 100644 --- 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 index 28e38fb1..ba633384 100644 --- 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 index 74154b7f..d6895c83 100644 --- 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 index 374c71b4..9863df65 100644 --- 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 index cf419c39..2b10a6ab 100644 --- 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 index 8fb726ab..b3655b73 100644 --- 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 index 8f1bdfbd..00b88b22 100644 --- 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 index c139114c..3779c82a 100644 --- 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 index 902b11e9..97a7c175 100644 --- 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 index fa9d01e6..ca425ad6 100644 --- 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 index 24ed30a3..9dee5771 100644 --- 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 index 264985b1..b9da3fac 100644 --- 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 index 86533238..a21f26bc 100644 --- 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 index b869d69b..76860b0f 100644 --- 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 index f843fbc3..04eea9de 100644 --- 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 index 37349287..66c04e23 100644 --- 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 index 18fca221..e66d8a47 100644 --- 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 index 4422a372..7475c7e4 100644 --- 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 index 3014285f..abe15445 100644 --- 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 index 0d021f87..c183a401 100644 --- 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 index d2149307..80b1c5b2 100644 --- 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 index 4d22376e..3de395d4 100644 --- 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 index 97cbb743..39259d53 100644 --- 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 index 8dd5ab92..873360c7 100644 --- 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 index 46ec1d48..3262bf3a 100644 --- 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 index 352686eb..150fdcaf 100644 --- 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 index 845bad05..bf2735a9 100644 --- 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 index 20d127d3..f696790a 100644 --- 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 index 773bad37..c74ff7f0 100644 --- 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 index 58b604cf..d37f2817 100644 --- 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 index 74aa4ebd..51b74738 100644 --- 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 index 5db13470..85d0f68c 100644 --- 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 index 3dfeffc7..66555896 100644 --- 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 index 6039ed7e..272be36e 100644 --- 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 index 73f5e64e..5c2c04e8 100644 --- 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 index 72f7b6ae..020ba1ea 100644 --- 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" ) diff --git a/ecl/data_source_ecl_storage_volume_v1.go b/ecl/data_source_ecl_storage_volume_v1.go index 926317ee..185d20ce 100644 --- a/ecl/data_source_ecl_storage_volume_v1.go +++ b/ecl/data_source_ecl_storage_volume_v1.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes" ) func dataSourceStorageVolumeV1() *schema.Resource { diff --git a/ecl/data_source_ecl_storage_volumetype_v1.go b/ecl/data_source_ecl_storage_volumetype_v1.go index cb682f98..b0c26a89 100644 --- a/ecl/data_source_ecl_storage_volumetype_v1.go +++ b/ecl/data_source_ecl_storage_volumetype_v1.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/ecl/data_source_ecl_vna_appliance_plan_v1.go b/ecl/data_source_ecl_vna_appliance_plan_v1.go index ff154bbb..b9a61303 100644 --- a/ecl/data_source_ecl_vna_appliance_plan_v1.go +++ b/ecl/data_source_ecl_vna_appliance_plan_v1.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/ecl/data_source_ecl_vna_appliance_v1.go b/ecl/data_source_ecl_vna_appliance_v1.go index 213ae4c2..a3766f1d 100644 --- a/ecl/data_source_ecl_vna_appliance_v1.go +++ b/ecl/data_source_ecl_vna_appliance_v1.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances" ) func allowedAddessPairsSchemaForDatasource() *schema.Schema { diff --git a/ecl/fixtures.go b/ecl/fixtures.go index c6d31136..708202ef 100644 --- a/ecl/fixtures.go +++ b/ecl/fixtures.go @@ -177,8 +177,8 @@ response: } ], "id": "c4c383a719cb489d8210328e17659620", - "name": "security-order", - "type": "security-order" + "name": "security-order-th", + "type": "security-order-th" }, { "endpoints": [ @@ -205,8 +205,8 @@ response: } ], "id": "d4c383a719cb489d8210328e17659620", - "name": "security-operation", - "type": "security-operation" + "name": "security-operation-th", + "type": "security-operation-th" }, { "endpoints": [ diff --git a/ecl/import_ecl_security_network_based_device_ha_v2_test.go b/ecl/import_ecl_security_network_based_device_ha_v3_test.go similarity index 69% rename from ecl/import_ecl_security_network_based_device_ha_v2_test.go rename to ecl/import_ecl_security_network_based_device_ha_v3_test.go index 279e47e9..e27b668f 100644 --- a/ecl/import_ecl_security_network_based_device_ha_v2_test.go +++ b/ecl/import_ecl_security_network_based_device_ha_v3_test.go @@ -8,7 +8,7 @@ import ( "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" ) -func TestAccSecurityV2NetworkBasedDeviceHAImport_basic(t *testing.T) { +func TestAccSecurityV3NetworkBasedDeviceHAImport_basic(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -20,32 +20,32 @@ func TestAccSecurityV2NetworkBasedDeviceHAImport_basic(t *testing.T) { mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) // TODO - mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceHAListDevicesAfterCreate) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfaces) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfaces) + mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceHAListDevicesAfterCreate) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfaces) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfaces) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListBeforeCreate) - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHACreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterCreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterCreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListBeforeCreate) + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHACreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterCreate) - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHADelete) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAProcessingAfterDelete) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetDeleteComplete) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterDelete) + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHADelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAProcessingAfterDelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetDeleteComplete) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterDelete) mc.StartServer(t) - resourceName := "ecl_security_network_based_device_ha_v2.ha_1" + resourceName := "ecl_security_network_based_device_ha_v3.ha_1" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceHADestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceHADestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceHABasic, + Config: testMockedAccSecurityV3NetworkBasedDeviceHABasic, }, resource.TestStep{ diff --git a/ecl/import_ecl_security_network_based_device_single_v2_test.go b/ecl/import_ecl_security_network_based_device_single_v3_test.go similarity index 65% rename from ecl/import_ecl_security_network_based_device_single_v2_test.go rename to ecl/import_ecl_security_network_based_device_single_v3_test.go index 4f8f50dd..72f778de 100644 --- a/ecl/import_ecl_security_network_based_device_single_v2_test.go +++ b/ecl/import_ecl_security_network_based_device_single_v3_test.go @@ -8,7 +8,7 @@ import ( "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" ) -func TestAccSecurityV2NetworkBasedDeviceSingleImport_basic(t *testing.T) { +func TestAccSecurityV3NetworkBasedDeviceSingleImport_basic(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -19,31 +19,31 @@ func TestAccSecurityV2NetworkBasedDeviceSingleImport_basic(t *testing.T) { postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceSingleListDevicesAfterCreate) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfaces) + mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceSingleListDevicesAfterCreate) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfaces) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListBeforeCreate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListBeforeCreate) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterCreate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleDelete) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleProcessingAfterDelete) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetDeleteComplete) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterDelete) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleDelete) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleProcessingAfterDelete) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetDeleteComplete) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterDelete) mc.StartServer(t) - resourceName := "ecl_security_network_based_device_single_v2.device_1" + resourceName := "ecl_security_network_based_device_single_v3.device_1" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceSingleBasic, + Config: testMockedAccSecurityV3NetworkBasedDeviceSingleBasic, }, resource.TestStep{ diff --git a/ecl/provider.go b/ecl/provider.go index a54a69a3..297a4575 100644 --- a/ecl/provider.go +++ b/ecl/provider.go @@ -253,10 +253,10 @@ func Provider() terraform.ResourceProvider { "ecl_provider_connectivity_tenant_connection_request_v2": resourceProviderConnectivityTenantConnectionRequestV2(), "ecl_provider_connectivity_tenant_connection_v2": resourceProviderConnectivityTenantConnectionV2(), "ecl_rca_user_v1": resourceRCAUserV1(), - "ecl_security_host_based_v2": resourceSecurityHostBasedV2(), - "ecl_security_network_based_device_ha_v2": resourceSecurityNetworkBasedDeviceHAV2(), - "ecl_security_network_based_device_single_v2": resourceSecurityNetworkBasedDeviceSingleV2(), - "ecl_security_network_based_waf_single_v2": resourceSecurityNetworkBasedWAFSingleV2(), + "ecl_security_host_based_v3": resourceSecurityHostBasedV3(), + "ecl_security_network_based_device_ha_v3": resourceSecurityNetworkBasedDeviceHAV3(), + "ecl_security_network_based_device_single_v3": resourceSecurityNetworkBasedDeviceSingleV3(), + "ecl_security_network_based_waf_single_v3": resourceSecurityNetworkBasedWAFSingleV3(), "ecl_sss_approval_request_v1": resourceSSSApprovalRequestV1(), "ecl_sss_tenant_v1": resourceSSSTenantV1(), "ecl_sss_user_v1": resourceSSSUserV1(), diff --git a/ecl/resource_ecl_baremetal_keypair_v2.go b/ecl/resource_ecl_baremetal_keypair_v2.go index a2d316e6..9fafe2df 100644 --- a/ecl/resource_ecl_baremetal_keypair_v2.go +++ b/ecl/resource_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 resourceBaremetalKeypairV2() *schema.Resource { diff --git a/ecl/resource_ecl_baremetal_keypair_v2_test.go b/ecl/resource_ecl_baremetal_keypair_v2_test.go index 3ec01c62..6d11f0e5 100644 --- a/ecl/resource_ecl_baremetal_keypair_v2_test.go +++ b/ecl/resource_ecl_baremetal_keypair_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/baremetal/v2/keypairs" + "github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs" ) func TestAccBaremetalV2Keypair_basic(t *testing.T) { diff --git a/ecl/resource_ecl_baremetal_server_v2.go b/ecl/resource_ecl_baremetal_server_v2.go index ee29e6bb..2c5aa25c 100644 --- a/ecl/resource_ecl_baremetal_server_v2.go +++ b/ecl/resource_ecl_baremetal_server_v2.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors" - "github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/images" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors" + "github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/images" ) func resourceBaremetalServerV2() *schema.Resource { diff --git a/ecl/resource_ecl_baremetal_server_v2_mock_test.go b/ecl/resource_ecl_baremetal_server_v2_mock_test.go index a967edc4..33d2f6a8 100644 --- a/ecl/resource_ecl_baremetal_server_v2_mock_test.go +++ b/ecl/resource_ecl_baremetal_server_v2_mock_test.go @@ -8,7 +8,7 @@ import ( "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" - "github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers" ) func TestMockedBaremetalV2Server_basic(t *testing.T) { diff --git a/ecl/resource_ecl_baremetal_server_v2_test.go b/ecl/resource_ecl_baremetal_server_v2_test.go index 590e3a6d..c2c3f81a 100644 --- a/ecl/resource_ecl_baremetal_server_v2_test.go +++ b/ecl/resource_ecl_baremetal_server_v2_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers" ) func TestAccBaremetalV2Server_basic(t *testing.T) { diff --git a/ecl/resource_ecl_compute_instance_v2.go b/ecl/resource_ecl_compute_instance_v2.go index 68d97369..28fbfd30 100644 --- a/ecl/resource_ecl_compute_instance_v2.go +++ b/ecl/resource_ecl_compute_instance_v2.go @@ -13,16 +13,16 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/images" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers" - "github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/images" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes" ) func resourceComputeInstanceV2() *schema.Resource { diff --git a/ecl/resource_ecl_compute_instance_v2_test.go b/ecl/resource_ecl_compute_instance_v2_test.go index 68b88ab8..d5b5cae5 100644 --- a/ecl/resource_ecl_compute_instance_v2_test.go +++ b/ecl/resource_ecl_compute_instance_v2_test.go @@ -11,13 +11,13 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers" - "github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/ports" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/ports" + "github.com/nttcom/eclcloud/v3/pagination" ) func TestAccComputeV2Instance_basic(t *testing.T) { diff --git a/ecl/resource_ecl_compute_keypair_v2.go b/ecl/resource_ecl_compute_keypair_v2.go index 3710f697..319c7d4a 100644 --- a/ecl/resource_ecl_compute_keypair_v2.go +++ b/ecl/resource_ecl_compute_keypair_v2.go @@ -5,7 +5,7 @@ import ( "log" "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 resourceComputeKeypairV2() *schema.Resource { diff --git a/ecl/resource_ecl_compute_keypair_v2_test.go b/ecl/resource_ecl_compute_keypair_v2_test.go index 01fdaba4..c13164fa 100644 --- a/ecl/resource_ecl_compute_keypair_v2_test.go +++ b/ecl/resource_ecl_compute_keypair_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/compute/v2/extensions/keypairs" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs" ) func TestAccComputeV2Keypair_basic(t *testing.T) { diff --git a/ecl/resource_ecl_compute_volume_attach_v2.go b/ecl/resource_ecl_compute_volume_attach_v2.go index 7fc44cc5..91aa0980 100644 --- a/ecl/resource_ecl_compute_volume_attach_v2.go +++ b/ecl/resource_ecl_compute_volume_attach_v2.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/ecl/resource_ecl_compute_volume_attach_v2_mock_test.go b/ecl/resource_ecl_compute_volume_attach_v2_mock_test.go index ce983c27..3375d4d7 100644 --- a/ecl/resource_ecl_compute_volume_attach_v2_mock_test.go +++ b/ecl/resource_ecl_compute_volume_attach_v2_mock_test.go @@ -8,7 +8,7 @@ import ( "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" - "github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes" + "github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes" ) func TestMockedVolumeV2Attach_basic(t *testing.T) { diff --git a/ecl/resource_ecl_compute_volume_attach_v2_test.go b/ecl/resource_ecl_compute_volume_attach_v2_test.go index 6e130565..e1352daf 100644 --- a/ecl/resource_ecl_compute_volume_attach_v2_test.go +++ b/ecl/resource_ecl_compute_volume_attach_v2_test.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers" - "github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes" ) func TestAccComputeVolumeV2Attach_basic(t *testing.T) { diff --git a/ecl/resource_ecl_compute_volume_v2.go b/ecl/resource_ecl_compute_volume_v2.go index 0b90b74e..2795a790 100644 --- a/ecl/resource_ecl_compute_volume_v2.go +++ b/ecl/resource_ecl_compute_volume_v2.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/images" - "github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/images" + "github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes" ) func resourceComputeVolumeV2() *schema.Resource { diff --git a/ecl/resource_ecl_compute_volume_v2_test.go b/ecl/resource_ecl_compute_volume_v2_test.go index e547a1a4..2df7a13f 100644 --- a/ecl/resource_ecl_compute_volume_v2_test.go +++ b/ecl/resource_ecl_compute_volume_v2_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes" ) func TestAccComputeVolumeV2Volume_basic(t *testing.T) { diff --git a/ecl/resource_ecl_dedicated_hypervisor_license_v1.go b/ecl/resource_ecl_dedicated_hypervisor_license_v1.go index 664f8b33..713b89dc 100644 --- a/ecl/resource_ecl_dedicated_hypervisor_license_v1.go +++ b/ecl/resource_ecl_dedicated_hypervisor_license_v1.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses" ) var licenseNotFoundError = errors.New("license not found") diff --git a/ecl/resource_ecl_dedicated_hypervisor_license_v1_test.go b/ecl/resource_ecl_dedicated_hypervisor_license_v1_test.go index 837d0a32..9465ce5c 100644 --- a/ecl/resource_ecl_dedicated_hypervisor_license_v1_test.go +++ b/ecl/resource_ecl_dedicated_hypervisor_license_v1_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses" + "github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/ecl/resource_ecl_dedicated_hypervisor_server_v1.go b/ecl/resource_ecl_dedicated_hypervisor_server_v1.go index 0b5ea61e..0a3de8e6 100644 --- a/ecl/resource_ecl_dedicated_hypervisor_server_v1.go +++ b/ecl/resource_ecl_dedicated_hypervisor_server_v1.go @@ -7,11 +7,11 @@ import ( "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "github.com/hashicorp/terraform/helper/resource" - "github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers" + "github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/ecl/resource_ecl_dedicated_hypervisor_server_v1_mock_test.go b/ecl/resource_ecl_dedicated_hypervisor_server_v1_mock_test.go index 7196ed05..7e27de6e 100644 --- a/ecl/resource_ecl_dedicated_hypervisor_server_v1_mock_test.go +++ b/ecl/resource_ecl_dedicated_hypervisor_server_v1_mock_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers" + "github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers" "github.com/hashicorp/terraform/helper/resource" diff --git a/ecl/resource_ecl_dedicated_hypervisor_server_v1_test.go b/ecl/resource_ecl_dedicated_hypervisor_server_v1_test.go index 51fe7fb0..7863ea58 100644 --- a/ecl/resource_ecl_dedicated_hypervisor_server_v1_test.go +++ b/ecl/resource_ecl_dedicated_hypervisor_server_v1_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" - "github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers" + "github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/ecl/resource_ecl_dns_recordset_v2.go b/ecl/resource_ecl_dns_recordset_v2.go index 47545420..f4515331 100644 --- a/ecl/resource_ecl_dns_recordset_v2.go +++ b/ecl/resource_ecl_dns_recordset_v2.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" diff --git a/ecl/resource_ecl_dns_recordset_v2_test.go b/ecl/resource_ecl_dns_recordset_v2_test.go index 6553f434..2b73a49b 100644 --- a/ecl/resource_ecl_dns_recordset_v2_test.go +++ b/ecl/resource_ecl_dns_recordset_v2_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets" + "github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets" ) func randomZoneName() string { diff --git a/ecl/resource_ecl_dns_zone_v2.go b/ecl/resource_ecl_dns_zone_v2.go index 08b34419..dbdd6a2e 100644 --- a/ecl/resource_ecl_dns_zone_v2.go +++ b/ecl/resource_ecl_dns_zone_v2.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/ecl/resource_ecl_dns_zone_v2_test.go b/ecl/resource_ecl_dns_zone_v2_test.go index 0a2fdb26..e6cbe8c4 100644 --- a/ecl/resource_ecl_dns_zone_v2_test.go +++ b/ecl/resource_ecl_dns_zone_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/dns/v2/zones" + "github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones" ) func TestAccDNSV2Zone_basic(t *testing.T) { diff --git a/ecl/resource_ecl_imagestorages_image_v2.go b/ecl/resource_ecl_imagestorages_image_v2.go index b77cd75a..58ef5595 100644 --- a/ecl/resource_ecl_imagestorages_image_v2.go +++ b/ecl/resource_ecl_imagestorages_image_v2.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata" - "github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata" + "github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/ecl/resource_ecl_imagestorages_image_v2_test.go b/ecl/resource_ecl_imagestorages_image_v2_test.go index 6119e56f..e335f41d 100644 --- a/ecl/resource_ecl_imagestorages_image_v2_test.go +++ b/ecl/resource_ecl_imagestorages_image_v2_test.go @@ -9,7 +9,7 @@ import ( "net/http" "os" - "github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images" + "github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/ecl/resource_ecl_imagestorages_member_v2.go b/ecl/resource_ecl_imagestorages_member_v2.go index 00d5f643..476a6eb3 100644 --- a/ecl/resource_ecl_imagestorages_member_v2.go +++ b/ecl/resource_ecl_imagestorages_member_v2.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/ecl/resource_ecl_imagestorages_member_v2_test.go b/ecl/resource_ecl_imagestorages_member_v2_test.go index b087774a..74c440c0 100644 --- a/ecl/resource_ecl_imagestorages_member_v2_test.go +++ b/ecl/resource_ecl_imagestorages_member_v2_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members" + "github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/ecl/resource_ecl_network_common_function_gateway_v2.go b/ecl/resource_ecl_network_common_function_gateway_v2.go index 8706061b..480ca6d5 100644 --- a/ecl/resource_ecl_network_common_function_gateway_v2.go +++ b/ecl/resource_ecl_network_common_function_gateway_v2.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/ecl/resource_ecl_network_common_function_gateway_v2_test.go b/ecl/resource_ecl_network_common_function_gateway_v2_test.go index d20efa86..b4613703 100644 --- a/ecl/resource_ecl_network_common_function_gateway_v2_test.go +++ b/ecl/resource_ecl_network_common_function_gateway_v2_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways" ) func TestAccNetworkV2CommonFunctionGateway_basic(t *testing.T) { diff --git a/ecl/resource_ecl_network_gateway_interface_v2.go b/ecl/resource_ecl_network_gateway_interface_v2.go index 0554cb9e..6c8b3cf2 100644 --- a/ecl/resource_ecl_network_gateway_interface_v2.go +++ b/ecl/resource_ecl_network_gateway_interface_v2.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces" ) func resourceNetworkGatewayInterfaceV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_gateway_interface_v2_test.go b/ecl/resource_ecl_network_gateway_interface_v2_test.go index 2a3302d8..71da67d6 100644 --- a/ecl/resource_ecl_network_gateway_interface_v2_test.go +++ b/ecl/resource_ecl_network_gateway_interface_v2_test.go @@ -7,12 +7,12 @@ import ( "github.com/hashicorp/terraform/helper/acctest" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces" ) func TestAccNetworkV2GatewayInterface_internet(t *testing.T) { diff --git a/ecl/resource_ecl_network_internet_gateway_v2.go b/ecl/resource_ecl_network_internet_gateway_v2.go index 3bd7e5a8..722e6212 100644 --- a/ecl/resource_ecl_network_internet_gateway_v2.go +++ b/ecl/resource_ecl_network_internet_gateway_v2.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways" ) func resourceNetworkInternetGatewayV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_internet_gateway_v2_mock_test.go b/ecl/resource_ecl_network_internet_gateway_v2_mock_test.go index 9c37f48e..52a86b6c 100644 --- a/ecl/resource_ecl_network_internet_gateway_v2_mock_test.go +++ b/ecl/resource_ecl_network_internet_gateway_v2_mock_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways" ) func TestMockedAccNetworkV2InternetGateway_basic(t *testing.T) { diff --git a/ecl/resource_ecl_network_internet_gateway_v2_test.go b/ecl/resource_ecl_network_internet_gateway_v2_test.go index c70dd875..ac4602f0 100644 --- a/ecl/resource_ecl_network_internet_gateway_v2_test.go +++ b/ecl/resource_ecl_network_internet_gateway_v2_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways" ) func TestAccNetworkV2InternetGateway_basic(t *testing.T) { diff --git a/ecl/resource_ecl_network_load_balancer_v2.go b/ecl/resource_ecl_network_load_balancer_v2.go index 7e3b9844..48870dd6 100644 --- a/ecl/resource_ecl_network_load_balancer_v2.go +++ b/ecl/resource_ecl_network_load_balancer_v2.go @@ -6,11 +6,11 @@ import ( "log" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/ecl/resource_ecl_network_load_balancer_v2_test.go b/ecl/resource_ecl_network_load_balancer_v2_test.go index 6184caae..6263055d 100644 --- a/ecl/resource_ecl_network_load_balancer_v2_test.go +++ b/ecl/resource_ecl_network_load_balancer_v2_test.go @@ -4,12 +4,12 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers" - "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/load_balancer_interfaces" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/ecl/resource_ecl_network_network_v2.go b/ecl/resource_ecl_network_network_v2.go index a5bdb0d5..cac1b323 100644 --- a/ecl/resource_ecl_network_network_v2.go +++ b/ecl/resource_ecl_network_network_v2.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" ) func resourceNetworkNetworkV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_network_v2_test.go b/ecl/resource_ecl_network_network_v2_test.go index 3b862b18..cf1e027e 100644 --- a/ecl/resource_ecl_network_network_v2_test.go +++ b/ecl/resource_ecl_network_network_v2_test.go @@ -7,10 +7,10 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "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/v2/ecl/network/v2/subnets" + "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" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" ) func TestAccNetworkV2Network_basic(t *testing.T) { diff --git a/ecl/resource_ecl_network_port_v2.go b/ecl/resource_ecl_network_port_v2.go index 52d1a760..88361e3a 100644 --- a/ecl/resource_ecl_network_port_v2.go +++ b/ecl/resource_ecl_network_port_v2.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/ports" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/ports" ) func resourceNetworkPortV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_port_v2_test.go b/ecl/resource_ecl_network_port_v2_test.go index 860a25dd..40e966f7 100644 --- a/ecl/resource_ecl_network_port_v2_test.go +++ b/ecl/resource_ecl_network_port_v2_test.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/ports" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/ports" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" ) func TestAccNetworkV2Port_basic(t *testing.T) { diff --git a/ecl/resource_ecl_network_public_ip_v2.go b/ecl/resource_ecl_network_public_ip_v2.go index aa9cae6e..7bbce961 100644 --- a/ecl/resource_ecl_network_public_ip_v2.go +++ b/ecl/resource_ecl_network_public_ip_v2.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips" ) func resourceNetworkPublicIPV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_public_ip_v2_test.go b/ecl/resource_ecl_network_public_ip_v2_test.go index 1ecf4c5e..8c08b330 100644 --- a/ecl/resource_ecl_network_public_ip_v2_test.go +++ b/ecl/resource_ecl_network_public_ip_v2_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips" ) func TestAccNetworkV2PublicIP_basic(t *testing.T) { diff --git a/ecl/resource_ecl_network_static_route_v2.go b/ecl/resource_ecl_network_static_route_v2.go index 916b7aef..ddfcfda6 100644 --- a/ecl/resource_ecl_network_static_route_v2.go +++ b/ecl/resource_ecl_network_static_route_v2.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes" ) func resourceNetworkStaticRouteV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_static_route_v2_test.go b/ecl/resource_ecl_network_static_route_v2_test.go index f77db045..e28784c2 100644 --- a/ecl/resource_ecl_network_static_route_v2_test.go +++ b/ecl/resource_ecl_network_static_route_v2_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes" ) func TestAccNetworkV2StaticRoute_internet(t *testing.T) { diff --git a/ecl/resource_ecl_network_subnet_v2.go b/ecl/resource_ecl_network_subnet_v2.go index 0f3a5aa1..7446fb8e 100644 --- a/ecl/resource_ecl_network_subnet_v2.go +++ b/ecl/resource_ecl_network_subnet_v2.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" ) func resourceNetworkSubnetV2() *schema.Resource { diff --git a/ecl/resource_ecl_network_subnet_v2_test.go b/ecl/resource_ecl_network_subnet_v2_test.go index 71f22c05..3404bffb 100644 --- a/ecl/resource_ecl_network_subnet_v2_test.go +++ b/ecl/resource_ecl_network_subnet_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/subnets" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" ) func TestAccNetworkV2Subnet_basic(t *testing.T) { diff --git a/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2.go b/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2.go index 1fdb1c7b..26f8c80d 100644 --- a/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2.go +++ b/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests" - "github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests" + "github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests" ) func resourceProviderConnectivityTenantConnectionRequestV2() *schema.Resource { diff --git a/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2_test.go b/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2_test.go index 85e43980..c4e4a5d0 100644 --- a/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2_test.go +++ b/ecl/resource_ecl_provider_connectivity_tenant_connection_request_v2_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests" ) func TestAccProviderConnectivityV2TenantConnectionRequest_basic(t *testing.T) { diff --git a/ecl/resource_ecl_provider_connectivity_tenant_connection_v2.go b/ecl/resource_ecl_provider_connectivity_tenant_connection_v2.go index 4e54869e..97933aa2 100644 --- a/ecl/resource_ecl_provider_connectivity_tenant_connection_v2.go +++ b/ecl/resource_ecl_provider_connectivity_tenant_connection_v2.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections" ) func resourceProviderConnectivityTenantConnectionV2() *schema.Resource { diff --git a/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_mock_test.go b/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_mock_test.go index cc9136c1..8e570ea4 100644 --- a/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_mock_test.go +++ b/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_mock_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections" + "github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" diff --git a/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_test.go b/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_test.go index 9067c3fe..c6228b92 100644 --- a/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_test.go +++ b/ecl/resource_ecl_provider_connectivity_tenant_connection_v2_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections" ) func TestAccProviderConnectivityV2TenantConnection_basic(t *testing.T) { diff --git a/ecl/resource_ecl_rca_user_v1.go b/ecl/resource_ecl_rca_user_v1.go index c748b6f4..a4820156 100644 --- a/ecl/resource_ecl_rca_user_v1.go +++ b/ecl/resource_ecl_rca_user_v1.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2/ecl/rca/v1/users" + "github.com/nttcom/eclcloud/v3/ecl/rca/v1/users" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/ecl/resource_ecl_rca_user_v1_test.go b/ecl/resource_ecl_rca_user_v1_test.go index b89de86a..a37d09ea 100644 --- a/ecl/resource_ecl_rca_user_v1_test.go +++ b/ecl/resource_ecl_rca_user_v1_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" - "github.com/nttcom/eclcloud/v2/ecl/rca/v1/users" + "github.com/nttcom/eclcloud/v3/ecl/rca/v1/users" "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" diff --git a/ecl/resource_ecl_security_host_based_v2.go b/ecl/resource_ecl_security_host_based_v3.go similarity index 87% rename from ecl/resource_ecl_security_host_based_v2.go rename to ecl/resource_ecl_security_host_based_v3.go index ef06e5d0..69e12137 100644 --- a/ecl/resource_ecl_security_host_based_v2.go +++ b/ecl/resource_ecl_security_host_based_v3.go @@ -9,19 +9,19 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based" - "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status" + "github.com/nttcom/eclcloud/v3" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based" + "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status" ) const securityHostBasedPollInterval = 20 * time.Second -func resourceSecurityHostBasedV2() *schema.Resource { +func resourceSecurityHostBasedV3() *schema.Resource { return &schema.Resource{ - Create: resourceSecurityHostBasedV2Create, - Read: resourceSecurityHostBasedV2Read, - Update: resourceSecurityHostBasedV2Update, - Delete: resourceSecurityHostBasedV2Delete, + Create: resourceSecurityHostBasedV3Create, + Read: resourceSecurityHostBasedV3Read, + Update: resourceSecurityHostBasedV3Update, + Delete: resourceSecurityHostBasedV3Delete, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(1 * time.Hour), @@ -89,9 +89,9 @@ func resourceSecurityHostBasedV2() *schema.Resource { } } -func resourceSecurityHostBasedV2Create(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityHostBasedV3Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -139,13 +139,13 @@ func resourceSecurityHostBasedV2Create(d *schema.ResourceData, meta interface{}) d.SetId("HOSTBASEDSECURITY") - return resourceSecurityHostBasedV2Read(d, meta) + return resourceSecurityHostBasedV3Read(d, meta) } -func resourceSecurityHostBasedV2Read(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityHostBasedV3Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -167,9 +167,9 @@ func resourceSecurityHostBasedV2Read(d *schema.ResourceData, meta interface{}) e return nil } -func resourceSecurityHostBasedV2UpdateServiceOrderService(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityHostBasedV3UpdateServiceOrderService(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -213,9 +213,9 @@ func resourceSecurityHostBasedV2UpdateServiceOrderService(d *schema.ResourceData return nil } -func resourceSecurityHostBasedV2UpdateMaxAgentValue(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityHostBasedV3UpdateMaxAgentValue(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -259,22 +259,22 @@ func resourceSecurityHostBasedV2UpdateMaxAgentValue(d *schema.ResourceData, meta return nil } -func resourceSecurityHostBasedV2Update(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityHostBasedV3Update(d *schema.ResourceData, meta interface{}) error { if d.HasChange("service_order_service") { - resourceSecurityHostBasedV2UpdateServiceOrderService(d, meta) + resourceSecurityHostBasedV3UpdateServiceOrderService(d, meta) } if d.HasChange("max_agent_value") { - resourceSecurityHostBasedV2UpdateMaxAgentValue(d, meta) + resourceSecurityHostBasedV3UpdateMaxAgentValue(d, meta) } - return resourceSecurityHostBasedV2Read(d, meta) + return resourceSecurityHostBasedV3Read(d, meta) } -func resourceSecurityHostBasedV2Delete(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityHostBasedV3Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } diff --git a/ecl/resource_ecl_security_host_based_v2_mock_test.go b/ecl/resource_ecl_security_host_based_v3_mock_test.go similarity index 74% rename from ecl/resource_ecl_security_host_based_v2_mock_test.go rename to ecl/resource_ecl_security_host_based_v3_mock_test.go index e174fb2a..65af4a78 100644 --- a/ecl/resource_ecl_security_host_based_v2_mock_test.go +++ b/ecl/resource_ecl_security_host_based_v3_mock_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" ) @@ -16,7 +16,7 @@ const SoIDOfUpdateM1HostBased = "FGHA_809F858574E94699952D0D7E7C58C81C" const SoIDOfUpdateM2HostBased = "FGHA_809F858574E94699952D0D7E7C58C81C" const SoIDOfDeleteHostBased = "FGHA_F2349100C7D24EF3ACD6B9A9F91FD220" -func TestMockedAccSecurityV2HostBased_basic(t *testing.T) { +func TestMockedAccSecurityV3HostBased_basic(t *testing.T) { var hs security.HostBasedSecurity mc := mock.NewMockController() @@ -25,105 +25,105 @@ func TestMockedAccSecurityV2HostBased_basic(t *testing.T) { postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV2HostBasedCreate) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetProcessingAfterCreate) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetCompleteActiveAfterCreate) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV2HostBasedGetAfterCreate) + mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV3HostBasedCreate) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetProcessingAfterCreate) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetCompleteActiveAfterCreate) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV3HostBasedGetAfterCreate) - mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV2HostBasedUpdateM1) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetProcessingAfterUpdateM1) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetCompleteActiveAfterUpdateM1) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV2HostBasedGetAfterUpdatedM1) + mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV3HostBasedUpdateM1) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetProcessingAfterUpdateM1) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetCompleteActiveAfterUpdateM1) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV3HostBasedGetAfterUpdatedM1) - mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV2HostBasedUpdateM2) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetProcessingAfterUpdateM2) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetCompleteActiveAfterUpdateM2) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV2HostBasedGetAfterUpdatedM2) + mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV3HostBasedUpdateM2) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetProcessingAfterUpdateM2) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetCompleteActiveAfterUpdateM2) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV3HostBasedGetAfterUpdatedM2) - mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV2HostBasedDelete) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedProcessingAfterDelete) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV2HostBasedGetDeleteComplete) - mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV2HostBasedGetAfterDeleted) + mc.Register(t, "host_based", "/API/SoEntryHBS", testMockSecurityV3HostBasedDelete) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedProcessingAfterDelete) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderProgressRate", testMockSecurityV3HostBasedGetDeleteComplete) + mc.Register(t, "host_based", "/API/ScreenEventHBSOrderInfoGet", testMockSecurityV3HostBasedGetAfterDeleted) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2HostBasedDestroy, + CheckDestroy: testAccCheckSecurityV3HostBasedDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2HostBasedBasic, + Config: testMockedAccSecurityV3HostBasedBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Anti-Virus"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "1"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2HostBasedUpdateM1, + Config: testMockedAccSecurityV3HostBasedUpdateM1, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Virtual Patch"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "1"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2HostBasedUpdateM2, + Config: testMockedAccSecurityV3HostBasedUpdateM2, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Virtual Patch"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "2"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, @@ -131,8 +131,8 @@ func TestMockedAccSecurityV2HostBased_basic(t *testing.T) { }) } -var testMockedAccSecurityV2HostBasedBasic = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testMockedAccSecurityV3HostBasedBasic = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service = "Managed Anti-Virus" @@ -143,8 +143,8 @@ resource "ecl_security_host_based_v2" "host_1" { } `, OS_TENANT_ID) -var testMockedAccSecurityV2HostBasedUpdateM1 = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testMockedAccSecurityV3HostBasedUpdateM1 = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service = "Managed Virtual Patch" @@ -155,8 +155,8 @@ resource "ecl_security_host_based_v2" "host_1" { } `, OS_TENANT_ID) -var testMockedAccSecurityV2HostBasedUpdateM2 = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testMockedAccSecurityV3HostBasedUpdateM2 = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service ="Managed Virtual Patch" @@ -167,7 +167,7 @@ resource "ecl_security_host_based_v2" "host_1" { } `, OS_TENANT_ID) -var testMockSecurityV2HostBasedCreate = fmt.Sprintf(` +var testMockSecurityV3HostBasedCreate = fmt.Sprintf(` request: method: POST response: @@ -186,7 +186,7 @@ newStatus: Creating SoIDOfCreateHostBased, ) -var testMockSecurityV2HostBasedGetProcessingAfterCreate = ` +var testMockSecurityV3HostBasedGetProcessingAfterCreate = ` request: method: GET response: @@ -204,7 +204,7 @@ counter: max: 3 ` -var testMockSecurityV2HostBasedGetCompleteActiveAfterCreate = ` +var testMockSecurityV3HostBasedGetCompleteActiveAfterCreate = ` request: method: GET response: @@ -223,7 +223,7 @@ counter: min: 4 ` -var testMockSecurityV2HostBasedGetAfterCreate = fmt.Sprintf(` +var testMockSecurityV3HostBasedGetAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -248,7 +248,7 @@ expectedStatus: - Created `) -var testMockSecurityV2HostBasedGetAfterUpdatedM1 = fmt.Sprintf(` +var testMockSecurityV3HostBasedGetAfterUpdatedM1 = fmt.Sprintf(` request: method: GET response: @@ -273,7 +273,7 @@ expectedStatus: - UpdatedM1 `) -var testMockSecurityV2HostBasedGetAfterUpdatedM2 = fmt.Sprintf(` +var testMockSecurityV3HostBasedGetAfterUpdatedM2 = fmt.Sprintf(` request: method: GET response: @@ -298,7 +298,7 @@ expectedStatus: - UpdatedM2 `) -var testMockSecurityV2HostBasedGetAfterDeleted = fmt.Sprintf(` +var testMockSecurityV3HostBasedGetAfterDeleted = fmt.Sprintf(` request: method: GET response: @@ -323,7 +323,7 @@ expectedStatus: - Deleted `) -var testMockSecurityV2HostBasedUpdateM1 = fmt.Sprintf(` +var testMockSecurityV3HostBasedUpdateM1 = fmt.Sprintf(` request: method: POST response: @@ -342,7 +342,7 @@ newStatus: UpdatingM1 SoIDOfUpdateM1HostBased, ) -var testMockSecurityV2HostBasedGetProcessingAfterUpdateM1 = ` +var testMockSecurityV3HostBasedGetProcessingAfterUpdateM1 = ` request: method: GET response: @@ -360,7 +360,7 @@ counter: max: 3 ` -var testMockSecurityV2HostBasedGetCompleteActiveAfterUpdateM1 = ` +var testMockSecurityV3HostBasedGetCompleteActiveAfterUpdateM1 = ` request: method: GET response: @@ -379,7 +379,7 @@ counter: min: 4 ` -var testMockSecurityV2HostBasedUpdateM2 = fmt.Sprintf(` +var testMockSecurityV3HostBasedUpdateM2 = fmt.Sprintf(` request: method: POST response: @@ -398,7 +398,7 @@ newStatus: UpdatingM2 SoIDOfUpdateM2HostBased, ) -var testMockSecurityV2HostBasedGetProcessingAfterUpdateM2 = ` +var testMockSecurityV3HostBasedGetProcessingAfterUpdateM2 = ` request: method: GET response: @@ -416,7 +416,7 @@ counter: max: 3 ` -var testMockSecurityV2HostBasedGetCompleteActiveAfterUpdateM2 = ` +var testMockSecurityV3HostBasedGetCompleteActiveAfterUpdateM2 = ` request: method: GET response: @@ -435,7 +435,7 @@ counter: min: 4 ` -var testMockSecurityV2HostBasedDelete = fmt.Sprintf(` +var testMockSecurityV3HostBasedDelete = fmt.Sprintf(` request: method: POST response: @@ -456,7 +456,7 @@ newStatus: Deleted SoIDOfDeleteHostBased, ) -var testMockSecurityV2HostBasedProcessingAfterDelete = ` +var testMockSecurityV3HostBasedProcessingAfterDelete = ` request: method: GET response: @@ -474,7 +474,7 @@ counter: max: 3 ` -var testMockSecurityV2HostBasedGetDeleteComplete = ` +var testMockSecurityV3HostBasedGetDeleteComplete = ` request: method: GET response: diff --git a/ecl/resource_ecl_security_host_based_v2_test.go b/ecl/resource_ecl_security_host_based_v3_test.go similarity index 63% rename from ecl/resource_ecl_security_host_based_v2_test.go rename to ecl/resource_ecl_security_host_based_v3_test.go index 7d8019e6..aa6ccaa8 100644 --- a/ecl/resource_ecl_security_host_based_v2_test.go +++ b/ecl/resource_ecl_security_host_based_v3_test.go @@ -7,10 +7,10 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based" ) -func TestAccSecurityV2HostBased_basic(t *testing.T) { +func TestAccSecurityV3HostBased_basic(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -20,105 +20,105 @@ func TestAccSecurityV2HostBased_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2HostBasedDestroy, + CheckDestroy: testAccCheckSecurityV3HostBasedDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2HostBasedBasic, + Config: testAccSecurityV3HostBasedBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Anti-Virus"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "1"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, resource.TestStep{ - Config: testAccSecurityV2HostBasedUpdateM1, + Config: testAccSecurityV3HostBasedUpdateM1, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Virtual Patch"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "1"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, resource.TestStep{ - Config: testAccSecurityV2HostBasedUpdateM2, + Config: testAccSecurityV3HostBasedUpdateM2, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Virtual Patch"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "2"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, resource.TestStep{ - Config: testAccSecurityV2HostBasedUpdateM2Again, + Config: testAccSecurityV3HostBasedUpdateM2Again, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2HostBasedExists( - "ecl_security_host_based_v2.host_1", &hs), + testAccCheckSecurityV3HostBasedExists( + "ecl_security_host_based_v3.host_1", &hs), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "service_order_service", "Managed Virtual Patch"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "max_agent_value", "3"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "mail_address", "hoge@example.com"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "dsm_lang", "ja"), resource.TestCheckResourceAttr( - "ecl_security_host_based_v2.host_1", + "ecl_security_host_based_v3.host_1", "time_zone", "Asia/Tokyo"), ), }, @@ -126,7 +126,7 @@ func TestAccSecurityV2HostBased_basic(t *testing.T) { }) } -func testAccCheckSecurityV2HostBasedExists(n string, hs *security.HostBasedSecurity) resource.TestCheckFunc { +func testAccCheckSecurityV3HostBasedExists(n string, hs *security.HostBasedSecurity) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -138,7 +138,7 @@ func testAccCheckSecurityV2HostBasedExists(n string, hs *security.HostBasedSecur } config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL security client: %s", err) } @@ -161,15 +161,15 @@ func testAccCheckSecurityV2HostBasedExists(n string, hs *security.HostBasedSecur } } -func testAccCheckSecurityV2HostBasedDestroy(s *terraform.State) error { +func testAccCheckSecurityV3HostBasedDestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL network client: %s", err) } for _, rs := range s.RootModule().Resources { - if rs.Type != "ecl_security_host_based_v2" { + if rs.Type != "ecl_security_host_based_v3" { continue } @@ -189,8 +189,8 @@ func testAccCheckSecurityV2HostBasedDestroy(s *terraform.State) error { return nil } -var testAccSecurityV2HostBasedBasic = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testAccSecurityV3HostBasedBasic = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service = "Managed Anti-Virus" @@ -201,8 +201,8 @@ resource "ecl_security_host_based_v2" "host_1" { } `, OS_TENANT_ID) -var testAccSecurityV2HostBasedUpdateM1 = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testAccSecurityV3HostBasedUpdateM1 = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service = "Managed Virtual Patch" @@ -213,8 +213,8 @@ resource "ecl_security_host_based_v2" "host_1" { } `, OS_TENANT_ID) -var testAccSecurityV2HostBasedUpdateM2 = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testAccSecurityV3HostBasedUpdateM2 = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service = "Managed Virtual Patch" @@ -225,8 +225,8 @@ resource "ecl_security_host_based_v2" "host_1" { } `, OS_TENANT_ID) -var testAccSecurityV2HostBasedUpdateM2Again = fmt.Sprintf(` -resource "ecl_security_host_based_v2" "host_1" { +var testAccSecurityV3HostBasedUpdateM2Again = fmt.Sprintf(` +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "%s" locale = "ja" service_order_service = "Managed Virtual Patch" diff --git a/ecl/resource_ecl_security_network_based_device_ha_v2.go b/ecl/resource_ecl_security_network_based_device_ha_v3.go similarity index 89% rename from ecl/resource_ecl_security_network_based_device_ha_v2.go rename to ecl/resource_ecl_security_network_based_device_ha_v3.go index 9949dda6..e87b6b03 100644 --- a/ecl/resource_ecl_security_network_based_device_ha_v2.go +++ b/ecl/resource_ecl_security_network_based_device_ha_v3.go @@ -10,16 +10,16 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha" - "github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha" + "github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces" ) -func resourceSecurityNetworkBasedDeviceHAV2() *schema.Resource { +func resourceSecurityNetworkBasedDeviceHAV3() *schema.Resource { return &schema.Resource{ - Create: resourceSecurityNetworkBasedDeviceHAV2Create, - Read: resourceSecurityNetworkBasedDeviceHAV2Read, - Update: resourceSecurityNetworkBasedDeviceHAV2Update, - Delete: resourceSecurityNetworkBasedDeviceHAV2Delete, + Create: resourceSecurityNetworkBasedDeviceHAV3Create, + Read: resourceSecurityNetworkBasedDeviceHAV3Read, + Update: resourceSecurityNetworkBasedDeviceHAV3Update, + Delete: resourceSecurityNetworkBasedDeviceHAV3Delete, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(1 * time.Hour), @@ -35,9 +35,9 @@ func resourceSecurityNetworkBasedDeviceHAV2() *schema.Resource { } } -func resourceSecurityNetworkBasedDeviceHAV2Create(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceHAV3Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -122,13 +122,13 @@ func resourceSecurityNetworkBasedDeviceHAV2Create(d *schema.ResourceData, meta i id := getIDFromHostNames(ids) d.SetId(id) - return resourceSecurityNetworkBasedDeviceHAV2Read(d, meta) + return resourceSecurityNetworkBasedDeviceHAV3Read(d, meta) } -func resourceSecurityNetworkBasedDeviceHAV2Read(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceHAV3Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -196,7 +196,7 @@ func resourceSecurityNetworkBasedDeviceHAV2Read(d *schema.ResourceData, meta int d.Set("ha_link_2", haLink2Info) log.Printf("[DEBUG] Setting Port information into state.") - pClient, err := config.securityPortalV2Client(GetRegion(d, config)) + pClient, err := config.securityPortalV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security portal client: %s", err) } @@ -308,24 +308,24 @@ func resourceSecurityNetworkBasedDeviceHAV2Read(d *schema.ResourceData, meta int return nil } -func resourceSecurityNetworkBasedDeviceHAV2Update(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceHAV3Update(d *schema.ResourceData, meta interface{}) error { if d.HasChange("locale") || d.HasChange("operating_mode") || d.HasChange("license_kind") { log.Printf("[DEBUG] Start changing device by order api.") - resourceSecurityNetworkBasedDeviceHAV2UpdateOrderAPIPart(d, meta) + resourceSecurityNetworkBasedDeviceHAV3UpdateOrderAPIPart(d, meta) } if d.HasChange("port") { log.Printf("[DEBUG] Start changing device by portal api.") - resourceSecurityNetworkBasedDeviceHAV2UpdatePortalAPIPart(d, meta) + resourceSecurityNetworkBasedDeviceHAV3UpdatePortalAPIPart(d, meta) } - return resourceSecurityNetworkBasedDeviceHAV2Read(d, meta) + return resourceSecurityNetworkBasedDeviceHAV3Read(d, meta) } -func resourceSecurityNetworkBasedDeviceHAV2Delete(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceHAV3Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } diff --git a/ecl/resource_ecl_security_network_based_device_ha_v2_mock_test.go b/ecl/resource_ecl_security_network_based_device_ha_v3_mock_test.go similarity index 86% rename from ecl/resource_ecl_security_network_based_device_ha_v2_mock_test.go rename to ecl/resource_ecl_security_network_based_device_ha_v3_mock_test.go index 70105606..d20a348b 100644 --- a/ecl/resource_ecl_security_network_based_device_ha_v2_mock_test.go +++ b/ecl/resource_ecl_security_network_based_device_ha_v3_mock_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" ) @@ -21,7 +21,7 @@ const expectedNewHADeviceHostName1 = "CES12085" const expectedNewHADeviceUUID1 = "12768064-e7c9-44d1-b01d-e66f138a278e" const expectedNewHADeviceUUID2 = "12768064-e7c9-44d1-b01d-e66f138a278f" -func TestMockedAccSecurityV2NetworkBasedDeviceHA_basic(t *testing.T) { +func TestMockedAccSecurityV3NetworkBasedDeviceHA_basic(t *testing.T) { var hd1, hd2 security.HADevice mc := mock.NewMockController() @@ -31,74 +31,74 @@ func TestMockedAccSecurityV2NetworkBasedDeviceHA_basic(t *testing.T) { mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) // TODO - mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceHAListDevicesAfterCreate) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfaces) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfaces) - - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListBeforeCreate) - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHACreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterCreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterCreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterCreate) - - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHAUpdate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterUpdate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterUpdate) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterUpdate) - - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHADelete) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAProcessingAfterDelete) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetDeleteComplete) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterDelete) + mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceHAListDevicesAfterCreate) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfaces) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfaces) + + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListBeforeCreate) + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHACreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterCreate) + + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHAUpdate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterUpdate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterUpdate) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterUpdate) + + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHADelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAProcessingAfterDelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetDeleteComplete) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterDelete) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceHADestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceHADestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceHABasic, + Config: testMockedAccSecurityV3NetworkBasedDeviceHABasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "operating_mode", "FW_HA"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_1_az_group", OS_DEFAULT_ZONE), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_2_az_group", OS_COMPUTE_ZONE_HA), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceHAUpdate, + Config: testMockedAccSecurityV3NetworkBasedDeviceHAUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "locale", "en"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "operating_mode", "UTM_HA"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "license_kind", "08"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_1_az_group", OS_DEFAULT_ZONE), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_2_az_group", OS_COMPUTE_ZONE_HA), ), }, @@ -106,7 +106,7 @@ func TestMockedAccSecurityV2NetworkBasedDeviceHA_basic(t *testing.T) { }) } -func TestMockedAccSecurityV2NetworkBasedDeviceHAUpdateInterface(t *testing.T) { +func TestMockedAccSecurityV3NetworkBasedDeviceHAUpdateInterface(t *testing.T) { var hd1, hd2 security.HADevice mc := mock.NewMockController() @@ -115,93 +115,93 @@ func TestMockedAccSecurityV2NetworkBasedDeviceHAUpdateInterface(t *testing.T) { postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListBeforeCreate) - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHACreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterCreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterCreate) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterCreate) - mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceHAListDevicesAfterCreate) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesAfterCreate) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesAfterCreate) - - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/ports/utm/ha/%s", expectedNewHADeviceHostName1), testMockSecurityV2NetworkBasedDeviceHAUpdateInterface) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterfaceHA), testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterUpdateInterface) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterfaceHA), testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterUpdateInterface) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterInterfaceUpdate) - mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceHAListDevicesAfterUpdate) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesOfHost1AfterUpdate) - mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesOfHost2AfterUpdate) - - mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV2NetworkBasedDeviceHADelete) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAProcessingAfterDelete) - mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceHAGetDeleteComplete) - mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV2NetworkBasedDeviceHAListAfterDelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListBeforeCreate) + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHACreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterCreate) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterCreate) + mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceHAListDevicesAfterCreate) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesAfterCreate) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesAfterCreate) + + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/ports/utm/ha/%s", expectedNewHADeviceHostName1), testMockSecurityV3NetworkBasedDeviceHAUpdateInterface) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterfaceHA), testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterUpdateInterface) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterfaceHA), testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterUpdateInterface) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterInterfaceUpdate) + mc.Register(t, "ha_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceHAListDevicesAfterUpdate) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID1), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesOfHost1AfterUpdate) + mc.Register(t, "ha_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewHADeviceUUID2), testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesOfHost2AfterUpdate) + + mc.Register(t, "ha_device", "/API/SoEntryFGHA", testMockSecurityV3NetworkBasedDeviceHADelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAProcessingAfterDelete) + mc.Register(t, "ha_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceHAGetDeleteComplete) + mc.Register(t, "ha_device", "/API/ScreenEventFGHADeviceGet", testMockSecurityV3NetworkBasedDeviceHAListAfterDelete) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceHADestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceHADestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceHABasic, + Config: testMockedAccSecurityV3NetworkBasedDeviceHABasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceHAUpdateInterface, + Config: testMockedAccSecurityV3NetworkBasedDeviceHAUpdateInterface, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.vrrp_ip_address", "192.168.1.50"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.vrrp_ip_address", "192.168.1.50"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.network_id", "dummyNetwork-port1"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.network_id", "dummyNetwork-port1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.subnet_id", "dummySubnet-port1"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.subnet_id", "dummySubnet-port1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.mtu", "1500"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.comment", "port 0 comment"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.comment", "port 0 comment"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_1_ip_address", "10.0.0.1"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_1_ip_address", "10.0.0.1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_1_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_1_ip_address_prefix", "24"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_2_ip_address", "10.0.0.2"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_2_ip_address", "10.0.0.2"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_2_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_2_ip_address_prefix", "24"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.vrrp_ip_address", "192.168.1.51"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.vrrp_ip_address", "192.168.1.51"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.network_id", "dummyNetwork-port2"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.network_id", "dummyNetwork-port2"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.subnet_id", "dummySubnet-port2"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.subnet_id", "dummySubnet-port2"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.mtu", "1500"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.comment", "port 3 comment"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.comment", "port 3 comment"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_1_ip_address", "10.0.0.3"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_1_ip_address", "10.0.0.3"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_1_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_1_ip_address_prefix", "24"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_2_ip_address", "10.0.0.4"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_2_ip_address", "10.0.0.4"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_2_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_2_ip_address_prefix", "24"), ), }, }, }) } -var testMockedAccSecurityV2NetworkBasedDeviceHABasic = fmt.Sprintf(` -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +var testMockedAccSecurityV3NetworkBasedDeviceHABasic = fmt.Sprintf(` +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW_HA" @@ -230,8 +230,8 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { OS_COMPUTE_ZONE_HA, ) -var testMockedAccSecurityV2NetworkBasedDeviceHAUpdate = fmt.Sprintf(` -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +var testMockedAccSecurityV3NetworkBasedDeviceHAUpdate = fmt.Sprintf(` +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "en" operating_mode = "UTM_HA" @@ -259,9 +259,9 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { OS_COMPUTE_ZONE_HA, ) -var testMockedAccSecurityV2NetworkBasedDeviceHAUpdateInterface = fmt.Sprintf(` +var testMockedAccSecurityV3NetworkBasedDeviceHAUpdateInterface = fmt.Sprintf(` -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW_HA" @@ -353,7 +353,7 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfaces = ` +var testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfaces = ` request: method: GET response: @@ -367,7 +367,7 @@ expectedStatus: - Created ` -var testMockSecurityV2NetworkBasedDeviceHAListBeforeCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListBeforeCreate = fmt.Sprintf(` request: method: GET response: @@ -397,7 +397,7 @@ newStatus: PreCreate OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAListAfterCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -437,7 +437,7 @@ expectedStatus: OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAListDevicesAfterCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListDevicesAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -473,7 +473,7 @@ expectedStatus: OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAListDevicesAfterUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListDevicesAfterUpdate = fmt.Sprintf(` request: method: GET response: @@ -508,7 +508,7 @@ expectedStatus: OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesAfterCreate = ` +var testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesAfterCreate = ` request: method: GET response: @@ -523,7 +523,7 @@ expectedStatus: - Updated ` -var testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesOfHost1AfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesOfHost1AfterUpdate = ` request: method: GET response: @@ -577,7 +577,7 @@ expectedStatus: - InterfaceIsUpdated ` -var testMockSecurityV2NetworkBasedDeviceHAListDeviceInterfacesOfHost2AfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceHAListDeviceInterfacesOfHost2AfterUpdate = ` request: method: GET response: @@ -631,7 +631,7 @@ expectedStatus: - InterfaceIsUpdated ` -var testMockSecurityV2NetworkBasedDeviceHAListAfterDelete = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListAfterDelete = fmt.Sprintf(` request: method: GET response: @@ -660,7 +660,7 @@ expectedStatus: OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHACreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHACreate = fmt.Sprintf(` request: method: POST response: @@ -679,7 +679,7 @@ newStatus: Creating SoIDOfCreateHA, ) -var testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterCreate = ` +var testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterCreate = ` request: method: GET response: @@ -697,7 +697,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterCreate = ` +var testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterCreate = ` request: method: GET response: @@ -716,7 +716,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceHADelete = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHADelete = fmt.Sprintf(` request: method: POST response: @@ -737,7 +737,7 @@ newStatus: Deleted SoIDOfDeleteHA, ) -var testMockSecurityV2NetworkBasedDeviceHAProcessingAfterDelete = ` +var testMockSecurityV3NetworkBasedDeviceHAProcessingAfterDelete = ` request: method: GET response: @@ -755,7 +755,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceHAGetDeleteComplete = ` +var testMockSecurityV3NetworkBasedDeviceHAGetDeleteComplete = ` request: method: GET response: @@ -773,7 +773,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceHAUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAUpdate = fmt.Sprintf(` request: method: POST response: @@ -792,7 +792,7 @@ newStatus: Updating SoIDOfUpdateHA, ) -var testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterUpdate = ` request: method: GET response: @@ -810,7 +810,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterUpdate = ` request: method: GET response: @@ -829,7 +829,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceHAListAfterUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListAfterUpdate = fmt.Sprintf(` request: method: GET response: @@ -868,7 +868,7 @@ expectedStatus: OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAListAfterInterfaceUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListAfterInterfaceUpdate = fmt.Sprintf(` request: method: GET response: @@ -907,7 +907,7 @@ expectedStatus: OS_COMPUTE_ZONE_HA, ) -var testMockSecurityV2NetworkBasedDeviceHAUpdateInterface = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAUpdateInterface = fmt.Sprintf(` request: method: PUT response: @@ -924,7 +924,7 @@ newStatus: InterfaceIsUpdating ProcessIDOfUpdateInterfaceHA, ) -var testMockSecurityV2NetworkBasedDeviceHAGetProcessingAfterUpdateInterface = ` +var testMockSecurityV3NetworkBasedDeviceHAGetProcessingAfterUpdateInterface = ` request: method: GET response: @@ -1107,7 +1107,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceHAGetCompleteActiveAfterUpdateInterface = ` +var testMockSecurityV3NetworkBasedDeviceHAGetCompleteActiveAfterUpdateInterface = ` request: method: GET response: @@ -1291,7 +1291,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceHAListAfterUpdateInterface = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceHAListAfterUpdateInterface = fmt.Sprintf(` request: method: GET response: diff --git a/ecl/resource_ecl_security_network_based_device_ha_v2_test.go b/ecl/resource_ecl_security_network_based_device_ha_v3_test.go similarity index 68% rename from ecl/resource_ecl_security_network_based_device_ha_v2_test.go rename to ecl/resource_ecl_security_network_based_device_ha_v3_test.go index ce691e6f..cf6a43b2 100644 --- a/ecl/resource_ecl_security_network_based_device_ha_v2_test.go +++ b/ecl/resource_ecl_security_network_based_device_ha_v3_test.go @@ -8,12 +8,12 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha" ) -func TestAccSecurityV2NetworkBasedDeviceHA_basic(t *testing.T) { +func TestAccSecurityV3NetworkBasedDeviceHA_basic(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -23,49 +23,49 @@ func TestAccSecurityV2NetworkBasedDeviceHA_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceHABasic, + Config: testAccSecurityV3NetworkBasedDeviceHABasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "operating_mode", "FW_HA"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_1_az_group", OS_DEFAULT_ZONE), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_2_az_group", OS_COMPUTE_ZONE_HA), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceHAUpdate, + Config: testAccSecurityV3NetworkBasedDeviceHAUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "locale", "en"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "operating_mode", "UTM_HA"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "license_kind", "08"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_1_az_group", OS_DEFAULT_ZONE), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_2_az_group", OS_COMPUTE_ZONE_HA), ), }, @@ -73,7 +73,7 @@ func TestAccSecurityV2NetworkBasedDeviceHA_basic(t *testing.T) { }) } -func TestAccSecurityV2NetworkBasedDeviceHA_updateInterface(t *testing.T) { +func TestAccSecurityV3NetworkBasedDeviceHA_updateInterface(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -85,13 +85,13 @@ func TestAccSecurityV2NetworkBasedDeviceHA_updateInterface(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceHABasic, + Config: testAccSecurityV3NetworkBasedDeviceHABasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -100,54 +100,54 @@ func TestAccSecurityV2NetworkBasedDeviceHA_updateInterface(t *testing.T) { testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_2", &sn2), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "operating_mode", "FW_HA"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_1_az_group", OS_DEFAULT_ZONE), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "host_2_az_group", OS_COMPUTE_ZONE_HA), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_1.0.network_id", &n1.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_1.0.subnet_id", &sn1.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_1.0.host_1_ip_address", "192.168.1.3"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_1.0.host_2_ip_address", "192.168.1.4"), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_2.0.network_id", &n2.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_2.0.subnet_id", &sn2.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_2.0.host_1_ip_address", "192.168.2.3"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", + "ecl_security_network_based_device_ha_v3.ha_1", "ha_link_2.0.host_2_ip_address", "192.168.2.4"), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceHAIntrfaceUpdate, + Config: testAccSecurityV3NetworkBasedDeviceHAIntrfaceUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -161,50 +161,50 @@ func TestAccSecurityV2NetworkBasedDeviceHA_updateInterface(t *testing.T) { testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.user_subnet_2", &sn4), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.vrrp_ip_address", "10.0.0.50"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.vrrp_ip_address", "10.0.0.50"), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.network_id", &n3.ID), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.network_id", &n3.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.subnet_id", &sn3.ID), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.subnet_id", &sn3.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.mtu", "1500"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.comment", "port 0 comment"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.comment", "port 0 comment"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_1_ip_address", "10.0.0.51"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_1_ip_address", "10.0.0.51"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_1_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_1_ip_address_prefix", "24"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_2_ip_address", "10.0.0.52"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_2_ip_address", "10.0.0.52"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.host_2_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.host_2_ip_address_prefix", "24"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.vrrp_ip_address", "10.0.1.50"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.vrrp_ip_address", "10.0.1.50"), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.network_id", &n4.ID), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.network_id", &n4.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.subnet_id", &sn4.ID), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.subnet_id", &sn4.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.mtu", "1500"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.comment", "port 3 comment"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.comment", "port 3 comment"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_1_ip_address", "10.0.1.51"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_1_ip_address", "10.0.1.51"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_1_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_1_ip_address_prefix", "24"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_2_ip_address", "10.0.1.52"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_2_ip_address", "10.0.1.52"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.host_2_ip_address_prefix", "24"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.host_2_ip_address_prefix", "24"), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceHAIntrfaceDisconnect, + Config: testAccSecurityV3NetworkBasedDeviceHAIntrfaceDisconnect, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceHAExists( - "ecl_security_network_based_device_ha_v2.ha_1", &hd1, &hd2), + testAccCheckSecurityV3NetworkBasedDeviceHAExists( + "ecl_security_network_based_device_ha_v3.ha_1", &hd1, &hd2), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -218,32 +218,32 @@ func TestAccSecurityV2NetworkBasedDeviceHA_updateInterface(t *testing.T) { testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.user_subnet_2", &sn4), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.0.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.0.enable", "false"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.1.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.1.enable", "false"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.2.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.2.enable", "false"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.3.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.3.enable", "false"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.4.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.4.enable", "false"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.5.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.5.enable", "false"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_ha_v2.ha_1", "port.6.enable", "false"), + "ecl_security_network_based_device_ha_v3.ha_1", "port.6.enable", "false"), ), }, }, }) } -func testAccCheckSecurityV2NetworkBasedDeviceHAExists(n string, hd1, hd2 *security.HADevice) resource.TestCheckFunc { +func testAccCheckSecurityV3NetworkBasedDeviceHAExists(n string, hd1, hd2 *security.HADevice) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -255,7 +255,7 @@ func testAccCheckSecurityV2NetworkBasedDeviceHAExists(n string, hd1, hd2 *securi } config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL security client: %s", err) } @@ -287,15 +287,15 @@ func testAccCheckSecurityV2NetworkBasedDeviceHAExists(n string, hd1, hd2 *securi return nil } } -func testAccCheckSecurityV2NetworkBasedDeviceHADestroy(s *terraform.State) error { +func testAccCheckSecurityV3NetworkBasedDeviceHADestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL network client: %s", err) } for _, rs := range s.RootModule().Resources { - if rs.Type != "ecl_security_network_based_device_ha_v2" { + if rs.Type != "ecl_security_network_based_device_ha_v3" { continue } @@ -318,7 +318,7 @@ func testAccCheckSecurityV2NetworkBasedDeviceHADestroy(s *terraform.State) error return nil } -const testAccSecurityV2NetworkBasedDeviceHANetworkSubnet1 = ` +const testAccSecurityV3NetworkBasedDeviceHANetworkSubnet1 = ` resource "ecl_network_network_v2" "network_1" { name = "network_1_for_utm_ha" } @@ -330,7 +330,7 @@ resource "ecl_network_subnet_v2" "subnet_1" { no_gateway = "true" } ` -const testAccSecurityV2NetworkBasedDeviceHANetworkSubnet2 = ` +const testAccSecurityV3NetworkBasedDeviceHANetworkSubnet2 = ` resource "ecl_network_network_v2" "network_2" { name = "network_2_for_utm_ha" } @@ -343,7 +343,7 @@ resource "ecl_network_subnet_v2" "subnet_2" { } ` -const testAccSecurityV2NetworkBasedDeviceUserNetworkSubnet1 = ` +const testAccSecurityV3NetworkBasedDeviceUserNetworkSubnet1 = ` resource "ecl_network_network_v2" "user_network_1" { name = "network_1_for_utm_user" } @@ -359,7 +359,7 @@ resource "ecl_network_subnet_v2" "user_subnet_1" { } } ` -const testAccSecurityV2NetworkBasedDeviceUserNetworkSubnet2 = ` +const testAccSecurityV3NetworkBasedDeviceUserNetworkSubnet2 = ` resource "ecl_network_network_v2" "user_network_2" { name = "network_1_for_utm_user" } @@ -376,11 +376,11 @@ resource "ecl_network_subnet_v2" "user_subnet_2" { } ` -var testAccSecurityV2NetworkBasedDeviceHABasic = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedDeviceHABasic = fmt.Sprintf(` %s %s -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW_HA" @@ -405,18 +405,18 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { } `, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, OS_COMPUTE_ZONE_HA, ) -var testAccSecurityV2NetworkBasedDeviceHAUpdate = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedDeviceHAUpdate = fmt.Sprintf(` %s %s -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "en" operating_mode = "UTM_HA" @@ -441,20 +441,20 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { } `, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, OS_COMPUTE_ZONE_HA, ) -var testAccSecurityV2NetworkBasedDeviceHAIntrfaceUpdate = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedDeviceHAIntrfaceUpdate = fmt.Sprintf(` %s %s %s %s -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW_HA" @@ -540,22 +540,22 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { } } `, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet2, - testAccSecurityV2NetworkBasedDeviceUserNetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceUserNetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceUserNetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceUserNetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, OS_COMPUTE_ZONE_HA, ) -var testAccSecurityV2NetworkBasedDeviceHAIntrfaceDisconnect = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedDeviceHAIntrfaceDisconnect = fmt.Sprintf(` %s %s %s %s -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW_HA" @@ -607,10 +607,10 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { } } `, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceHANetworkSubnet2, - testAccSecurityV2NetworkBasedDeviceUserNetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceUserNetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceHANetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceUserNetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceUserNetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, OS_COMPUTE_ZONE_HA, diff --git a/ecl/resource_ecl_security_network_based_device_single_v2.go b/ecl/resource_ecl_security_network_based_device_single_v3.go similarity index 87% rename from ecl/resource_ecl_security_network_based_device_single_v2.go rename to ecl/resource_ecl_security_network_based_device_single_v3.go index a39dd9ec..25bcda77 100644 --- a/ecl/resource_ecl_security_network_based_device_single_v2.go +++ b/ecl/resource_ecl_security_network_based_device_single_v3.go @@ -10,16 +10,16 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single" - "github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single" + "github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces" ) -func resourceSecurityNetworkBasedDeviceSingleV2() *schema.Resource { +func resourceSecurityNetworkBasedDeviceSingleV3() *schema.Resource { return &schema.Resource{ - Create: resourceSecurityNetworkBasedDeviceSingleV2Create, - Read: resourceSecurityNetworkBasedDeviceSingleV2Read, - Update: resourceSecurityNetworkBasedDeviceSingleV2Update, - Delete: resourceSecurityNetworkBasedDeviceSingleV2Delete, + Create: resourceSecurityNetworkBasedDeviceSingleV3Create, + Read: resourceSecurityNetworkBasedDeviceSingleV3Read, + Update: resourceSecurityNetworkBasedDeviceSingleV3Update, + Delete: resourceSecurityNetworkBasedDeviceSingleV3Delete, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(1 * time.Hour), @@ -35,9 +35,9 @@ func resourceSecurityNetworkBasedDeviceSingleV2() *schema.Resource { } } -func resourceSecurityNetworkBasedDeviceSingleV2Create(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceSingleV3Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -123,13 +123,13 @@ func resourceSecurityNetworkBasedDeviceSingleV2Create(d *schema.ResourceData, me d.SetId(id) - return resourceSecurityNetworkBasedDeviceSingleV2Read(d, meta) + return resourceSecurityNetworkBasedDeviceSingleV3Read(d, meta) } -func resourceSecurityNetworkBasedDeviceSingleV2Read(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceSingleV3Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -161,7 +161,7 @@ func resourceSecurityNetworkBasedDeviceSingleV2Read(d *schema.ResourceData, meta d.Set("az_group", azGroup) // Device Interface Part - pClient, err := config.securityPortalV2Client(GetRegion(d, config)) + pClient, err := config.securityPortalV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security portal client: %s", err) } @@ -243,24 +243,24 @@ func resourceSecurityNetworkBasedDeviceSingleV2Read(d *schema.ResourceData, meta return nil } -func resourceSecurityNetworkBasedDeviceSingleV2Update(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceSingleV3Update(d *schema.ResourceData, meta interface{}) error { if d.HasChange("locale") || d.HasChange("operating_mode") || d.HasChange("license_kind") { log.Printf("[DEBUG] Start changing device by order api.") - resourceSecurityNetworkBasedDeviceSingleV2UpdateOrderAPIPart(d, meta) + resourceSecurityNetworkBasedDeviceSingleV3UpdateOrderAPIPart(d, meta) } if d.HasChange("port") { log.Printf("[DEBUG] Start changing device by portal api.") - resourceSecurityNetworkBasedDeviceSingleV2UpdatePortalAPIPart(d, meta) + resourceSecurityNetworkBasedDeviceSingleV3UpdatePortalAPIPart(d, meta) } - return resourceSecurityNetworkBasedDeviceSingleV2Read(d, meta) + return resourceSecurityNetworkBasedDeviceSingleV3Read(d, meta) } -func resourceSecurityNetworkBasedDeviceSingleV2Delete(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceSingleV3Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } diff --git a/ecl/resource_ecl_security_network_based_device_single_v2_mock_test.go b/ecl/resource_ecl_security_network_based_device_single_v3_mock_test.go similarity index 84% rename from ecl/resource_ecl_security_network_based_device_single_v2_mock_test.go rename to ecl/resource_ecl_security_network_based_device_single_v3_mock_test.go index a0e007a2..e3db601f 100644 --- a/ecl/resource_ecl_security_network_based_device_single_v2_mock_test.go +++ b/ecl/resource_ecl_security_network_based_device_single_v3_mock_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" ) @@ -20,7 +20,7 @@ const ProcessIDOfUpdateInterface = 85385 const expectedNewSingleDeviceHostName = "CES11811" const expectedNewSingleDeviceUUID = "12768064-e7c9-44d1-b01d-e66f138a278e" -func TestMockedAccSecurityV2NetworkBasedDeviceSingle_basic(t *testing.T) { +func TestMockedAccSecurityV3NetworkBasedDeviceSingle_basic(t *testing.T) { var sd security.SingleDevice mc := mock.NewMockController() @@ -29,67 +29,67 @@ func TestMockedAccSecurityV2NetworkBasedDeviceSingle_basic(t *testing.T) { postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceSingleListDevicesAfterCreate) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfaces) + mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceSingleListDevicesAfterCreate) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfaces) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListBeforeCreate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListBeforeCreate) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterCreate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleUpdate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterUpdate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterUpdate) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterUpdate) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleUpdate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterUpdate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterUpdate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterUpdate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleDelete) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleProcessingAfterDelete) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetDeleteComplete) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterDelete) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleDelete) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleProcessingAfterDelete) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetDeleteComplete) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterDelete) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceSingleBasic, + Config: testMockedAccSecurityV3NetworkBasedDeviceSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "operating_mode", "FW"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "az_group", OS_DEFAULT_ZONE), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceSingleUpdate, + Config: testMockedAccSecurityV3NetworkBasedDeviceSingleUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "locale", "en"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "operating_mode", "UTM"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "license_kind", "08"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "az_group", OS_DEFAULT_ZONE), ), }, @@ -97,7 +97,7 @@ func TestMockedAccSecurityV2NetworkBasedDeviceSingle_basic(t *testing.T) { }) } -func TestMockedAccSecurityV2NetworkBasedDeviceSingleUpdateInterface(t *testing.T) { +func TestMockedAccSecurityV3NetworkBasedDeviceSingleUpdateInterface(t *testing.T) { var sd security.SingleDevice mc := mock.NewMockController() @@ -106,75 +106,75 @@ func TestMockedAccSecurityV2NetworkBasedDeviceSingleUpdateInterface(t *testing.T postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListBeforeCreate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterCreate) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterCreate) - mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceSingleListDevicesAfterCreate) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfacesAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListBeforeCreate) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterCreate) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterCreate) + mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceSingleListDevicesAfterCreate) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfacesAfterCreate) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/ports/utm/%s", expectedNewSingleDeviceHostName), testMockSecurityV2NetworkBasedDeviceSingleUpdateInterface) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterUpdateInterface) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterUpdateInterface) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterInterfaceUpdate) - mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV2NetworkBasedDeviceSingleListDevicesAfterUpdate) - mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfacesAfterUpdate) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/ports/utm/%s", expectedNewSingleDeviceHostName), testMockSecurityV3NetworkBasedDeviceSingleUpdateInterface) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterUpdateInterface) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterUpdateInterface) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterInterfaceUpdate) + mc.Register(t, "single_device", "/ecl-api/devices", testMockSecurityV3NetworkBasedDeviceSingleListDevicesAfterUpdate) + mc.Register(t, "single_device", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfacesAfterUpdate) - mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV2NetworkBasedDeviceSingleDelete) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleProcessingAfterDelete) - mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV2NetworkBasedDeviceSingleGetDeleteComplete) - mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV2NetworkBasedDeviceSingleListAfterDelete) + mc.Register(t, "single_device", "/API/SoEntryFGS", testMockSecurityV3NetworkBasedDeviceSingleDelete) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleProcessingAfterDelete) + mc.Register(t, "single_device", "/API/ScreenEventFGSOrderProgressRate", testMockSecurityV3NetworkBasedDeviceSingleGetDeleteComplete) + mc.Register(t, "single_device", "/API/ScreenEventFGSDeviceGet", testMockSecurityV3NetworkBasedDeviceSingleListAfterDelete) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceSingleBasic, + Config: testMockedAccSecurityV3NetworkBasedDeviceSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedDeviceSingleUpdateInterface, + Config: testMockedAccSecurityV3NetworkBasedDeviceSingleUpdateInterface, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.ip_address", "192.168.1.50"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.ip_address", "192.168.1.50"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.network_id", "dummyNetwork1"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.network_id", "dummyNetwork1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.subnet_id", "dummySubnet1"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.subnet_id", "dummySubnet1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.mtu", "1500"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.comment", "port 0 comment"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.comment", "port 0 comment"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.ip_address", "192.168.2.50"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.ip_address", "192.168.2.50"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.network_id", "dummyNetwork2"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.network_id", "dummyNetwork2"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.subnet_id", "dummySubnet2"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.subnet_id", "dummySubnet2"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.mtu", "1500"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.comment", "port 3 comment"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.comment", "port 3 comment"), ), }, }, }) } -var testMockedAccSecurityV2NetworkBasedDeviceSingleBasic = fmt.Sprintf(` -resource "ecl_security_network_based_device_single_v2" "device_1" { +var testMockedAccSecurityV3NetworkBasedDeviceSingleBasic = fmt.Sprintf(` +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW" @@ -186,8 +186,8 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { OS_DEFAULT_ZONE, ) -var testMockedAccSecurityV2NetworkBasedDeviceSingleUpdate = fmt.Sprintf(` -resource "ecl_security_network_based_device_single_v2" "device_1" { +var testMockedAccSecurityV3NetworkBasedDeviceSingleUpdate = fmt.Sprintf(` +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "en" operating_mode = "UTM" @@ -199,9 +199,9 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { OS_DEFAULT_ZONE, ) -var testMockedAccSecurityV2NetworkBasedDeviceSingleUpdateInterface = fmt.Sprintf(` +var testMockedAccSecurityV3NetworkBasedDeviceSingleUpdateInterface = fmt.Sprintf(` -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW" @@ -252,7 +252,7 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleListBeforeCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListBeforeCreate = fmt.Sprintf(` request: method: GET response: @@ -275,7 +275,7 @@ newStatus: PreCreate OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleListAfterCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -305,7 +305,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfaces = ` +var testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfaces = ` request: method: GET response: @@ -319,7 +319,7 @@ expectedStatus: - Created ` -var testMockSecurityV2NetworkBasedDeviceSingleListDevicesAfterCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListDevicesAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -355,7 +355,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleListDevicesAfterUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListDevicesAfterUpdate = fmt.Sprintf(` request: method: GET response: @@ -390,7 +390,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfacesAfterCreate = ` +var testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfacesAfterCreate = ` request: method: GET response: @@ -405,7 +405,7 @@ expectedStatus: - Updated ` -var testMockSecurityV2NetworkBasedDeviceSingleListDeviceInterfacesAfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceSingleListDeviceInterfacesAfterUpdate = ` request: method: GET response: @@ -439,7 +439,7 @@ expectedStatus: - InterfaceIsUpdated ` -var testMockSecurityV2NetworkBasedDeviceSingleListAfterDelete = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListAfterDelete = fmt.Sprintf(` request: method: GET response: @@ -461,7 +461,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleCreate = fmt.Sprintf(` request: method: POST response: @@ -480,7 +480,7 @@ newStatus: Creating SoIDOfCreate, ) -var testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterCreate = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterCreate = ` request: method: GET response: @@ -498,7 +498,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterCreate = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterCreate = ` request: method: GET response: @@ -517,7 +517,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceSingleDelete = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleDelete = fmt.Sprintf(` request: method: POST response: @@ -538,7 +538,7 @@ newStatus: Deleted SoIDOfDelete, ) -var testMockSecurityV2NetworkBasedDeviceSingleProcessingAfterDelete = ` +var testMockSecurityV3NetworkBasedDeviceSingleProcessingAfterDelete = ` request: method: GET response: @@ -556,7 +556,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceSingleGetDeleteComplete = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetDeleteComplete = ` request: method: GET response: @@ -574,7 +574,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceSingleUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleUpdate = fmt.Sprintf(` request: method: POST response: @@ -593,7 +593,7 @@ newStatus: Updating SoIDOfUpdate, ) -var testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterUpdate = ` request: method: GET response: @@ -611,7 +611,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterUpdate = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterUpdate = ` request: method: GET response: @@ -630,7 +630,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceSingleListAfterUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListAfterUpdate = fmt.Sprintf(` request: method: GET response: @@ -659,7 +659,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleListAfterInterfaceUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListAfterInterfaceUpdate = fmt.Sprintf(` request: method: GET response: @@ -688,7 +688,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedDeviceSingleUpdateInterface = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleUpdateInterface = fmt.Sprintf(` request: method: PUT response: @@ -705,7 +705,7 @@ newStatus: InterfaceIsUpdating ProcessIDOfUpdateInterface, ) -var testMockSecurityV2NetworkBasedDeviceSingleGetProcessingAfterUpdateInterface = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetProcessingAfterUpdateInterface = ` request: method: GET response: @@ -888,7 +888,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedDeviceSingleGetCompleteActiveAfterUpdateInterface = ` +var testMockSecurityV3NetworkBasedDeviceSingleGetCompleteActiveAfterUpdateInterface = ` request: method: GET response: @@ -1072,7 +1072,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedDeviceSingleListAfterUpdateInterface = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedDeviceSingleListAfterUpdateInterface = fmt.Sprintf(` request: method: GET response: diff --git a/ecl/resource_ecl_security_network_based_device_single_v2_test.go b/ecl/resource_ecl_security_network_based_device_single_v3_test.go similarity index 62% rename from ecl/resource_ecl_security_network_based_device_single_v2_test.go rename to ecl/resource_ecl_security_network_based_device_single_v3_test.go index b125b8a2..1cf6eab5 100644 --- a/ecl/resource_ecl_security_network_based_device_single_v2_test.go +++ b/ecl/resource_ecl_security_network_based_device_single_v3_test.go @@ -7,12 +7,12 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single" ) -func TestAccSecurityV2NetworkBasedDeviceSingle_basic(t *testing.T) { +func TestAccSecurityV3NetworkBasedDeviceSingle_basic(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -22,43 +22,43 @@ func TestAccSecurityV2NetworkBasedDeviceSingle_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceSingleBasic, + Config: testAccSecurityV3NetworkBasedDeviceSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "operating_mode", "FW"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "az_group", OS_DEFAULT_ZONE), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceSingleUpdate, + Config: testAccSecurityV3NetworkBasedDeviceSingleUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "locale", "en"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "operating_mode", "UTM"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "license_kind", "08"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", + "ecl_security_network_based_device_single_v3.device_1", "az_group", OS_DEFAULT_ZONE), ), }, @@ -66,7 +66,7 @@ func TestAccSecurityV2NetworkBasedDeviceSingle_basic(t *testing.T) { }) } -func TestAccSecurityV2NetworkBasedDeviceSingle_updateInterface(t *testing.T) { +func TestAccSecurityV3NetworkBasedDeviceSingle_updateInterface(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -78,20 +78,20 @@ func TestAccSecurityV2NetworkBasedDeviceSingle_updateInterface(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceSingleBasic, + Config: testAccSecurityV3NetworkBasedDeviceSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceSingleUpdateInterface, + Config: testAccSecurityV3NetworkBasedDeviceSingleUpdateInterface, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -101,52 +101,52 @@ func TestAccSecurityV2NetworkBasedDeviceSingle_updateInterface(t *testing.T) { // port 0 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.ip_address", "192.168.1.50"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.ip_address", "192.168.1.50"), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.network_id", &n1.ID), + "ecl_security_network_based_device_single_v3.device_1", "port.0.network_id", &n1.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.subnet_id", &sn1.ID), + "ecl_security_network_based_device_single_v3.device_1", "port.0.subnet_id", &sn1.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.mtu", "1500"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.comment", "port 0 comment"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.comment", "port 0 comment"), // port 1 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.1.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.1.enable", "false"), // port 2 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.2.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.2.enable", "false"), // port 3 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.ip_address", "192.168.2.50"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.ip_address", "192.168.2.50"), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.network_id", &n2.ID), + "ecl_security_network_based_device_single_v3.device_1", "port.3.network_id", &n2.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.subnet_id", &sn2.ID), + "ecl_security_network_based_device_single_v3.device_1", "port.3.subnet_id", &sn2.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.mtu", "1500"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.comment", "port 3 comment"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.comment", "port 3 comment"), // port 4 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.4.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.4.enable", "false"), // port 5 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.5.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.5.enable", "false"), // port 6 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.6.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.6.enable", "false"), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedDeviceSingleUpdateInterface2, + Config: testAccSecurityV3NetworkBasedDeviceSingleUpdateInterface2, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedDeviceSingleExists( - "ecl_security_network_based_device_single_v2.device_1", &sd), + testAccCheckSecurityV3NetworkBasedDeviceSingleExists( + "ecl_security_network_based_device_single_v3.device_1", &sd), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -156,35 +156,35 @@ func TestAccSecurityV2NetworkBasedDeviceSingle_updateInterface(t *testing.T) { // port 0 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.0.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.0.enable", "false"), // port 1 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.1.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.1.enable", "false"), // port 2 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.2.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.2.enable", "false"), // port 3 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.3.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.3.enable", "false"), // port 4 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.4.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.4.enable", "false"), // port 5 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.5.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.5.enable", "false"), // port 6 resource.TestCheckResourceAttr( - "ecl_security_network_based_device_single_v2.device_1", "port.6.enable", "false"), + "ecl_security_network_based_device_single_v3.device_1", "port.6.enable", "false"), ), }, }, }) } -func testAccCheckSecurityV2NetworkBasedDeviceSingleExists(n string, sd *security.SingleDevice) resource.TestCheckFunc { +func testAccCheckSecurityV3NetworkBasedDeviceSingleExists(n string, sd *security.SingleDevice) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -196,7 +196,7 @@ func testAccCheckSecurityV2NetworkBasedDeviceSingleExists(n string, sd *security } config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL security client: %s", err) } @@ -216,15 +216,15 @@ func testAccCheckSecurityV2NetworkBasedDeviceSingleExists(n string, sd *security } } -func testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy(s *terraform.State) error { +func testAccCheckSecurityV3NetworkBasedDeviceSingleDestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL network client: %s", err) } for _, rs := range s.RootModule().Resources { - if rs.Type != "ecl_security_network_based_device_single_v2" { + if rs.Type != "ecl_security_network_based_device_single_v3" { continue } @@ -239,8 +239,8 @@ func testAccCheckSecurityV2NetworkBasedDeviceSingleDestroy(s *terraform.State) e return nil } -var testAccSecurityV2NetworkBasedDeviceSingleBasic = fmt.Sprintf(` -resource "ecl_security_network_based_device_single_v2" "device_1" { +var testAccSecurityV3NetworkBasedDeviceSingleBasic = fmt.Sprintf(` +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW" @@ -252,8 +252,8 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { OS_DEFAULT_ZONE, ) -var testAccSecurityV2NetworkBasedDeviceSingleUpdate = fmt.Sprintf(` -resource "ecl_security_network_based_device_single_v2" "device_1" { +var testAccSecurityV3NetworkBasedDeviceSingleUpdate = fmt.Sprintf(` +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "en" operating_mode = "UTM" @@ -265,7 +265,7 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { OS_DEFAULT_ZONE, ) -const testAccSecurityV2NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet1 = ` +const testAccSecurityV3NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet1 = ` resource "ecl_network_network_v2" "network_1" { name = "network_1_for_utm_single" } @@ -281,7 +281,7 @@ resource "ecl_network_subnet_v2" "subnet_1" { } } ` -const testAccSecurityV2NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet2 = ` +const testAccSecurityV3NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet2 = ` resource "ecl_network_network_v2" "network_2" { name = "network_2_for_utm_single" } @@ -298,11 +298,11 @@ resource "ecl_network_subnet_v2" "subnet_2" { } ` -var testAccSecurityV2NetworkBasedDeviceSingleUpdateInterface = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedDeviceSingleUpdateInterface = fmt.Sprintf(` %s %s -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW" @@ -349,17 +349,17 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { } `, - testAccSecurityV2NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, ) -var testAccSecurityV2NetworkBasedDeviceSingleUpdateInterface2 = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedDeviceSingleUpdateInterface2 = fmt.Sprintf(` %s %s -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "%s" locale = "ja" operating_mode = "FW" @@ -394,8 +394,8 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { } `, - testAccSecurityV2NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet1, - testAccSecurityV2NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet2, + testAccSecurityV3NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet1, + testAccSecurityV3NetworkBasedDeviceSingleUpdateInterfaceNetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, ) diff --git a/ecl/resource_ecl_security_network_based_waf_single_v2.go b/ecl/resource_ecl_security_network_based_waf_single_v3.go similarity index 58% rename from ecl/resource_ecl_security_network_based_waf_single_v2.go rename to ecl/resource_ecl_security_network_based_waf_single_v3.go index f8bc49ec..86f288b3 100644 --- a/ecl/resource_ecl_security_network_based_waf_single_v2.go +++ b/ecl/resource_ecl_security_network_based_waf_single_v3.go @@ -6,12 +6,12 @@ import ( "github.com/hashicorp/terraform/helper/schema" ) -func resourceSecurityNetworkBasedWAFSingleV2() *schema.Resource { +func resourceSecurityNetworkBasedWAFSingleV3() *schema.Resource { return &schema.Resource{ - Create: resourceSecurityNetworkBasedDeviceSingleV2Create, - Read: resourceSecurityNetworkBasedDeviceSingleV2Read, - Update: resourceSecurityNetworkBasedDeviceSingleV2Update, - Delete: resourceSecurityNetworkBasedDeviceSingleV2Delete, + Create: resourceSecurityNetworkBasedDeviceSingleV3Create, + Read: resourceSecurityNetworkBasedDeviceSingleV3Read, + Update: resourceSecurityNetworkBasedDeviceSingleV3Update, + Delete: resourceSecurityNetworkBasedDeviceSingleV3Delete, Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(1 * time.Hour), diff --git a/ecl/resource_ecl_security_network_based_waf_single_v2_mock_test.go b/ecl/resource_ecl_security_network_based_waf_single_v3_mock_test.go similarity index 83% rename from ecl/resource_ecl_security_network_based_waf_single_v2_mock_test.go rename to ecl/resource_ecl_security_network_based_waf_single_v3_mock_test.go index 52e7fc00..da346e65 100644 --- a/ecl/resource_ecl_security_network_based_waf_single_v2_mock_test.go +++ b/ecl/resource_ecl_security_network_based_waf_single_v3_mock_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" ) @@ -14,7 +14,7 @@ import ( const SoIDOfWAFUpdate = "FGWAF_809F858574E94699952D0D7E7C58C81C" const SoIDOfWAFDelete = "FGWAF_F2349100C7D24EF3ACD6B9A9F91FD220" -func TestMockedAccSecurityV2NetworkBasedWAFSingle_basic(t *testing.T) { +func TestMockedAccSecurityV3NetworkBasedWAFSingle_basic(t *testing.T) { var sd security.SingleDevice mc := mock.NewMockController() @@ -23,67 +23,67 @@ func TestMockedAccSecurityV2NetworkBasedWAFSingle_basic(t *testing.T) { postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "waf", "/ecl-api/devices", testMockSecurityV2NetworkBasedWAFSingleListDevicesAfterCreate) - mc.Register(t, "waf", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedWAFSingleListDevicesAfterCreate) + mc.Register(t, "waf", "/ecl-api/devices", testMockSecurityV3NetworkBasedWAFSingleListDevicesAfterCreate) + mc.Register(t, "waf", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedWAFSingleListDevicesAfterCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListBeforeCreate) - mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV2NetworkBasedWAFSingleCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListAfterCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListBeforeCreate) + mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV3NetworkBasedWAFSingleCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListAfterCreate) - mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV2NetworkBasedWAFSingleUpdate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterUpdate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterUpdate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListAfterUpdate) + mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV3NetworkBasedWAFSingleUpdate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterUpdate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterUpdate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListAfterUpdate) - mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV2NetworkBasedWAFSingleDelete) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleProcessingAfterDelete) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetDeleteComplete) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListAfterDelete) + mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV3NetworkBasedWAFSingleDelete) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleProcessingAfterDelete) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetDeleteComplete) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListAfterDelete) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedWAFSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedWAFSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedWAFSingleBasic, + Config: testMockedAccSecurityV3NetworkBasedWAFSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "locale", "ja"), + "ecl_security_network_based_waf_single_v3.waf_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "operating_mode", "WAF"), + "ecl_security_network_based_waf_single_v3.waf_1", "operating_mode", "WAF"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "license_kind", "02"), + "ecl_security_network_based_waf_single_v3.waf_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "az_group", OS_DEFAULT_ZONE), + "ecl_security_network_based_waf_single_v3.waf_1", "az_group", OS_DEFAULT_ZONE), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedWAFSingleUpdate, + Config: testMockedAccSecurityV3NetworkBasedWAFSingleUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "locale", "en"), + "ecl_security_network_based_waf_single_v3.waf_1", "locale", "en"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "operating_mode", "WAF"), + "ecl_security_network_based_waf_single_v3.waf_1", "operating_mode", "WAF"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "license_kind", "08"), + "ecl_security_network_based_waf_single_v3.waf_1", "license_kind", "08"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "az_group", OS_DEFAULT_ZONE), + "ecl_security_network_based_waf_single_v3.waf_1", "az_group", OS_DEFAULT_ZONE), ), }, }, }) } -func TestMockedAccSecurityV2NetworkBasedWAFSingleUpdateInterface(t *testing.T) { +func TestMockedAccSecurityV3NetworkBasedWAFSingleUpdateInterface(t *testing.T) { var sd security.SingleDevice mc := mock.NewMockController() @@ -92,75 +92,75 @@ func TestMockedAccSecurityV2NetworkBasedWAFSingleUpdateInterface(t *testing.T) { postKeystoneResponse := fmt.Sprintf(fakeKeystonePostTmpl, mc.Endpoint(), OS_REGION_NAME) mc.Register(t, "keystone", "/v3/auth/tokens", postKeystoneResponse) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListBeforeCreate) - mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV2NetworkBasedWAFSingleCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterCreate) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListAfterCreate) - mc.Register(t, "waf", "/ecl-api/devices", testMockSecurityV2NetworkBasedWAFSingleListDevicesAfterCreate) - mc.Register(t, "waf", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedWAFSingleListDeviceInterfacesAfterCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListBeforeCreate) + mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV3NetworkBasedWAFSingleCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterCreate) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListAfterCreate) + mc.Register(t, "waf", "/ecl-api/devices", testMockSecurityV3NetworkBasedWAFSingleListDevicesAfterCreate) + mc.Register(t, "waf", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedWAFSingleListDeviceInterfacesAfterCreate) - mc.Register(t, "waf", fmt.Sprintf("/ecl-api/ports/waf/%s", expectedNewSingleDeviceHostName), testMockSecurityV2NetworkBasedWAFSingleUpdateInterface) - mc.Register(t, "waf", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterUpdateInterface) - mc.Register(t, "waf", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterUpdateInterface) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListAfterInterfaceUpdate) - mc.Register(t, "waf", "/ecl-api/devices", testMockSecurityV2NetworkBasedWAFSingleListDevicesAfterUpdate) - mc.Register(t, "waf", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV2NetworkBasedWAFSingleListDeviceInterfacesAfterUpdate) + mc.Register(t, "waf", fmt.Sprintf("/ecl-api/ports/waf/%s", expectedNewSingleDeviceHostName), testMockSecurityV3NetworkBasedWAFSingleUpdateInterface) + mc.Register(t, "waf", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterUpdateInterface) + mc.Register(t, "waf", fmt.Sprintf("/ecl-api/process/%d/status", ProcessIDOfUpdateInterface), testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterUpdateInterface) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListAfterInterfaceUpdate) + mc.Register(t, "waf", "/ecl-api/devices", testMockSecurityV3NetworkBasedWAFSingleListDevicesAfterUpdate) + mc.Register(t, "waf", fmt.Sprintf("/ecl-api/devices/%s/interfaces", expectedNewSingleDeviceUUID), testMockSecurityV3NetworkBasedWAFSingleListDeviceInterfacesAfterUpdate) - mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV2NetworkBasedWAFSingleDelete) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleProcessingAfterDelete) - mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV2NetworkBasedWAFSingleGetDeleteComplete) - mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV2NetworkBasedWAFSingleListAfterDelete) + mc.Register(t, "waf", "/API/SoEntryFGWAF", testMockSecurityV3NetworkBasedWAFSingleDelete) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleProcessingAfterDelete) + mc.Register(t, "waf", "/API/ScreenEventFGWAFOrderProgressRate", testMockSecurityV3NetworkBasedWAFSingleGetDeleteComplete) + mc.Register(t, "waf", "/API/ScreenEventFGWAFDeviceGet", testMockSecurityV3NetworkBasedWAFSingleListAfterDelete) mc.StartServer(t) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedWAFSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedWAFSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedWAFSingleBasic, + Config: testMockedAccSecurityV3NetworkBasedWAFSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), ), }, resource.TestStep{ - Config: testMockedAccSecurityV2NetworkBasedWAFSingleUpdateInterface, + Config: testMockedAccSecurityV3NetworkBasedWAFSingleUpdateInterface, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.ip_address", "192.168.1.50"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.ip_address", "192.168.1.50"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.network_id", "dummyNetwork1"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.network_id", "dummyNetwork1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.subnet_id", "dummySubnet1"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.subnet_id", "dummySubnet1"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.mtu", "1500"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.comment", "port 0 comment"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.comment", "port 0 comment"), // resource.TestCheckResourceAttr( - // "ecl_security_network_based_waf_single_v2.waf_1", "port.3.ip_address", "192.168.2.50"), + // "ecl_security_network_based_waf_single_v3.waf_1", "port.3.ip_address", "192.168.2.50"), // resource.TestCheckResourceAttr( - // "ecl_security_network_based_waf_single_v2.waf_1", "port.3.network_id", "dummyNetwork2"), + // "ecl_security_network_based_waf_single_v3.waf_1", "port.3.network_id", "dummyNetwork2"), // resource.TestCheckResourceAttr( - // "ecl_security_network_based_waf_single_v2.waf_1", "port.3.subnet_id", "dummySubnet2"), + // "ecl_security_network_based_waf_single_v3.waf_1", "port.3.subnet_id", "dummySubnet2"), // resource.TestCheckResourceAttr( - // "ecl_security_network_based_waf_single_v2.waf_1", "port.3.mtu", "1500"), + // "ecl_security_network_based_waf_single_v3.waf_1", "port.3.mtu", "1500"), // resource.TestCheckResourceAttr( - // "ecl_security_network_based_waf_single_v2.waf_1", "port.3.comment", "port 3 comment"), + // "ecl_security_network_based_waf_single_v3.waf_1", "port.3.comment", "port 3 comment"), ), }, }, }) } -var testMockedAccSecurityV2NetworkBasedWAFSingleBasic = fmt.Sprintf(` -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +var testMockedAccSecurityV3NetworkBasedWAFSingleBasic = fmt.Sprintf(` +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "ja" license_kind = "02" @@ -171,8 +171,8 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { OS_DEFAULT_ZONE, ) -var testMockedAccSecurityV2NetworkBasedWAFSingleUpdate = fmt.Sprintf(` -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +var testMockedAccSecurityV3NetworkBasedWAFSingleUpdate = fmt.Sprintf(` +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "en" license_kind = "08" @@ -183,9 +183,9 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { OS_DEFAULT_ZONE, ) -var testMockedAccSecurityV2NetworkBasedWAFSingleUpdateInterface = fmt.Sprintf(` +var testMockedAccSecurityV3NetworkBasedWAFSingleUpdateInterface = fmt.Sprintf(` -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "ja" license_kind = "02" @@ -206,7 +206,7 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleListBeforeCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListBeforeCreate = fmt.Sprintf(` request: method: GET response: @@ -229,7 +229,7 @@ newStatus: PreCreate OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleListAfterCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -259,7 +259,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleListDevicesAfterCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListDevicesAfterCreate = fmt.Sprintf(` request: method: GET response: @@ -295,7 +295,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleListDevicesAfterUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListDevicesAfterUpdate = fmt.Sprintf(` request: method: GET response: @@ -330,7 +330,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleListDeviceInterfacesAfterCreate = ` +var testMockSecurityV3NetworkBasedWAFSingleListDeviceInterfacesAfterCreate = ` request: method: GET response: @@ -345,7 +345,7 @@ expectedStatus: - Updated ` -var testMockSecurityV2NetworkBasedWAFSingleListDeviceInterfacesAfterUpdate = ` +var testMockSecurityV3NetworkBasedWAFSingleListDeviceInterfacesAfterUpdate = ` request: method: GET response: @@ -369,7 +369,7 @@ expectedStatus: - InterfaceIsUpdated ` -var testMockSecurityV2NetworkBasedWAFSingleListAfterDelete = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListAfterDelete = fmt.Sprintf(` request: method: GET response: @@ -391,7 +391,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleCreate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleCreate = fmt.Sprintf(` request: method: POST response: @@ -410,7 +410,7 @@ newStatus: Creating SoIDOfCreate, ) -var testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterCreate = ` +var testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterCreate = ` request: method: GET response: @@ -428,7 +428,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterCreate = ` +var testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterCreate = ` request: method: GET response: @@ -447,7 +447,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedWAFSingleDelete = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleDelete = fmt.Sprintf(` request: method: POST response: @@ -468,7 +468,7 @@ newStatus: Deleted SoIDOfWAFDelete, ) -var testMockSecurityV2NetworkBasedWAFSingleProcessingAfterDelete = ` +var testMockSecurityV3NetworkBasedWAFSingleProcessingAfterDelete = ` request: method: GET response: @@ -486,7 +486,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedWAFSingleGetDeleteComplete = ` +var testMockSecurityV3NetworkBasedWAFSingleGetDeleteComplete = ` request: method: GET response: @@ -504,7 +504,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedWAFSingleUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleUpdate = fmt.Sprintf(` request: method: POST response: @@ -523,7 +523,7 @@ newStatus: Updating SoIDOfWAFUpdate, ) -var testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterUpdate = ` +var testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterUpdate = ` request: method: GET response: @@ -541,7 +541,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterUpdate = ` +var testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterUpdate = ` request: method: GET response: @@ -560,7 +560,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedWAFSingleListAfterUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListAfterUpdate = fmt.Sprintf(` request: method: GET response: @@ -589,7 +589,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleListAfterInterfaceUpdate = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListAfterInterfaceUpdate = fmt.Sprintf(` request: method: GET response: @@ -618,7 +618,7 @@ expectedStatus: OS_DEFAULT_ZONE, ) -var testMockSecurityV2NetworkBasedWAFSingleUpdateInterface = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleUpdateInterface = fmt.Sprintf(` request: method: PUT response: @@ -635,7 +635,7 @@ newStatus: InterfaceIsUpdating ProcessIDOfUpdateInterface, ) -var testMockSecurityV2NetworkBasedWAFSingleGetProcessingAfterUpdateInterface = ` +var testMockSecurityV3NetworkBasedWAFSingleGetProcessingAfterUpdateInterface = ` request: method: GET response: @@ -818,7 +818,7 @@ counter: max: 3 ` -var testMockSecurityV2NetworkBasedWAFSingleGetCompleteActiveAfterUpdateInterface = ` +var testMockSecurityV3NetworkBasedWAFSingleGetCompleteActiveAfterUpdateInterface = ` request: method: GET response: @@ -1002,7 +1002,7 @@ counter: min: 4 ` -var testMockSecurityV2NetworkBasedWAFSingleListAfterUpdateInterface = fmt.Sprintf(` +var testMockSecurityV3NetworkBasedWAFSingleListAfterUpdateInterface = fmt.Sprintf(` request: method: GET response: diff --git a/ecl/resource_ecl_security_network_based_waf_single_v2_test.go b/ecl/resource_ecl_security_network_based_waf_single_v3_test.go similarity index 60% rename from ecl/resource_ecl_security_network_based_waf_single_v2_test.go rename to ecl/resource_ecl_security_network_based_waf_single_v3_test.go index 812f36d6..86882e20 100644 --- a/ecl/resource_ecl_security_network_based_waf_single_v2_test.go +++ b/ecl/resource_ecl_security_network_based_waf_single_v3_test.go @@ -7,12 +7,12 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single" ) -func TestAccSecurityV2NetworkBasedWAFSingle_basic(t *testing.T) { +func TestAccSecurityV3NetworkBasedWAFSingle_basic(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -22,43 +22,43 @@ func TestAccSecurityV2NetworkBasedWAFSingle_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedWAFSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedWAFSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2NetworkBasedWAFSingleBasic, + Config: testAccSecurityV3NetworkBasedWAFSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "locale", "ja"), + "ecl_security_network_based_waf_single_v3.waf_1", "locale", "ja"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "operating_mode", "WAF"), + "ecl_security_network_based_waf_single_v3.waf_1", "operating_mode", "WAF"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "license_kind", "02"), + "ecl_security_network_based_waf_single_v3.waf_1", "license_kind", "02"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "az_group", OS_DEFAULT_ZONE), + "ecl_security_network_based_waf_single_v3.waf_1", "az_group", OS_DEFAULT_ZONE), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedWAFSingleUpdate, + Config: testAccSecurityV3NetworkBasedWAFSingleUpdate, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "locale", "en"), + "ecl_security_network_based_waf_single_v3.waf_1", "locale", "en"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "operating_mode", "WAF"), + "ecl_security_network_based_waf_single_v3.waf_1", "operating_mode", "WAF"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "license_kind", "08"), + "ecl_security_network_based_waf_single_v3.waf_1", "license_kind", "08"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "az_group", OS_DEFAULT_ZONE), + "ecl_security_network_based_waf_single_v3.waf_1", "az_group", OS_DEFAULT_ZONE), ), }, }, }) } -func TestAccSecurityV2NetworkBasedWAFSingle_updateInterface(t *testing.T) { +func TestAccSecurityV3NetworkBasedWAFSingle_updateInterface(t *testing.T) { if testing.Short() { t.Skip("skip this test in short mode") } @@ -70,20 +70,20 @@ func TestAccSecurityV2NetworkBasedWAFSingle_updateInterface(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheckSecurity(t) }, Providers: testAccProviders, - CheckDestroy: testAccCheckSecurityV2NetworkBasedWAFSingleDestroy, + CheckDestroy: testAccCheckSecurityV3NetworkBasedWAFSingleDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccSecurityV2NetworkBasedWAFSingleBasic, + Config: testAccSecurityV3NetworkBasedWAFSingleBasic, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedWAFSingleUpdateInterface, + Config: testAccSecurityV3NetworkBasedWAFSingleUpdateInterface, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -92,23 +92,23 @@ func TestAccSecurityV2NetworkBasedWAFSingle_updateInterface(t *testing.T) { testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_2", &sn2), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.ip_address", "192.168.1.50"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.ip_address", "192.168.1.50"), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.network_id", &n1.ID), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.network_id", &n1.ID), resource.TestCheckResourceAttrPtr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.subnet_id", &sn1.ID), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.subnet_id", &sn1.ID), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.mtu", "1500"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.mtu", "1500"), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.comment", "port 0 comment"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.comment", "port 0 comment"), ), }, resource.TestStep{ - Config: testAccSecurityV2NetworkBasedWAFSingleUpdateInterface2, + Config: testAccSecurityV3NetworkBasedWAFSingleUpdateInterface2, Check: resource.ComposeTestCheckFunc( - testAccCheckSecurityV2NetworkBasedWAFSingleExists( - "ecl_security_network_based_waf_single_v2.waf_1", &sd), + testAccCheckSecurityV3NetworkBasedWAFSingleExists( + "ecl_security_network_based_waf_single_v3.waf_1", &sd), testAccCheckNetworkV2NetworkExists("ecl_network_network_v2.network_1", &n1), testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_1", &sn1), @@ -117,14 +117,14 @@ func TestAccSecurityV2NetworkBasedWAFSingle_updateInterface(t *testing.T) { testAccCheckNetworkV2SubnetExists("ecl_network_subnet_v2.subnet_2", &sn2), resource.TestCheckResourceAttr( - "ecl_security_network_based_waf_single_v2.waf_1", "port.0.enable", "false"), + "ecl_security_network_based_waf_single_v3.waf_1", "port.0.enable", "false"), ), }, }, }) } -func testAccCheckSecurityV2NetworkBasedWAFSingleExists(n string, sd *security.SingleDevice) resource.TestCheckFunc { +func testAccCheckSecurityV3NetworkBasedWAFSingleExists(n string, sd *security.SingleDevice) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -136,7 +136,7 @@ func testAccCheckSecurityV2NetworkBasedWAFSingleExists(n string, sd *security.Si } config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL security client: %s", err) } @@ -156,15 +156,15 @@ func testAccCheckSecurityV2NetworkBasedWAFSingleExists(n string, sd *security.Si } } -func testAccCheckSecurityV2NetworkBasedWAFSingleDestroy(s *terraform.State) error { +func testAccCheckSecurityV3NetworkBasedWAFSingleDestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - client, err := config.securityOrderV2Client(OS_REGION_NAME) + client, err := config.securityOrderV3Client(OS_REGION_NAME) if err != nil { return fmt.Errorf("Error creating ECL network client: %s", err) } for _, rs := range s.RootModule().Resources { - if rs.Type != "ecl_security_network_based_waf_single_v2" { + if rs.Type != "ecl_security_network_based_waf_single_v3" { continue } @@ -179,8 +179,8 @@ func testAccCheckSecurityV2NetworkBasedWAFSingleDestroy(s *terraform.State) erro return nil } -var testAccSecurityV2NetworkBasedWAFSingleBasic = fmt.Sprintf(` -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +var testAccSecurityV3NetworkBasedWAFSingleBasic = fmt.Sprintf(` +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "ja" license_kind = "02" @@ -191,8 +191,8 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { OS_DEFAULT_ZONE, ) -var testAccSecurityV2NetworkBasedWAFSingleUpdate = fmt.Sprintf(` -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +var testAccSecurityV3NetworkBasedWAFSingleUpdate = fmt.Sprintf(` +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "en" license_kind = "08" @@ -203,7 +203,7 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { OS_DEFAULT_ZONE, ) -const testAccSecurityV2NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet1 = ` +const testAccSecurityV3NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet1 = ` resource "ecl_network_network_v2" "network_1" { name = "network_1_for_utm_single" } @@ -219,7 +219,7 @@ resource "ecl_network_subnet_v2" "subnet_1" { } } ` -const testAccSecurityV2NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet2 = ` +const testAccSecurityV3NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet2 = ` resource "ecl_network_network_v2" "network_2" { name = "network_2_for_utm_single" } @@ -236,11 +236,11 @@ resource "ecl_network_subnet_v2" "subnet_2" { } ` -var testAccSecurityV2NetworkBasedWAFSingleUpdateInterface = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedWAFSingleUpdateInterface = fmt.Sprintf(` %s %s -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "ja" license_kind = "02" @@ -257,17 +257,17 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { } } `, - testAccSecurityV2NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet1, - testAccSecurityV2NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet2, + testAccSecurityV3NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet1, + testAccSecurityV3NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, ) -var testAccSecurityV2NetworkBasedWAFSingleUpdateInterface2 = fmt.Sprintf(` +var testAccSecurityV3NetworkBasedWAFSingleUpdateInterface2 = fmt.Sprintf(` %s %s -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "%s" locale = "ja" license_kind = "02" @@ -278,8 +278,8 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { } } `, - testAccSecurityV2NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet1, - testAccSecurityV2NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet2, + testAccSecurityV3NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet1, + testAccSecurityV3NetworkBasedWAFSingleUpdateInterfaceNetworkSubnet2, OS_TENANT_ID, OS_DEFAULT_ZONE, ) diff --git a/ecl/resource_ecl_sss_approval_request_v1.go b/ecl/resource_ecl_sss_approval_request_v1.go index c9f422f0..09486114 100644 --- a/ecl/resource_ecl_sss_approval_request_v1.go +++ b/ecl/resource_ecl_sss_approval_request_v1.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests" + "github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests" ) func resourceSSSApprovalRequestV1() *schema.Resource { diff --git a/ecl/resource_ecl_sss_approval_request_v1_test.go b/ecl/resource_ecl_sss_approval_request_v1_test.go index 5d1c623c..c364ed6d 100644 --- a/ecl/resource_ecl_sss_approval_request_v1_test.go +++ b/ecl/resource_ecl_sss_approval_request_v1_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests" + "github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests" ) func TestAccSSSV1ApprovalRequest_basic(t *testing.T) { diff --git a/ecl/resource_ecl_sss_tenant_v1.go b/ecl/resource_ecl_sss_tenant_v1.go index b858d538..af945842 100644 --- a/ecl/resource_ecl_sss_tenant_v1.go +++ b/ecl/resource_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 resourceSSSTenantV1() *schema.Resource { diff --git a/ecl/resource_ecl_sss_tenant_v1_test.go b/ecl/resource_ecl_sss_tenant_v1_test.go index dfd03914..139ee79f 100644 --- a/ecl/resource_ecl_sss_tenant_v1_test.go +++ b/ecl/resource_ecl_sss_tenant_v1_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants" + "github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants" ) func TestAccSSSV1Tenant_basic(t *testing.T) { diff --git a/ecl/resource_ecl_sss_user_v1.go b/ecl/resource_ecl_sss_user_v1.go index cc7d47e3..a282941d 100644 --- a/ecl/resource_ecl_sss_user_v1.go +++ b/ecl/resource_ecl_sss_user_v1.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2/ecl/sss/v1/users" + "github.com/nttcom/eclcloud/v3/ecl/sss/v1/users" ) func resourceSSSUserV1() *schema.Resource { diff --git a/ecl/resource_ecl_sss_user_v1_test.go b/ecl/resource_ecl_sss_user_v1_test.go index 9ac9cc4e..2c4684ec 100644 --- a/ecl/resource_ecl_sss_user_v1_test.go +++ b/ecl/resource_ecl_sss_user_v1_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/sss/v1/users" + "github.com/nttcom/eclcloud/v3/ecl/sss/v1/users" ) func TestAccSSSV1User_basic(t *testing.T) { diff --git a/ecl/resource_ecl_storage_virtualstorage_v1.go b/ecl/resource_ecl_storage_virtualstorage_v1.go index ba87c2e2..e670db11 100644 --- a/ecl/resource_ecl_storage_virtualstorage_v1.go +++ b/ecl/resource_ecl_storage_virtualstorage_v1.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes" ) func resourceStorageVirtualStorageV1() *schema.Resource { diff --git a/ecl/resource_ecl_storage_virtualstorage_v1_test.go b/ecl/resource_ecl_storage_virtualstorage_v1_test.go index 9147e7a1..d03fef04 100644 --- a/ecl/resource_ecl_storage_virtualstorage_v1_test.go +++ b/ecl/resource_ecl_storage_virtualstorage_v1_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages" ) const VOLUME_TYPE_NAME_BLOCK = "piops_iscsi_na" diff --git a/ecl/resource_ecl_storage_volume_v1.go b/ecl/resource_ecl_storage_volume_v1.go index 2b66e482..1cc75703 100644 --- a/ecl/resource_ecl_storage_volume_v1.go +++ b/ecl/resource_ecl_storage_volume_v1.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes" ) func resourceStorageVolumeV1() *schema.Resource { diff --git a/ecl/resource_ecl_storage_volume_v1_test.go b/ecl/resource_ecl_storage_volume_v1_test.go index 1d98263b..129a7843 100644 --- a/ecl/resource_ecl_storage_volume_v1_test.go +++ b/ecl/resource_ecl_storage_volume_v1_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages" - "github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages" + "github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes" ) const IQN01 string = "iqn.2003-01.org.sample-iscsi.node1.x8664:sn.2613f8620d98" diff --git a/ecl/resource_ecl_vna_appliance_v1.go b/ecl/resource_ecl_vna_appliance_v1.go index 59384b98..1c3a1ead 100644 --- a/ecl/resource_ecl_vna_appliance_v1.go +++ b/ecl/resource_ecl_vna_appliance_v1.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances" ) func noAllowedAddressPairsSchema(slotNumber int) *schema.Schema { diff --git a/ecl/resource_ecl_vna_appliance_v1_mock_test.go b/ecl/resource_ecl_vna_appliance_v1_mock_test.go index b01d6cba..47332314 100644 --- a/ecl/resource_ecl_vna_appliance_v1_mock_test.go +++ b/ecl/resource_ecl_vna_appliance_v1_mock_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/nttcom/terraform-provider-ecl/ecl/testhelper/mock" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances" ) func TestMockedAccVNAV1Appliance_updateMetaBasic(t *testing.T) { diff --git a/ecl/resource_ecl_vna_appliance_v1_test.go b/ecl/resource_ecl_vna_appliance_v1_test.go index 70dd987d..a35dadd3 100644 --- a/ecl/resource_ecl_vna_appliance_v1_test.go +++ b/ecl/resource_ecl_vna_appliance_v1_test.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances" ) var MaxLengthString = repeatedString("a", 255) diff --git a/ecl/security.go b/ecl/security.go index dfdf2875..0aae7a25 100644 --- a/ecl/security.go +++ b/ecl/security.go @@ -10,12 +10,12 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single" - "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status" - "github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices" - "github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports" - "github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes" + "github.com/nttcom/eclcloud/v3" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single" + "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status" + "github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices" + "github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports" + "github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes" ) const securityDeviceSinglePollIntervalSec = 30 @@ -332,9 +332,9 @@ func resourceSecurityNetworkBasedSingleDevicePortsForUpdate(d *schema.ResourceDa return result, nil } -func resourceSecurityNetworkBasedDeviceSingleV2UpdatePortalAPIPart(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceSingleV3UpdatePortalAPIPart(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityPortalV2Client(GetRegion(d, config)) + client, err := config.securityPortalV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security portal client: %s", err) } @@ -392,9 +392,9 @@ func resourceSecurityNetworkBasedDeviceSingleV2UpdatePortalAPIPart(d *schema.Res return nil } -func resourceSecurityNetworkBasedDeviceSingleV2UpdateOrderAPIPart(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceSingleV3UpdateOrderAPIPart(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } diff --git a/ecl/security_ha.go b/ecl/security_ha.go index 21da31ba..1b734809 100644 --- a/ecl/security_ha.go +++ b/ecl/security_ha.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/nttcom/eclcloud/v2" - security "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha" - "github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status" + "github.com/nttcom/eclcloud/v3" + security "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha" + "github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status" - ports "github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports" + ports "github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports" ) const securityDeviceHAPollIntervalSec = 30 @@ -218,9 +218,9 @@ func gtHostForHADeviceUpdateAsOpts(d *schema.ResourceData) [2]security.GtHostInU return result } -func resourceSecurityNetworkBasedDeviceHAV2UpdateOrderAPIPart(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceHAV3UpdateOrderAPIPart(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityOrderV2Client(GetRegion(d, config)) + client, err := config.securityOrderV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security order client: %s", err) } @@ -508,9 +508,9 @@ func resourceSecurityNetworkBasedHADevicePortsForUpdate(d *schema.ResourceData) return result, nil } -func resourceSecurityNetworkBasedDeviceHAV2UpdatePortalAPIPart(d *schema.ResourceData, meta interface{}) error { +func resourceSecurityNetworkBasedDeviceHAV3UpdatePortalAPIPart(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.securityPortalV2Client(GetRegion(d, config)) + client, err := config.securityPortalV3Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating ECL security portal client: %s", err) } diff --git a/ecl/types.go b/ecl/types.go index d57d9467..b89beb30 100644 --- a/ecl/types.go +++ b/ecl/types.go @@ -10,17 +10,17 @@ import ( "net/http" "strings" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs" - "github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets" - "github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/networks" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/ports" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs" + "github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets" + "github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/networks" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/ports" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances" ) // LogRoundTripper satisfies the http.RoundTripper interface and is used to diff --git a/ecl/util.go b/ecl/util.go index db2bb8d9..1f95e416 100644 --- a/ecl/util.go +++ b/ecl/util.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "github.com/hashicorp/terraform/flatmap" "github.com/hashicorp/terraform/helper/resource" diff --git a/ecl/vna.go b/ecl/vna.go index a8ec0c14..6340308a 100644 --- a/ecl/vna.go +++ b/ecl/vna.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances" ) const maxNumberOfInterfaces = 8 diff --git a/go.mod b/go.mod index 4e9ecbc6..5a80d6f0 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/nttcom/terraform-provider-ecl require ( github.com/hashicorp/terraform v0.12.6 - github.com/nttcom/eclcloud/v2 v2.8.0 + github.com/nttcom/eclcloud/v3 v3.1.0 github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index 031b4701..27aa574d 100644 --- a/go.sum +++ b/go.sum @@ -538,8 +538,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/nttcom/eclcloud/v2 v2.8.0 h1:l9QsBbOw3CEKHKG3REwd525Gbe0ACreAlwuXU3AJo9I= -github.com/nttcom/eclcloud/v2 v2.8.0/go.mod h1:KoBB1B+xdeRXo0fNzggINrTQiuAsezh1SBVcbryS348= +github.com/nttcom/eclcloud/v3 v3.1.0 h1:9+qbyKrL/HhU06Whuj1BBXABGJbTHNwlNr22X5YbAmQ= +github.com/nttcom/eclcloud/v3 v3.1.0/go.mod h1:dYmIyCIBYCdzQTo3ZAWq/q3LmmhGdUQv0xDuu8wa74Q= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= diff --git a/vendor/github.com/nttcom/eclcloud/v2/LICENSE b/vendor/github.com/nttcom/eclcloud/v3/LICENSE similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/LICENSE rename to vendor/github.com/nttcom/eclcloud/v3/LICENSE diff --git a/vendor/github.com/nttcom/eclcloud/v2/auth_options.go b/vendor/github.com/nttcom/eclcloud/v3/auth_options.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/auth_options.go rename to vendor/github.com/nttcom/eclcloud/v3/auth_options.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/doc.go b/vendor/github.com/nttcom/eclcloud/v3/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/auth_env.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/auth_env.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/auth_env.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/auth_env.go index 021e2678..c2a7faa1 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/auth_env.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/auth_env.go @@ -1,7 +1,7 @@ package ecl import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "os" ) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/requests.go similarity index 80% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/requests.go index 88423dc8..247bbd26 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/requests.go @@ -1,8 +1,8 @@ package availabilityzones import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // List will return the existing availability zones. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/results.go index 509cb8b3..5f6ca327 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/results.go @@ -1,7 +1,7 @@ package availabilityzones import ( - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3/pagination" ) // ZoneState represents the current state of the availability zone. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/urls.go similarity index 76% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/urls.go index 19cd6731..e62fdd9b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones/urls.go @@ -1,6 +1,6 @@ package availabilityzones -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("os-availability-zone") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/requests.go index 9d99f64d..640b4768 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/requests.go @@ -1,8 +1,8 @@ package flavors import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // Get retrieves the flavor with the provided ID. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/results.go index a795f6f9..6ceda50d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/results.go @@ -1,8 +1,8 @@ package flavors import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/urls.go similarity index 87% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/urls.go index 1425be6f..430a8982 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors/urls.go @@ -1,7 +1,7 @@ package flavors import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/requests.go index a4b18768..2ce786cc 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/requests.go @@ -1,8 +1,8 @@ package keypairs import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // List returns a Pager that allows you to iterate over a collection of KeyPairs. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/results.go index 6e5a0255..d3d18046 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/results.go @@ -1,8 +1,8 @@ package keypairs import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // KeyPair is an SSH key known to the Enterprise Cloud that is available to be diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/urls.go index d2ea2e00..2637342e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs/urls.go @@ -1,6 +1,6 @@ package keypairs -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" const resourcePath = "os-keypairs" diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/requests.go index e08bd49c..35fd45c6 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/requests.go @@ -3,8 +3,8 @@ package servers import ( "encoding/base64" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // Get retrieves the server with the provided ID. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/result.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/result.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/result.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/result.go index 888a2638..48291320 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/result.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/result.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/urls.go index 53ddcdc9..07a57336 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers/urls.go @@ -1,7 +1,7 @@ package servers import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/client.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/client.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/client.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/client.go index 8d376447..ed80324f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/client.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/client.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - "github.com/nttcom/eclcloud/v2" - tokens3 "github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens" - "github.com/nttcom/eclcloud/v2/ecl/utils" + "github.com/nttcom/eclcloud/v3" + tokens3 "github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens" + "github.com/nttcom/eclcloud/v3/ecl/utils" ) const ( @@ -356,19 +356,19 @@ func NewWorkflowV2(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (* return initClientOpts(client, eo, "workflowv2") } -// NewSecurityOrderV2 creates a ServiceClient that may be used to access the v2 Security +// NewSecurityOrderV3 creates a ServiceClient that may be used to access the v3 Security // Order API service. -func NewSecurityOrderV2(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (*eclcloud.ServiceClient, error) { - sc, err := initClientOpts(client, eo, "security-order") - // sc.ResourceBase = sc.Endpoint + "v2/" +func NewSecurityOrderV3(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (*eclcloud.ServiceClient, error) { + sc, err := initClientOpts(client, eo, "security-order-th") + // sc.ResourceBase = sc.Endpoint + "v3/" return sc, err } -// NewSecurityPortalV2 creates a ServiceClient that may be used to access the v2 Security +// NewSecurityPortalV3 creates a ServiceClient that may be used to access the v3 Security // Portal API service. -func NewSecurityPortalV2(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (*eclcloud.ServiceClient, error) { - sc, err := initClientOpts(client, eo, "security-operation") - // sc.ResourceBase = sc.Endpoint + "v2/" +func NewSecurityPortalV3(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (*eclcloud.ServiceClient, error) { + sc, err := initClientOpts(client, eo, "security-operation-th") + // sc.ResourceBase = sc.Endpoint + "v3/" return sc, err } diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/requests.go similarity index 80% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/requests.go index 88423dc8..247bbd26 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/requests.go @@ -1,8 +1,8 @@ package availabilityzones import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // List will return the existing availability zones. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/results.go index 78343e05..c66f396d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ServerAvailabilityZoneExt is an extension to the base Server object. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/urls.go similarity index 76% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/urls.go index 19cd6731..e62fdd9b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones/urls.go @@ -1,6 +1,6 @@ package availabilityzones -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("os-availability-zone") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/requests.go index 4398f98d..2ba88e93 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/requests.go @@ -1,9 +1,9 @@ package bootfromvolume import ( - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) type ( diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/results.go similarity index 82% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/results.go index 2b8daf3d..8630187a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/results.go @@ -1,7 +1,7 @@ package bootfromvolume import ( - os "github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers" + os "github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers" ) // CreateResult temporarily contains the response from a Create call. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/urls.go similarity index 75% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/urls.go index cdd7f47a..69c85ab3 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume/urls.go @@ -1,6 +1,6 @@ package bootfromvolume -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func createURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("os-volumes_boot") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/requests.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/requests.go index bc1f889d..e7c3b333 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/requests.go @@ -1,9 +1,9 @@ package keypairs import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers" + "github.com/nttcom/eclcloud/v3/pagination" ) // CreateOptsExt adds a KeyPair option to the base CreateOpts. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/results.go index de9125c2..596f9732 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/results.go @@ -1,8 +1,8 @@ package keypairs import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // KeyPair is an SSH key known to the Enterprise Cloud that is available to be diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/urls.go index d2ea2e00..2637342e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs/urls.go @@ -1,6 +1,6 @@ package keypairs -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" const resourcePath = "os-keypairs" diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/requests.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/requests.go index 6a1f06e7..dc11573b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/requests.go @@ -1,6 +1,6 @@ package startstop -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func actionURL(client *eclcloud.ServiceClient, id string) string { return client.ServiceURL("servers", id, "action") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/results.go similarity index 90% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/results.go index c50fef50..5eec6870 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop/results.go @@ -1,6 +1,6 @@ package startstop -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" // StartResult is the response from a Start operation. Call its ExtractErr // method to determine if the request succeeded or failed. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/requests.go index aae20894..bd07d35f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/requests.go @@ -1,8 +1,8 @@ package volumeattach import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // List returns a Pager that allows you to iterate over a collection of diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/results.go index 38a76046..0b7e3553 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/results.go @@ -1,8 +1,8 @@ package volumeattach import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // VolumeAttachment contains attachment information between a volume diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/urls.go index f173a8cb..ff959a03 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach/urls.go @@ -1,6 +1,6 @@ package volumeattach -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" const resourcePath = "os-volume_attachments" diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/requests.go index b32e9142..68038664 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/requests.go @@ -1,8 +1,8 @@ package flavors import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/results.go index b675e1e6..9bb77b0b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/urls.go index c98f72b2..079d7cef 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors/urls.go @@ -1,7 +1,7 @@ package flavors import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/requests.go index 68e22dc2..2e4f4461 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/requests.go @@ -1,8 +1,8 @@ package images import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/results.go index 4760e982..346225f8 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/results.go @@ -1,8 +1,8 @@ package images import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // GetResult is the response from a Get operation. Call its Extract method to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/urls.go similarity index 89% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/urls.go index 7a9611ec..876ded5b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/images/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/images/urls.go @@ -1,6 +1,6 @@ package images -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listDetailURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("images", "detail") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/errors.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/errors.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/errors.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/errors.go index 9e784fe4..b513aeb5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/errors.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/errors.go @@ -3,7 +3,7 @@ package servers import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // ErrNeitherImageIDNorImageNameProvided is the error when neither the image diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/requests.go index 6ed287e2..dee68366 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/requests.go @@ -4,10 +4,10 @@ import ( "encoding/base64" // "encoding/json" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors" - "github.com/nttcom/eclcloud/v2/ecl/compute/v2/images" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors" + "github.com/nttcom/eclcloud/v3/ecl/compute/v2/images" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/results.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/results.go index 1f7a32d5..087f197d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/results.go @@ -7,8 +7,8 @@ import ( "path" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type serverResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/urls.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/urls.go index f1ab8265..46503021 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/urls.go @@ -1,6 +1,6 @@ package servers -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func createURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("servers") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/util.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/util.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/util.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/util.go index 8d6e5b86..15823b52 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers/util.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers/util.go @@ -1,6 +1,6 @@ package servers -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" // WaitForStatus will continually poll a server until it successfully // transitions to a specified status. It will do this for at most the number diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/requests.go index 8829b62f..35dfeab0 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/requests.go @@ -1,8 +1,8 @@ package volumes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // CreateOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/results.go index 5bb3e0b0..e7066fa0 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type Attachment struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/urls.go index 6cc75752..4865b34c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/urls.go @@ -1,6 +1,6 @@ package volumes -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func createURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("volumes") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/util.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/util.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/util.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/util.go index 92a59b6c..548329ca 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/util.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes/util.go @@ -1,7 +1,7 @@ package volumes import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // WaitForStatus will continually poll the resource, checking for a particular diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/requests.go index 77e5de13..6f444ddd 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/requests.go @@ -1,8 +1,8 @@ package licenses import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/results.go index 698b9208..4b81b89a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/results.go @@ -3,8 +3,8 @@ package licenses import ( "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // License represents guest image license key information. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/urls.go similarity index 89% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/urls.go index 236528b5..0fffd000 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses/urls.go @@ -1,6 +1,6 @@ package licenses -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("licenses") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/requests.go index b4689211..70857418 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/requests.go @@ -1,8 +1,8 @@ package servers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/results.go index 842c0952..5d71676f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/results.go @@ -3,8 +3,8 @@ package servers import ( "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // Server represents dedicated hypervisor server information. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/urls.go index 52b823dc..324aec0a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers/urls.go @@ -1,6 +1,6 @@ package servers -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("servers") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/requests.go index bd32ee96..b9464644 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/requests.go @@ -1,8 +1,8 @@ package recordsets import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/results.go index 093a31b9..29572b13 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/results.go @@ -6,8 +6,8 @@ import ( // "log" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/urls.go similarity index 87% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/urls.go index 6350baf4..7f63a051 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets/urls.go @@ -1,6 +1,6 @@ package recordsets -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func baseURL(c *eclcloud.ServiceClient, zoneID string) string { return c.ServiceURL("zones", zoneID, "recordsets") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/requests.go index 3dd2b575..81d50651 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/requests.go @@ -1,8 +1,8 @@ package zones import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add parameters to the List request. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/results.go index 4005532c..8046ed24 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/results.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/urls.go similarity index 83% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/urls.go index 40a95b2d..ed838dce 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones/urls.go @@ -1,6 +1,6 @@ package zones -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func baseURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("zones") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/endpoint_location.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/endpoint_location.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/endpoint_location.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/endpoint_location.go index 4608f555..c914fee4 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/endpoint_location.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/endpoint_location.go @@ -1,8 +1,8 @@ package ecl import ( - "github.com/nttcom/eclcloud/v2" - tokens3 "github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens" + "github.com/nttcom/eclcloud/v3" + tokens3 "github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/errors.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/errors.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/errors.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/errors.go index 3468012f..3b749a26 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/errors.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/errors.go @@ -2,8 +2,8 @@ package ecl import ( "fmt" - "github.com/nttcom/eclcloud/v2" - tokens3 "github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens" + "github.com/nttcom/eclcloud/v3" + tokens3 "github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens" ) // ErrEndpointNotFound is the error when no suitable endpoint can be found diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/requests.go index 46c70e04..3898a56d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/requests.go @@ -1,6 +1,6 @@ package tokens -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" // Scope allows a created token to be limited to a specific domain or project. type Scope struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/results.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/results.go index d4342aea..10f54987 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/results.go @@ -1,7 +1,7 @@ package tokens import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "time" ) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/urls.go similarity index 73% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/urls.go index c81dfada..9792cc6c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens/urls.go @@ -1,6 +1,6 @@ package tokens -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func tokenURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("auth", "tokens") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/requests.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/requests.go index d2b85294..c80bfdc9 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/requests.go @@ -4,7 +4,7 @@ import ( "io" "net/http" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // Upload uploads an image file. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/results.go index 0012ff82..a227351f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/results.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // UploadResult is the result of an upload image operation. Call its ExtractErr diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/urls.go index 8b0e4c58..e66db63a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata/urls.go @@ -1,6 +1,6 @@ package imagedata -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" const ( rootPath = "images" diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/requests.go index 2f659be9..78ff19ff 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/requests.go @@ -5,8 +5,8 @@ import ( "net/url" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/results.go index 5b050fec..f373fdcf 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/results.go @@ -6,9 +6,9 @@ import ( "reflect" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/internal" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/internal" + "github.com/nttcom/eclcloud/v3/pagination" ) // Image represents an image found in the Enterprise Cloud Image service. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/types.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/types.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/types.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/types.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/urls.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/urls.go index 078f52aa..ecc40e4d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images/urls.go @@ -1,8 +1,8 @@ package images import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/utils" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/utils" "net/url" "strings" ) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/requests.go index 63c95abc..753b6821 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/requests.go @@ -1,8 +1,8 @@ package members import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/results.go index 1b5f0446..a0332648 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/results.go @@ -3,8 +3,8 @@ package members import ( "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // Member represents a member of an Image. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/urls.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/urls.go index 82150d43..53a92c6e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members/urls.go @@ -1,6 +1,6 @@ package members -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func imageMembersURL(c *eclcloud.ServiceClient, imageID string) string { return c.ServiceURL("images", imageID, "members") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/requests.go index dd5946c1..39a3149d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/requests.go @@ -1,8 +1,8 @@ package certificates import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/results.go index 2d3170ab..3d8caee3 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/results.go @@ -1,8 +1,8 @@ package certificates import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/urls.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/urls.go index 874706b4..809aca5c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates/urls.go @@ -1,7 +1,7 @@ package certificates import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/requests.go index 1992ae73..f8aa36b8 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/requests.go @@ -1,8 +1,8 @@ package health_monitors import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/results.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/results.go index fc1b20fb..782e07af 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/results.go @@ -1,8 +1,8 @@ package health_monitors import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/urls.go index c3a2c6fa..18f7b868 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors/urls.go @@ -1,7 +1,7 @@ package health_monitors import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/requests.go index 17201f33..8b89884a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/requests.go @@ -1,8 +1,8 @@ package listeners import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/results.go index 5fa0657b..f47e746e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/results.go @@ -1,8 +1,8 @@ package listeners import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/urls.go index 6e3e4ca7..41e95c56 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners/urls.go @@ -1,7 +1,7 @@ package listeners import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/requests.go index 6809ae83..1ec49cdc 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/requests.go @@ -1,8 +1,8 @@ package load_balancers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/results.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/results.go index aa34a4e0..c74315e2 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/results.go @@ -1,8 +1,8 @@ package load_balancers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/urls.go index 361bd432..3327db41 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers/urls.go @@ -1,7 +1,7 @@ package load_balancers import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/requests.go index 2c148550..b797f0ae 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/requests.go @@ -1,8 +1,8 @@ package operations import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/results.go index 0d509086..bc85c263 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/results.go @@ -1,8 +1,8 @@ package operations import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/urls.go index 36c8f39b..832aa8a3 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations/urls.go @@ -1,7 +1,7 @@ package operations import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/requests.go index 4f4bf320..e8fc321a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/requests.go @@ -1,8 +1,8 @@ package plans import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/results.go index e1b6345f..244c54de 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/results.go @@ -1,8 +1,8 @@ package plans import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/urls.go similarity index 91% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/urls.go index 13c565e3..9dd30e04 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans/urls.go @@ -1,7 +1,7 @@ package plans import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/requests.go index 1c610983..a4e8fc06 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/requests.go @@ -1,8 +1,8 @@ package policies import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/results.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/results.go index d7c8ca0e..5bf79b4c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/results.go @@ -1,8 +1,8 @@ package policies import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/urls.go index d169d788..1e7870b3 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies/urls.go @@ -1,7 +1,7 @@ package policies import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/requests.go index c2c746ae..23f10639 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/requests.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/results.go index 13e5be2f..db7906c6 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/results.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/urls.go index 1f3fc6b5..99895c9c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes/urls.go @@ -1,7 +1,7 @@ package routes import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/requests.go index d465080a..786fc01a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/requests.go @@ -1,8 +1,8 @@ package rules import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/results.go index 2dddb178..d4683053 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/results.go @@ -1,8 +1,8 @@ package rules import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/urls.go index dfc1edb8..e55da3bd 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules/urls.go @@ -1,7 +1,7 @@ package rules import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/requests.go index caea0bf2..48bd683b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/requests.go @@ -1,8 +1,8 @@ package system_updates import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/results.go index d6ca5d2e..e2c8878c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/results.go @@ -1,8 +1,8 @@ package system_updates import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/urls.go index ea52a045..982ba983 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates/urls.go @@ -1,7 +1,7 @@ package system_updates import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/requests.go index 3ae6ecd2..5c7251e6 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/requests.go @@ -1,8 +1,8 @@ package target_groups import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/results.go index 421b4dfc..083ba5e9 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/results.go @@ -1,8 +1,8 @@ package target_groups import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/urls.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/urls.go index a93301c2..8833b493 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups/urls.go @@ -1,7 +1,7 @@ package target_groups import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/requests.go index 35fb2756..acca80f4 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/requests.go @@ -1,8 +1,8 @@ package tls_policies import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) /* diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/results.go index 6ef0c358..b1499ef5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/results.go @@ -1,8 +1,8 @@ package tls_policies import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/urls.go index 1b557517..b0d49a8e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies/urls.go @@ -1,7 +1,7 @@ package tls_policies import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func rootURL(c *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/requests.go index 56cc0f96..2fa70f74 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/requests.go @@ -1,8 +1,8 @@ package common_function_gateways import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/results.go index 91751bf1..997df560 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/results.go @@ -1,8 +1,8 @@ package common_function_gateways import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/urls.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/urls.go index 27813714..22da3438 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways/urls.go @@ -1,7 +1,7 @@ package common_function_gateways import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func resourceURL(c *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/requests.go index 3939d4cc..6513f13a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/requests.go @@ -1,8 +1,8 @@ package common_function_pool import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/results.go index be4f3e2e..333e3a0e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/results.go @@ -1,8 +1,8 @@ package common_function_pool import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // CommonFunctionPool represents a Common Function Pool. See package documentation for a top-level diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/urls.go index 7a343e64..1cffd1d7 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool/urls.go @@ -1,7 +1,7 @@ package common_function_pool import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func resourceURL(c *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/requests.go index c2f4fae3..3ac78d2e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/requests.go @@ -1,8 +1,8 @@ package fic_gateways import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/results.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/results.go index da06d6b6..6f2f2e80 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/results.go @@ -1,8 +1,8 @@ package fic_gateways import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type FICGatewayPage struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/urls.go similarity index 85% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/urls.go index 083986a8..dbf6a3b7 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways/urls.go @@ -1,6 +1,6 @@ package fic_gateways -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func getURL(client *eclcloud.ServiceClient, id string) string { return client.ServiceURL("fic_gateways", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/requests.go index c759ac9a..dce7a6b6 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/requests.go @@ -1,8 +1,8 @@ package gateway_interfaces import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type ListOptsBuilder interface { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/results.go index 7d7d38e1..6b6ca65b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/results.go @@ -1,8 +1,8 @@ package gateway_interfaces import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/urls.go index da736251..c4440996 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces/urls.go @@ -1,6 +1,6 @@ package gateway_interfaces -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("gw_interfaces", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/requests.go index 679915ce..dbf1997a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/requests.go @@ -1,8 +1,8 @@ package internet_gateways import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type ListOptsBuilder interface { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/results.go index a28fbf1f..01edec25 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/results.go @@ -1,8 +1,8 @@ package internet_gateways import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/urls.go index fe60b25d..1da0d072 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways/urls.go @@ -1,6 +1,6 @@ package internet_gateways -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("internet_gateways", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/requests.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/requests.go index 373172b9..7aaa84cd 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/requests.go @@ -1,8 +1,8 @@ package internet_services import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type ListOptsBuilder interface { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/results.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/results.go index 32e6b158..681e4759 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/results.go @@ -1,8 +1,8 @@ package internet_services import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/urls.go similarity index 90% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/urls.go index 2ae50807..6cddfaf5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services/urls.go @@ -1,6 +1,6 @@ package internet_services -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("internet_services", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/requests.go index ef4bdba0..e3a3e200 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/requests.go @@ -1,8 +1,8 @@ package load_balancer_interfaces import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOpts allows the filtering and sorting of paginated collections through diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/results.go index 8f9dbc02..c9f34212 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/results.go @@ -1,8 +1,8 @@ package load_balancer_interfaces import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/urls.go index 935e5143..e9ff9533 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces/urls.go @@ -1,6 +1,6 @@ package load_balancer_interfaces -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("load_balancer_interfaces", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/requests.go index fb0d2c1c..a8436ae5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/requests.go @@ -1,8 +1,8 @@ package load_balancer_plans import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOpts allows the filtering and sorting of paginated collections through diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/results.go index 56a31758..836741f1 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/results.go @@ -1,8 +1,8 @@ package load_balancer_plans import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/urls.go similarity index 91% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/urls.go index a5fc669f..3046da82 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans/urls.go @@ -1,6 +1,6 @@ package load_balancer_plans -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("load_balancer_plans", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/requests.go index 2ce1c33e..bf456d62 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/requests.go @@ -1,8 +1,8 @@ package load_balancer_syslog_servers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOpts allows the filtering and sorting of paginated collections through diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/results.go index 38bfc712..262c3e1a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/results.go @@ -1,8 +1,8 @@ package load_balancer_syslog_servers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/urls.go index 36b4a03b..4fd634ff 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers/urls.go @@ -1,6 +1,6 @@ package load_balancer_syslog_servers -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("load_balancer_syslog_servers", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/requests.go index a1d90b8c..06dab832 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/requests.go @@ -1,8 +1,8 @@ package load_balancers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOpts allows the filtering and sorting of paginated collections through diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/results.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/results.go index 94e1f08b..3f884af2 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/results.go @@ -1,10 +1,10 @@ package load_balancers import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces" - "github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces" + "github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/urls.go index 258008c8..e39bbd40 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers/urls.go @@ -1,6 +1,6 @@ package load_balancers -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("load_balancers", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/requests.go index e0787c69..cb0f0795 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/requests.go @@ -1,8 +1,8 @@ package networks import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/results.go index d3fcc228..335ceb3e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/results.go @@ -1,8 +1,8 @@ package networks import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/urls.go index 38ebea5d..4dbf8e02 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/networks/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/networks/urls.go @@ -1,6 +1,6 @@ package networks -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("networks", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/requests.go index f7400535..1cfcce21 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/requests.go @@ -1,8 +1,8 @@ package ports import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/results.go index daec9257..c2f50c86 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/results.go @@ -1,8 +1,8 @@ package ports import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/urls.go index f852b4bf..958f39af 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/ports/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/ports/urls.go @@ -1,6 +1,6 @@ package ports -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("ports", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/requests.go index acc65ec4..a991f792 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/requests.go @@ -1,8 +1,8 @@ package public_ips import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type ListOptsBuilder interface { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/results.go index e5eeff68..98613122 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/results.go @@ -1,8 +1,8 @@ package public_ips import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/urls.go index a0f03484..7aca340c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips/urls.go @@ -1,6 +1,6 @@ package public_ips -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("public_ips", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/requests.go index 7f627aff..fef4f7d2 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/requests.go @@ -1,8 +1,8 @@ package qos_options import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/results.go index 6e856af1..4fe3c61b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/results.go @@ -1,8 +1,8 @@ package qos_options import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type QosOptionPage struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/urls.go similarity index 85% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/urls.go index bc268fd0..b651e3e7 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options/urls.go @@ -1,6 +1,6 @@ package qos_options -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func getURL(client *eclcloud.ServiceClient, id string) string { return client.ServiceURL("qos_options", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/requests.go index c355f253..aa425ee1 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/requests.go @@ -1,8 +1,8 @@ package static_routes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type ListOptsBuilder interface { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/results.go index 77eea479..b64afda3 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/results.go @@ -1,8 +1,8 @@ package static_routes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/urls.go index 3bc2a7ba..da27d180 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes/urls.go @@ -1,6 +1,6 @@ package static_routes -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("static_routes", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/requests.go index ea3f9e3a..4fc60679 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/requests.go @@ -1,8 +1,8 @@ package subnets import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/results.go index 5742760d..0bf3654b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/results.go @@ -1,8 +1,8 @@ package subnets import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/urls.go index 4465aee1..6f86bdc1 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets/urls.go @@ -1,6 +1,6 @@ package subnets -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("subnets", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go index d28cdfa3..6cc6e3cd 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/requests.go @@ -1,8 +1,8 @@ package tenant_connection_requests import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/results.go index f402f853..78cd9ba0 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/results.go @@ -1,8 +1,8 @@ package tenant_connection_requests import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // TenantConnectionRequest represents Tenant Connection Request. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go similarity index 94% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go index a3c8f35d..b04b1a8a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests/urls.go @@ -1,6 +1,6 @@ package tenant_connection_requests -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("tenant_connection_requests") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/requests.go index 83b82ac0..77a8be13 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/requests.go @@ -1,8 +1,8 @@ package tenant_connections import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/results.go index 4899b626..04926438 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/results.go @@ -1,8 +1,8 @@ package tenant_connections import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // TenantConnection represents Tenant Connection. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/urls.go index 3758695c..1d6c10a3 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections/urls.go @@ -1,6 +1,6 @@ package tenant_connections -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("tenant_connections") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/requests.go index e5fa1453..471ace09 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/requests.go @@ -1,8 +1,8 @@ package users import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // List retrieves a list of users. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/results.go index f7ca8427..a4067c60 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/results.go @@ -1,8 +1,8 @@ package users import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // User represents VPN user. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/urls.go index c4676548..8335c66b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/rca/v1/users/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/rca/v1/users/urls.go @@ -1,6 +1,6 @@ package users -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("users") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/requests.go index 037bcdd9..4ddc9b1d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/requests.go @@ -1,7 +1,7 @@ package host_based import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // GetOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/results.go index 8f8abd23..7943dd73 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/results.go @@ -1,7 +1,7 @@ package host_based import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/urls.go index 60db8baa..0cdb6926 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based/urls.go @@ -1,7 +1,7 @@ package host_based import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/requests.go index dcfe7bac..07f2216d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/requests.go @@ -1,8 +1,8 @@ package network_based_device_ha import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/results.go index 8f43889b..28db67e8 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/results.go @@ -1,8 +1,8 @@ package network_based_device_ha import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/urls.go index f5364a07..2e6b015a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha/urls.go @@ -1,7 +1,7 @@ package network_based_device_ha import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func listURL(client *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/requests.go index 2f7ab3de..5c37b030 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/requests.go @@ -1,8 +1,8 @@ package network_based_device_single import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/results.go index 02f5e007..48ded15d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/results.go @@ -1,8 +1,8 @@ package network_based_device_single import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/urls.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/urls.go index 9f7157af..1f2ce5b9 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single/urls.go @@ -3,7 +3,7 @@ package network_based_device_single import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURLPartFromDeviceType(deviceType string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/requests.go index e3a50faa..83834ded 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/requests.go @@ -1,7 +1,7 @@ package service_order_status import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // GetOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/results.go index 39cbd56a..88b8196c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/results.go @@ -1,7 +1,7 @@ package service_order_status import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/urls.go similarity index 91% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/urls.go index cac86a6a..a4d50056 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status/urls.go @@ -3,7 +3,7 @@ package service_order_status import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient, deviceType string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/requests.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/requests.go index 044ba30c..f8071df9 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/requests.go @@ -1,8 +1,8 @@ package device_interfaces import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/results.go index 46e49ad0..0da8c63f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/results.go @@ -1,8 +1,8 @@ package device_interfaces import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/urls.go similarity index 86% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/urls.go index 9f43f516..987c4d49 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces/urls.go @@ -3,7 +3,7 @@ package device_interfaces import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func listURL(client *eclcloud.ServiceClient, serverUUID string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/requests.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/requests.go index 63e6d3a3..b6f51406 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/requests.go @@ -1,8 +1,8 @@ package devices import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/results.go index f587c107..03c9ee7e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/results.go @@ -1,8 +1,8 @@ package devices import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/urls.go similarity index 79% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/urls.go index a39eae8a..da31626c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices/urls.go @@ -1,7 +1,7 @@ package devices import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func listURL(client *eclcloud.ServiceClient) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/requests.go index a221525d..d1f538e6 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/requests.go @@ -1,7 +1,7 @@ package ha_ports import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // UpdateOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/results.go index cfd06ebb..dd992f53 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/urls.go similarity index 85% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/urls.go index 08293b7f..3e54b137 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports/urls.go @@ -3,7 +3,7 @@ package ha_ports import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func updateURL(client *eclcloud.ServiceClient, hostName string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/requests.go index 291e2713..9428d5f0 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/requests.go @@ -1,7 +1,7 @@ package ports import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // UpdateOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/results.go index 73ceea94..1adf04fc 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/urls.go similarity index 87% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/urls.go index 0f7c45b6..0d53d601 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports/urls.go @@ -3,7 +3,7 @@ package ports import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func updateURL(client *eclcloud.ServiceClient, deviceType string, hostName string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/requests.go index d11e2377..913370fe 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/requests.go @@ -1,7 +1,7 @@ package processes import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // GetOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/results.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/results.go index 9ea30b19..c805e4ec 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/results.go @@ -1,7 +1,7 @@ package processes import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/urls.go similarity index 86% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/urls.go index fb9c8320..deb93d72 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes/urls.go @@ -3,7 +3,7 @@ package processes import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient, processID string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/requests.go index f2aa7598..38f053b5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/requests.go @@ -1,8 +1,8 @@ package approval_requests import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/results.go index e6884deb..4dc42750 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/results.go @@ -1,8 +1,8 @@ package approval_requests import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type Action struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/urls.go similarity index 90% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/urls.go index 447dec0e..80acd40f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests/urls.go @@ -1,6 +1,6 @@ package approval_requests -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("approval-requests") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/errors.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/errors.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/errors.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/errors.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/requests.go index 7a4b388d..6c103e08 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/requests.go @@ -1,8 +1,8 @@ package tenants import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/results.go index 475118cc..300559af 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type tenantResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/urls.go index 10753986..13114d8d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants/urls.go @@ -1,6 +1,6 @@ package tenants -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("tenants") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/requests.go index 11d11fc8..53194489 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/requests.go @@ -1,8 +1,8 @@ package users import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/results.go index 0bb23830..2b950c1b 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type userResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/urls.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/urls.go index db5029b1..8e9c4980 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/sss/v1/users/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/sss/v1/users/urls.go @@ -1,6 +1,6 @@ package users -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func listURL(client *eclcloud.ServiceClient) string { return client.ServiceURL("users") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/requests.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/requests.go index 3dea857c..35b2bd15 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/requests.go @@ -1,8 +1,8 @@ package virtualstorages import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // CreateOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/results.go index d35e19bb..4012f31e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // IPAddressPool is struct which corresponds to ip_addr_pool object. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/urls.go index 71c912be..de09fa9f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/urls.go @@ -1,6 +1,6 @@ package virtualstorages -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func createURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("virtual_storages") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/util.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/util.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/util.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/util.go index b6bc499a..b65d9e5c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages/util.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages/util.go @@ -1,7 +1,7 @@ package virtualstorages import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // WaitForStatus will continually poll the resource, checking for a particular diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/requests.go index 16c39f9e..2d40d3f5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/requests.go @@ -1,10 +1,10 @@ package volumes import ( - "github.com/nttcom/eclcloud/v2" - // "github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages" - // "github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + // "github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages" + // "github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes" + "github.com/nttcom/eclcloud/v3/pagination" ) // CreateOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/results.go index 29187202..19344ea1 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/results.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // Volume contains all the information associated with a Volume. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/urls.go similarity index 92% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/urls.go index 6cc75752..4865b34c 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/urls.go @@ -1,6 +1,6 @@ package volumes -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func createURL(c *eclcloud.ServiceClient) string { return c.ServiceURL("volumes") diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/util.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/util.go similarity index 93% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/util.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/util.go index 92a59b6c..548329ca 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes/util.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes/util.go @@ -1,7 +1,7 @@ package volumes import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // WaitForStatus will continually poll the resource, checking for a particular diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/requests.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/requests.go index 1f5db79a..5461fbed 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/requests.go @@ -1,8 +1,8 @@ package volumetypes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // Get retrieves the VolumeType with the provided ID. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/results.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/results.go index 3385760e..bad2d23f 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/results.go @@ -1,8 +1,8 @@ package volumetypes import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ExtraSpec is struct which corresponds to extra_specs object. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/urls.go similarity index 88% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/urls.go index 20129640..93967c34 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes/urls.go @@ -1,7 +1,7 @@ package volumetypes import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func getURL(client *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/utils/base_endpoint.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/utils/base_endpoint.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/utils/base_endpoint.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/utils/base_endpoint.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/utils/choose_version.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/utils/choose_version.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/utils/choose_version.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/utils/choose_version.go index 748ad1ff..09b9524d 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/utils/choose_version.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/utils/choose_version.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // Version is a supported API version, corresponding to a vN package within the appropriate service. diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/requests.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/requests.go index 0eea2ba5..50411e67 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/requests.go @@ -1,8 +1,8 @@ package appliance_plans import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOpts allows the filtering and sorting of paginated collections through diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/results.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/results.go index 1278f2ed..06a88531 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/results.go @@ -1,8 +1,8 @@ package appliance_plans import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/urls.go similarity index 91% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/urls.go index 8afe92b7..5e430b85 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans/urls.go @@ -1,6 +1,6 @@ package appliance_plans -import "github.com/nttcom/eclcloud/v2" +import "github.com/nttcom/eclcloud/v3" func resourceURL(c *eclcloud.ServiceClient, id string) string { return c.ServiceURL("virtual_network_appliance_plans", id) diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/doc.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/requests.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/requests.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/requests.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/requests.go index e5cb166d..65debde5 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/requests.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/requests.go @@ -1,8 +1,8 @@ package appliances import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) // ListOptsBuilder allows extensions to add additional parameters to the diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/results.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/results.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/results.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/results.go index 312f7871..05def8a2 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/results.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/results.go @@ -1,8 +1,8 @@ package appliances import ( - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/pagination" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/pagination" ) type commonResult struct { diff --git a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/urls.go b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/urls.go similarity index 95% rename from vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/urls.go rename to vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/urls.go index 3665569c..2dd749df 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances/urls.go +++ b/vendor/github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances/urls.go @@ -1,7 +1,7 @@ package appliances import ( - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) func resourceURL(c *eclcloud.ServiceClient, id string) string { diff --git a/vendor/github.com/nttcom/eclcloud/v2/endpoint_search.go b/vendor/github.com/nttcom/eclcloud/v3/endpoint_search.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/endpoint_search.go rename to vendor/github.com/nttcom/eclcloud/v3/endpoint_search.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/errors.go b/vendor/github.com/nttcom/eclcloud/v3/errors.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/errors.go rename to vendor/github.com/nttcom/eclcloud/v3/errors.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/internal/pkg.go b/vendor/github.com/nttcom/eclcloud/v3/internal/pkg.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/internal/pkg.go rename to vendor/github.com/nttcom/eclcloud/v3/internal/pkg.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/internal/util.go b/vendor/github.com/nttcom/eclcloud/v3/internal/util.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/internal/util.go rename to vendor/github.com/nttcom/eclcloud/v3/internal/util.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/pagination/http.go b/vendor/github.com/nttcom/eclcloud/v3/pagination/http.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/pagination/http.go rename to vendor/github.com/nttcom/eclcloud/v3/pagination/http.go index 66d53e05..56cc6fbe 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/pagination/http.go +++ b/vendor/github.com/nttcom/eclcloud/v3/pagination/http.go @@ -2,7 +2,7 @@ package pagination import ( "encoding/json" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "io/ioutil" "net/http" "net/url" diff --git a/vendor/github.com/nttcom/eclcloud/v2/pagination/linked.go b/vendor/github.com/nttcom/eclcloud/v3/pagination/linked.go similarity index 98% rename from vendor/github.com/nttcom/eclcloud/v2/pagination/linked.go rename to vendor/github.com/nttcom/eclcloud/v3/pagination/linked.go index 67832a29..201006f6 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/pagination/linked.go +++ b/vendor/github.com/nttcom/eclcloud/v3/pagination/linked.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" ) // LinkedPageBase may be embedded to implement a page that provides navigational "Next" and "Previous" links within its result. diff --git a/vendor/github.com/nttcom/eclcloud/v2/pagination/marker.go b/vendor/github.com/nttcom/eclcloud/v3/pagination/marker.go similarity index 97% rename from vendor/github.com/nttcom/eclcloud/v2/pagination/marker.go rename to vendor/github.com/nttcom/eclcloud/v3/pagination/marker.go index a7cd8ec2..7721cf0e 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/pagination/marker.go +++ b/vendor/github.com/nttcom/eclcloud/v3/pagination/marker.go @@ -2,7 +2,7 @@ package pagination import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "reflect" ) diff --git a/vendor/github.com/nttcom/eclcloud/v2/pagination/pager.go b/vendor/github.com/nttcom/eclcloud/v3/pagination/pager.go similarity index 99% rename from vendor/github.com/nttcom/eclcloud/v2/pagination/pager.go rename to vendor/github.com/nttcom/eclcloud/v3/pagination/pager.go index 6dfa405a..71f95993 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/pagination/pager.go +++ b/vendor/github.com/nttcom/eclcloud/v3/pagination/pager.go @@ -3,7 +3,7 @@ package pagination import ( "errors" "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "net/http" "reflect" "strings" diff --git a/vendor/github.com/nttcom/eclcloud/v2/pagination/pkg.go b/vendor/github.com/nttcom/eclcloud/v3/pagination/pkg.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/pagination/pkg.go rename to vendor/github.com/nttcom/eclcloud/v3/pagination/pkg.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/pagination/single.go b/vendor/github.com/nttcom/eclcloud/v3/pagination/single.go similarity index 96% rename from vendor/github.com/nttcom/eclcloud/v2/pagination/single.go rename to vendor/github.com/nttcom/eclcloud/v3/pagination/single.go index f6f144fa..e016a49a 100644 --- a/vendor/github.com/nttcom/eclcloud/v2/pagination/single.go +++ b/vendor/github.com/nttcom/eclcloud/v3/pagination/single.go @@ -2,7 +2,7 @@ package pagination import ( "fmt" - "github.com/nttcom/eclcloud/v2" + "github.com/nttcom/eclcloud/v3" "reflect" ) diff --git a/vendor/github.com/nttcom/eclcloud/v2/params.go b/vendor/github.com/nttcom/eclcloud/v3/params.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/params.go rename to vendor/github.com/nttcom/eclcloud/v3/params.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/provider_client.go b/vendor/github.com/nttcom/eclcloud/v3/provider_client.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/provider_client.go rename to vendor/github.com/nttcom/eclcloud/v3/provider_client.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/results.go b/vendor/github.com/nttcom/eclcloud/v3/results.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/results.go rename to vendor/github.com/nttcom/eclcloud/v3/results.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/service_client.go b/vendor/github.com/nttcom/eclcloud/v3/service_client.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/service_client.go rename to vendor/github.com/nttcom/eclcloud/v3/service_client.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/testhelper/convenience.go b/vendor/github.com/nttcom/eclcloud/v3/testhelper/convenience.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/testhelper/convenience.go rename to vendor/github.com/nttcom/eclcloud/v3/testhelper/convenience.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/testhelper/doc.go b/vendor/github.com/nttcom/eclcloud/v3/testhelper/doc.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/testhelper/doc.go rename to vendor/github.com/nttcom/eclcloud/v3/testhelper/doc.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/testhelper/http_responses.go b/vendor/github.com/nttcom/eclcloud/v3/testhelper/http_responses.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/testhelper/http_responses.go rename to vendor/github.com/nttcom/eclcloud/v3/testhelper/http_responses.go diff --git a/vendor/github.com/nttcom/eclcloud/v2/util.go b/vendor/github.com/nttcom/eclcloud/v3/util.go similarity index 100% rename from vendor/github.com/nttcom/eclcloud/v2/util.go rename to vendor/github.com/nttcom/eclcloud/v3/util.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 93ab28b2..9d08308d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -290,83 +290,83 @@ github.com/mitchellh/mapstructure # github.com/mitchellh/reflectwalk v1.0.0 ## explicit github.com/mitchellh/reflectwalk -# github.com/nttcom/eclcloud/v2 v2.8.0 -## explicit; go 1.13 -github.com/nttcom/eclcloud/v2 -github.com/nttcom/eclcloud/v2/ecl -github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/availabilityzones -github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/flavors -github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/keypairs -github.com/nttcom/eclcloud/v2/ecl/baremetal/v2/servers -github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/availabilityzones -github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/bootfromvolume -github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/keypairs -github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/startstop -github.com/nttcom/eclcloud/v2/ecl/compute/v2/extensions/volumeattach -github.com/nttcom/eclcloud/v2/ecl/compute/v2/flavors -github.com/nttcom/eclcloud/v2/ecl/compute/v2/images -github.com/nttcom/eclcloud/v2/ecl/compute/v2/servers -github.com/nttcom/eclcloud/v2/ecl/computevolume/v2/volumes -github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/licenses -github.com/nttcom/eclcloud/v2/ecl/dedicated_hypervisor/v1/servers -github.com/nttcom/eclcloud/v2/ecl/dns/v2/recordsets -github.com/nttcom/eclcloud/v2/ecl/dns/v2/zones -github.com/nttcom/eclcloud/v2/ecl/identity/v3/tokens -github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/imagedata -github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/images -github.com/nttcom/eclcloud/v2/ecl/imagestorage/v2/members -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/operations -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/plans -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups -github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/tls_policies -github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_gateways -github.com/nttcom/eclcloud/v2/ecl/network/v2/common_function_pool -github.com/nttcom/eclcloud/v2/ecl/network/v2/fic_gateways -github.com/nttcom/eclcloud/v2/ecl/network/v2/gateway_interfaces -github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_gateways -github.com/nttcom/eclcloud/v2/ecl/network/v2/internet_services -github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_interfaces -github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_plans -github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancer_syslog_servers -github.com/nttcom/eclcloud/v2/ecl/network/v2/load_balancers -github.com/nttcom/eclcloud/v2/ecl/network/v2/networks -github.com/nttcom/eclcloud/v2/ecl/network/v2/ports -github.com/nttcom/eclcloud/v2/ecl/network/v2/public_ips -github.com/nttcom/eclcloud/v2/ecl/network/v2/qos_options -github.com/nttcom/eclcloud/v2/ecl/network/v2/static_routes -github.com/nttcom/eclcloud/v2/ecl/network/v2/subnets -github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connection_requests -github.com/nttcom/eclcloud/v2/ecl/provider_connectivity/v2/tenant_connections -github.com/nttcom/eclcloud/v2/ecl/rca/v1/users -github.com/nttcom/eclcloud/v2/ecl/security_order/v2/host_based -github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_ha -github.com/nttcom/eclcloud/v2/ecl/security_order/v2/network_based_device_single -github.com/nttcom/eclcloud/v2/ecl/security_order/v2/service_order_status -github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/device_interfaces -github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/devices -github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ha_ports -github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/ports -github.com/nttcom/eclcloud/v2/ecl/security_portal/v2/processes -github.com/nttcom/eclcloud/v2/ecl/sss/v1/approval_requests -github.com/nttcom/eclcloud/v2/ecl/sss/v1/tenants -github.com/nttcom/eclcloud/v2/ecl/sss/v1/users -github.com/nttcom/eclcloud/v2/ecl/storage/v1/virtualstorages -github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumes -github.com/nttcom/eclcloud/v2/ecl/storage/v1/volumetypes -github.com/nttcom/eclcloud/v2/ecl/utils -github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliance_plans -github.com/nttcom/eclcloud/v2/ecl/vna/v1/appliances -github.com/nttcom/eclcloud/v2/internal -github.com/nttcom/eclcloud/v2/pagination -github.com/nttcom/eclcloud/v2/testhelper +# github.com/nttcom/eclcloud/v3 v3.1.0 +## explicit; go 1.17 +github.com/nttcom/eclcloud/v3 +github.com/nttcom/eclcloud/v3/ecl +github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/availabilityzones +github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/flavors +github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/keypairs +github.com/nttcom/eclcloud/v3/ecl/baremetal/v2/servers +github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/availabilityzones +github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/bootfromvolume +github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/keypairs +github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/startstop +github.com/nttcom/eclcloud/v3/ecl/compute/v2/extensions/volumeattach +github.com/nttcom/eclcloud/v3/ecl/compute/v2/flavors +github.com/nttcom/eclcloud/v3/ecl/compute/v2/images +github.com/nttcom/eclcloud/v3/ecl/compute/v2/servers +github.com/nttcom/eclcloud/v3/ecl/computevolume/v2/volumes +github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/licenses +github.com/nttcom/eclcloud/v3/ecl/dedicated_hypervisor/v1/servers +github.com/nttcom/eclcloud/v3/ecl/dns/v2/recordsets +github.com/nttcom/eclcloud/v3/ecl/dns/v2/zones +github.com/nttcom/eclcloud/v3/ecl/identity/v3/tokens +github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/imagedata +github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/images +github.com/nttcom/eclcloud/v3/ecl/imagestorage/v2/members +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/operations +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/plans +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups +github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/tls_policies +github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_gateways +github.com/nttcom/eclcloud/v3/ecl/network/v2/common_function_pool +github.com/nttcom/eclcloud/v3/ecl/network/v2/fic_gateways +github.com/nttcom/eclcloud/v3/ecl/network/v2/gateway_interfaces +github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_gateways +github.com/nttcom/eclcloud/v3/ecl/network/v2/internet_services +github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_interfaces +github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_plans +github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancer_syslog_servers +github.com/nttcom/eclcloud/v3/ecl/network/v2/load_balancers +github.com/nttcom/eclcloud/v3/ecl/network/v2/networks +github.com/nttcom/eclcloud/v3/ecl/network/v2/ports +github.com/nttcom/eclcloud/v3/ecl/network/v2/public_ips +github.com/nttcom/eclcloud/v3/ecl/network/v2/qos_options +github.com/nttcom/eclcloud/v3/ecl/network/v2/static_routes +github.com/nttcom/eclcloud/v3/ecl/network/v2/subnets +github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connection_requests +github.com/nttcom/eclcloud/v3/ecl/provider_connectivity/v2/tenant_connections +github.com/nttcom/eclcloud/v3/ecl/rca/v1/users +github.com/nttcom/eclcloud/v3/ecl/security_order/v3/host_based +github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_ha +github.com/nttcom/eclcloud/v3/ecl/security_order/v3/network_based_device_single +github.com/nttcom/eclcloud/v3/ecl/security_order/v3/service_order_status +github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/device_interfaces +github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/devices +github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ha_ports +github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/ports +github.com/nttcom/eclcloud/v3/ecl/security_portal/v3/processes +github.com/nttcom/eclcloud/v3/ecl/sss/v1/approval_requests +github.com/nttcom/eclcloud/v3/ecl/sss/v1/tenants +github.com/nttcom/eclcloud/v3/ecl/sss/v1/users +github.com/nttcom/eclcloud/v3/ecl/storage/v1/virtualstorages +github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumes +github.com/nttcom/eclcloud/v3/ecl/storage/v1/volumetypes +github.com/nttcom/eclcloud/v3/ecl/utils +github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliance_plans +github.com/nttcom/eclcloud/v3/ecl/vna/v1/appliances +github.com/nttcom/eclcloud/v3/internal +github.com/nttcom/eclcloud/v3/pagination +github.com/nttcom/eclcloud/v3/testhelper # github.com/oklog/run v1.0.0 ## explicit github.com/oklog/run diff --git a/website/docs/r/security_host_based_v2.markdown b/website/docs/r/security_host_based_v3.markdown similarity index 73% rename from website/docs/r/security_host_based_v2.markdown rename to website/docs/r/security_host_based_v3.markdown index c111d3c6..a9a43311 100644 --- a/website/docs/r/security_host_based_v2.markdown +++ b/website/docs/r/security_host_based_v3.markdown @@ -1,21 +1,21 @@ --- layout: "ecl" -page_title: "Enterprise Cloud: ecl_security_host_based_v2" -sidebar_current: "docs-ecl-security-host_based-v2" +page_title: "Enterprise Cloud: ecl_security_host_based_v3" +sidebar_current: "docs-ecl-security-host_based-v3" description: |- - Manages a V2 Host Based Security resource within Enterprise Cloud. - If you are using V1 Security Service, please install v1.13.0 of terraform-provider-ecl. + Manages a V3 Host Based Security resource within Enterprise Cloud. + If you are using V2 Security Service, please install v2.5.2 of terraform-provider-ecl. --- -# ecl\_security\_host\_based\_v2 +# ecl\_security\_host\_based\_v3 -Manages a V2 Host Based WAF Security resource within Enterprise Cloud. +Manages a V3 Host Based WAF Security resource within Enterprise Cloud. ## Example Usage ```hcl -resource "ecl_security_host_based_v2" "host_1" { +resource "ecl_security_host_based_v3" "host_1" { tenant_id = "a98123d4-3c59-4c44-ab66-ee2eb3d61edd" locale = "ja" service_order_service = "Managed Anti-Virus" diff --git a/website/docs/r/security_network_based_device_ha_v2.markdown b/website/docs/r/security_network_based_device_ha_v3.markdown similarity index 93% rename from website/docs/r/security_network_based_device_ha_v2.markdown rename to website/docs/r/security_network_based_device_ha_v3.markdown index feacb159..d32c8c7b 100644 --- a/website/docs/r/security_network_based_device_ha_v2.markdown +++ b/website/docs/r/security_network_based_device_ha_v3.markdown @@ -1,22 +1,22 @@ --- layout: "ecl" -page_title: "Enterprise Cloud: ecl_security_network_based_device_ha_v2" -sidebar_current: "docs-ecl-security-network_based_device_ha-v2" +page_title: "Enterprise Cloud: ecl_security_network_based_device_ha_v3" +sidebar_current: "docs-ecl-security-network_based_device_ha-v3" description: |- - Manages a V2 Network Based Device(HA) resource within Enterprise Cloud. - If you are using V1 Security Service, please install v1.13.0 of terraform-provider-ecl. + Manages a V3 Network Based Device(HA) resource within Enterprise Cloud. + If you are using V2 Security Service, please install v2.5.2 of terraform-provider-ecl. --- -# ecl\_security\_network\_based\_device\_ha\_v2 +# ecl\_security\_network\_based\_device\_ha\_v3 -Manages a V2 Network Based Device(HA) resource within Enterprise Cloud. +Manages a V3 Network Based Device(HA) resource within Enterprise Cloud. ## Example Usage ### Basic Device ```hcl -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "f05b9eda-f1d8-46da-b34c-0d7ee7f1e7d9" locale = "ja" operating_mode = "FW_HA" @@ -48,7 +48,7 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { - Change license_kind from 02 to 08 ```hcl -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "f05b9eda-f1d8-46da-b34c-0d7ee7f1e7d9" locale = "en" operating_mode = "UTM_HA" @@ -80,7 +80,7 @@ Note: You can use port from 4 to 7 on this device. by using actual index number in Terraform configurations. ```hcl -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "f05b9eda-f1d8-46da-b34c-0d7ee7f1e7d9" locale = "ja" operating_mode = "FW_HA" @@ -170,7 +170,7 @@ resource "ecl_security_network_based_device_ha_v2" "ha_1" { ### Detach all port from network ```hcl -resource "ecl_security_network_based_device_ha_v2" "ha_1" { +resource "ecl_security_network_based_device_ha_v3" "ha_1" { tenant_id = "f05b9eda-f1d8-46da-b34c-0d7ee7f1e7d9" locale = "ja" operating_mode = "FW_HA" diff --git a/website/docs/r/security_network_based_device_single_v2.markdown b/website/docs/r/security_network_based_device_single_v3.markdown similarity index 87% rename from website/docs/r/security_network_based_device_single_v2.markdown rename to website/docs/r/security_network_based_device_single_v3.markdown index 323306ff..75f3750d 100644 --- a/website/docs/r/security_network_based_device_single_v2.markdown +++ b/website/docs/r/security_network_based_device_single_v3.markdown @@ -1,22 +1,22 @@ --- layout: "ecl" -page_title: "Enterprise Cloud: ecl_security_network_based_device_single_v2" -sidebar_current: "docs-ecl-security-network_based_device_single-v2" +page_title: "Enterprise Cloud: ecl_security_network_based_device_single_v3" +sidebar_current: "docs-ecl-security-network_based_device_single-v3" description: |- - Manages a V2 Network Based Device(Single) resource within Enterprise Cloud. - If you are using V1 Security Service, please install v1.13.0 of terraform-provider-ecl. + Manages a V3 Network Based Device(Single) resource within Enterprise Cloud. + If you are using V2 Security Service, please install v2.5.2 of terraform-provider-ecl. --- -# ecl\_security\_network\_based\_device\_single\_v2 +# ecl\_security\_network\_based\_device\_single\_v3 -Manages a V2 Network Based Device(Single) resource within Enterprise Cloud. +Manages a V3 Network Based Device(Single) resource within Enterprise Cloud. ## Example Usage ### Basic Device ```hcl -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "ja" operating_mode = "FW" @@ -32,7 +32,7 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { - Change license_kind from 02 to 08 ```hcl -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "en" operating_mode = "UTM" @@ -48,7 +48,7 @@ Note: You can use port from 4 to 7 on this device. by using actual index number in Terraform configurations. ```hcl -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "ja" operating_mode = "FW" @@ -100,7 +100,7 @@ resource "ecl_security_network_based_device_single_v2" "device_1" { ### Detach all port from network ```hcl -resource "ecl_security_network_based_device_single_v2" "device_1" { +resource "ecl_security_network_based_device_single_v3" "device_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "ja" operating_mode = "FW" diff --git a/website/docs/r/security_network_based_waf_single_v2.markdown b/website/docs/r/security_network_based_waf_single_v3.markdown similarity index 83% rename from website/docs/r/security_network_based_waf_single_v2.markdown rename to website/docs/r/security_network_based_waf_single_v3.markdown index d2447aa5..def7a771 100644 --- a/website/docs/r/security_network_based_waf_single_v2.markdown +++ b/website/docs/r/security_network_based_waf_single_v3.markdown @@ -1,22 +1,22 @@ --- layout: "ecl" -page_title: "Enterprise Cloud: ecl_security_network_based_waf_single_v2" -sidebar_current: "docs-ecl-security-network_based_waf_single-v2" +page_title: "Enterprise Cloud: ecl_security_network_based_waf_single_v3" +sidebar_current: "docs-ecl-security-network_based_waf_single-v3" description: |- - Manages a V2 Network Based WAF(Single) resource within Enterprise Cloud. - If you are using V1 Security Service, please install v1.13.0 of terraform-provider-ecl. + Manages a V3 Network Based WAF(Single) resource within Enterprise Cloud. + If you are using V2 Security Service, please install v2.5.2 of terraform-provider-ecl. --- -# ecl\_security\_network\_based\_waf\_single\_v2 +# ecl\_security\_network\_based\_waf\_single\_v3 -Manages a V2 Network Based WAF(Single) resource within Enterprise Cloud. +Manages a V3 Network Based WAF(Single) resource within Enterprise Cloud. ## Example Usage ### Basic WAF ```hcl -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "ja" license_kind = "02" @@ -31,7 +31,7 @@ Note: WAF only has one port as port-2. in the configuration of Terraform. ```hcl -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "ja" license_kind = "02" @@ -52,7 +52,7 @@ resource "ecl_security_network_based_waf_single_v2" "waf_1" { ### Detach port 2 from network ```hcl -resource "ecl_security_network_based_waf_single_v2" "waf_1" { +resource "ecl_security_network_based_waf_single_v3" "waf_1" { tenant_id = "1e2fcdd9-bc57-4395-9f44-c38fd0d72f6e" locale = "ja" license_kind = "02" From c162961e6ffa79995ddf6df97b6c6e11ecc4ba7b Mon Sep 17 00:00:00 2001 From: "ikegami.shota" Date: Fri, 7 Jun 2024 09:29:19 +0900 Subject: [PATCH 2/5] Corrected eclcloud designation that was still v2 to v3 --- ecl/resource_ecl_mlb_certificate_v1.go | 4 ++-- ecl/resource_ecl_mlb_health_monitor_v1.go | 4 ++-- ecl/resource_ecl_mlb_listener_v1.go | 4 ++-- ...resource_ecl_mlb_load_balancer_action_v1.go | 18 +++++++++--------- ecl/resource_ecl_mlb_load_balancer_v1.go | 4 ++-- ecl/resource_ecl_mlb_policy_v1.go | 4 ++-- ecl/resource_ecl_mlb_route_v1.go | 4 ++-- ecl/resource_ecl_mlb_rule_v1.go | 4 ++-- ecl/resource_ecl_mlb_target_group_v1.go | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ecl/resource_ecl_mlb_certificate_v1.go b/ecl/resource_ecl_mlb_certificate_v1.go index 00bd3340..c74ade04 100644 --- a/ecl/resource_ecl_mlb_certificate_v1.go +++ b/ecl/resource_ecl_mlb_certificate_v1.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/certificates" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/certificates" ) func certificateFileSchemaForResource() *schema.Schema { diff --git a/ecl/resource_ecl_mlb_health_monitor_v1.go b/ecl/resource_ecl_mlb_health_monitor_v1.go index eed8b961..841a50f3 100644 --- a/ecl/resource_ecl_mlb_health_monitor_v1.go +++ b/ecl/resource_ecl_mlb_health_monitor_v1.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors" ) func resourceMLBHealthMonitorV1() *schema.Resource { diff --git a/ecl/resource_ecl_mlb_listener_v1.go b/ecl/resource_ecl_mlb_listener_v1.go index 493fbc19..be95baf2 100644 --- a/ecl/resource_ecl_mlb_listener_v1.go +++ b/ecl/resource_ecl_mlb_listener_v1.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners" ) func resourceMLBListenerV1() *schema.Resource { diff --git a/ecl/resource_ecl_mlb_load_balancer_action_v1.go b/ecl/resource_ecl_mlb_load_balancer_action_v1.go index 6abae666..fa2f59df 100644 --- a/ecl/resource_ecl_mlb_load_balancer_action_v1.go +++ b/ecl/resource_ecl_mlb_load_balancer_action_v1.go @@ -7,15 +7,15 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/health_monitors" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/listeners" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/system_updates" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/health_monitors" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/listeners" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/system_updates" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups" ) func resourceMLBLoadBalancerActionV1() *schema.Resource { diff --git a/ecl/resource_ecl_mlb_load_balancer_v1.go b/ecl/resource_ecl_mlb_load_balancer_v1.go index bb06a507..1b6ef7ed 100644 --- a/ecl/resource_ecl_mlb_load_balancer_v1.go +++ b/ecl/resource_ecl_mlb_load_balancer_v1.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/load_balancers" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/load_balancers" ) func reservedFixedIPsSchemaForResource() *schema.Schema { diff --git a/ecl/resource_ecl_mlb_policy_v1.go b/ecl/resource_ecl_mlb_policy_v1.go index a97c2859..4ea35646 100644 --- a/ecl/resource_ecl_mlb_policy_v1.go +++ b/ecl/resource_ecl_mlb_policy_v1.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/policies" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/policies" ) func resourceMLBPolicyV1() *schema.Resource { diff --git a/ecl/resource_ecl_mlb_route_v1.go b/ecl/resource_ecl_mlb_route_v1.go index 785751d3..9ae9a36c 100644 --- a/ecl/resource_ecl_mlb_route_v1.go +++ b/ecl/resource_ecl_mlb_route_v1.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/routes" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/routes" ) func resourceMLBRouteV1() *schema.Resource { diff --git a/ecl/resource_ecl_mlb_rule_v1.go b/ecl/resource_ecl_mlb_rule_v1.go index 952419e6..72d057c2 100644 --- a/ecl/resource_ecl_mlb_rule_v1.go +++ b/ecl/resource_ecl_mlb_rule_v1.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/rules" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/rules" ) func conditionsSchemaForResource() *schema.Schema { diff --git a/ecl/resource_ecl_mlb_target_group_v1.go b/ecl/resource_ecl_mlb_target_group_v1.go index 23e791a9..3035458b 100644 --- a/ecl/resource_ecl_mlb_target_group_v1.go +++ b/ecl/resource_ecl_mlb_target_group_v1.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/helper/schema" - "github.com/nttcom/eclcloud/v2" - "github.com/nttcom/eclcloud/v2/ecl/managed_load_balancer/v1/target_groups" + "github.com/nttcom/eclcloud/v3" + "github.com/nttcom/eclcloud/v3/ecl/managed_load_balancer/v1/target_groups" ) func membersSchemaForResource() *schema.Schema { From e1aaeeadb8e2f9488e87a5902fa1f8f59e1e9d97 Mon Sep 17 00:00:00 2001 From: "ikegami.shota" Date: Tue, 18 Jun 2024 14:00:41 +0900 Subject: [PATCH 3/5] Change goreleaser args --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24e7cef9..c872cdfd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: uses: goreleaser/goreleaser-action@v2 with: version: latest - args: release --rm-dist + args: release --clean env: GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b07db89ef01dc868d1265f07cad5ab4d43caadc4 Mon Sep 17 00:00:00 2001 From: "ikegami.shota" Date: Thu, 27 Jun 2024 09:47:21 +0900 Subject: [PATCH 4/5] IF-10733 Add goreleaser version specification --- .goreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index d4fd09dd..a1d32e9e 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,5 +1,6 @@ # Visit https://goreleaser.com for documentation on how to customize this # behavior. +version: 2 before: hooks: # this is just an example and not a requirement for provider building/publishing From 4b4d6d473db81fcc32c7c364fe037363d51ee419 Mon Sep 17 00:00:00 2001 From: "ikegami.shota" Date: Fri, 28 Jun 2024 14:44:16 +0900 Subject: [PATCH 5/5] Fix changelog field --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a1d32e9e..2b814acb 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -54,4 +54,4 @@ release: # If you want to manually examine the release before its live, uncomment this line: # draft: true changelog: - skip: true + disable: true