fuxp Net

.github/workflows/acceptance_test.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Build go test
         run: make test
       - name: Run acceptance tests
-        run: make testacc
+        run: make test-net
         env:
           OUTSCALE_ACCESSKEYID: ${{ secrets.OSC_ACCESS_KEY }}
           OUTSCALE_SECRETKEYID: ${{ secrets.OSC_SECRET_KEY }}

outscale/data_source_outscale_access_key_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleDataSourceAccessKey_basic(t *testing.T) {
+func TestAccOthers_DatasourceAccessKey_basic(t *testing.T) {
 	t.Parallel()
 	dataSourceName := "outscale_access_key.outscale_access_key"
 
@@ -28,7 +28,7 @@ func TestAccOutscaleDataSourceAccessKey_basic(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleDataSourceAccessKey_withFilters(t *testing.T) {
+func TestAccOthers_AccessKey_withFilters(t *testing.T) {
 	t.Parallel()
 	dataSourceName := "outscale_access_key.outscale_access_key"
 

outscale/data_source_outscale_access_keys_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleDataSourceAccessKeys_basic(t *testing.T) {
+func TestAccOthers_DataSourceAccessKeys_basic(t *testing.T) {
 	t.Parallel()
 	dataSourceName := "data.outscale_access_keys.outscale_access_key"
 
@@ -25,7 +25,7 @@ func TestAccOutscaleDataSourceAccessKeys_basic(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleDataSourceAccessKeys_withFilters(t *testing.T) {
+func TestAccOthers_DataSourceAccessKeys_withFilters(t *testing.T) {
 	t.Parallel()
 	dataSourceName := "data.outscale_access_keys.outscale_access_key"
 
@@ -49,7 +49,7 @@ func testAccClientAccessKeysDataSourceBasic() string {
 		resource "outscale_access_key" "outscale_access_key" {}
 
 		data "outscale_access_keys" "outscale_access_key" {
-			access_key_ids = ["${outscale_access_key.outscale_access_key.id}"]
+			access_key_ids = [outscale_access_key.outscale_access_key.id]
 		}
 	`
 }
@@ -61,7 +61,7 @@ func testAccClientAccessKeysDataSourceWithFilters() string {
 		data "outscale_access_keys" "outscale_access_key" {
 			filter {
 				name = "access_key_ids"
-				values = ["${outscale_access_key.outscale_access_key.id}"]
+				values = [outscale_access_key.outscale_access_key.id]
 			}
 		}
 	`

outscale/data_source_outscale_account_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAccount_basic(t *testing.T) {
+func TestAccOthers_DataSourceAccount_basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {

outscale/data_source_outscale_accounts_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAccounts_basic(t *testing.T) {
+func TestAccOthers_DataSourceAccounts_basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {

outscale/data_source_outscale_api_access_rule_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataOutscaleOAPIApiAccessRule_basic(t *testing.T) {
+func TestAccOthers_DataOutscaleOAPIApiAccessRule_basic(t *testing.T) {
 	t.Parallel()
 	resourceName := "outscale_api_access_rule.rule_data"
 
@@ -78,15 +78,15 @@ resource "outscale_ca" "ca_rule" {
 }
 
 resource "outscale_api_access_rule" "rule_data" {
-  ca_ids      = ["${outscale_ca.ca_rule.id}"]
+  ca_ids      = [outscale_ca.ca_rule.id]
   ip_ranges   = ["192.4.2.32/16"]
   description = "test api access rule"
 }
 
 data "outscale_api_access_rule" "api_access_rule" {
   filter {
     name   = "api_access_rule_ids"
-    values = ["${outscale_api_access_rule.rule_data.id}"]
+    values = [outscale_api_access_rule.rule_data.id]
   }
 
   filter {

outscale/data_source_outscale_ca_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
 
-func TestAccDataOutscaleOAPICa_basic(t *testing.T) {
+func TestAccOthers_DataOutscaleCa_basic(t *testing.T) {
 	resourceName := "outscale_ca.ca_test"
 
 	resource.Test(t, resource.TestCase{

outscale/data_source_outscale_cas_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
 
-func TestAccDataOutscaleOAPICas_basic(t *testing.T) {
+func TestAccOthers_DataOutscaleCas_basic(t *testing.T) {
 	resName := "outscale_ca.ca_test"
 
 	resource.Test(t, resource.TestCase{

outscale/data_source_outscale_client_gateway_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
 
-func TestAccOutscaleGatewayDatasource_basic(t *testing.T) {
+func TestAccOthers_GatewayDatasource_basic(t *testing.T) {
 	t.Parallel()
 	rBgpAsn := utils.RandIntRange(64512, 65534)
 	value := fmt.Sprintf("testacc-%s", acctest.RandString(5))
@@ -25,7 +25,7 @@ func TestAccOutscaleGatewayDatasource_basic(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleGatewayDatasource_withFilters(t *testing.T) {
+func TestAccOthers_GatewayDatasource_withFilters(t *testing.T) {
 	t.Parallel()
 	// datasourceName := "data.outscale_client_gateway.test"
 	rBgpAsn := utils.RandIntRange(64512, 65534)
@@ -42,7 +42,7 @@ func TestAccOutscaleGatewayDatasource_withFilters(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleGatewayDatasource_withFiltersNoLocalhost(t *testing.T) {
+func TestAccOthers_GatewayDatasource_withFiltersNoLocalhost(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
@@ -69,7 +69,7 @@ func testAccClientGatewayDatasourceBasic(rBgpAsn int, value string) string {
 		}
 
 		data "outscale_client_gateway" "test" {
-			client_gateway_id = "${outscale_client_gateway.foo.id}"
+			client_gateway_id = outscale_client_gateway.foo.id
 		}
 	`, rBgpAsn, value)
 }
@@ -90,7 +90,7 @@ func testAccClientGatewayDatasourceWithFilters(rBgpAsn int, value string) string
 		data "outscale_client_gateway" "test" {
 			filter {
 				name = "client_gateway_ids"
-				values = ["${outscale_client_gateway.foo.id}"]
+				values = [outscale_client_gateway.foo.id]
 			}
 		}
 	`, rBgpAsn, value)

outscale/data_source_outscale_client_gateways_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleClientGatewaysDatasource_basic(t *testing.T) {
+func TestAccOthers_ClientGatewaysDatasource_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
@@ -18,7 +18,7 @@ func TestAccOutscaleClientGatewaysDatasource_basic(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleClientGatewaysDatasource_withFilters(t *testing.T) {
+func TestAccOthers_ClientGatewaysDatasource_withFilters(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
@@ -49,7 +49,7 @@ const testAccOutscaleClientGatewaysDatasourceConfigBasic = `
 	}
 
 	data "outscale_client_gateways" "test" {
-		client_gateway_ids = ["${outscale_client_gateway.foo1.id}", "${outscale_client_gateway.foo2.id}"]
+		client_gateway_ids = [outscale_client_gateway.foo1.id, outscale_client_gateway.foo2.id]
 	}
 `
 
@@ -74,7 +74,7 @@ const testAccOutscaleClientGatewaysDatasourceConfigWithFilters = `
 	data "outscale_client_gateways" "test" {
 		filter {
 			name = "client_gateway_ids"
-			values = ["${outscale_client_gateway.foo1.id}", "${outscale_client_gateway.foo2.id}"]
+			values = [outscale_client_gateway.foo1.id, outscale_client_gateway.foo2.id]
 		}
 	}
 `

outscale/data_source_outscale_dhcp_option_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleDHCPOption_basic(t *testing.T) {
+func TestAccOthers_DHCPOption_basic(t *testing.T) {
 	t.Parallel()
 	resourceName := "outscale_dhcp_option.foo"
 	dataSourceName := "data.outscale_dhcp_option.test"
@@ -45,7 +45,7 @@ func TestAccOutscaleDHCPOption_basic(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleDHCPOption_withFilters(t *testing.T) {
+func TestAccOthers_DHCPOption_withFilters(t *testing.T) {
 	t.Parallel()
 	resourceName := "outscale_dhcp_option.foo"
 	dataSourceName := "data.outscale_dhcp_option.test"

outscale/data_source_outscale_dhcp_options_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleDHCPOptionsDatasource_basic(t *testing.T) {
+func TestAccOthers_DHCPOptionsDatasource_basic(t *testing.T) {
 	t.Parallel()
 	value := fmt.Sprintf("test-acc-value-%s", acctest.RandString(5))
 
@@ -23,7 +23,7 @@ func TestAccOutscaleDHCPOptionsDatasource_basic(t *testing.T) {
 	})
 }
 
-func TestAccOutscaleDHCPOptionsDatasource_withFilters(t *testing.T) {
+func TestAccOthers_DHCPOptionsDatasource_withFilters(t *testing.T) {
 	t.Parallel()
 	value := fmt.Sprintf("test-acc-value-%s", acctest.RandString(5))
 

outscale/data_source_outscale_flexible_gpu_catalog_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceOutscaleOAPIFlexibleGpuCatalog_basic(t *testing.T) {
+func TestAccOthers_DataSourceFlexibleGpuCatalog_basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {

outscale/data_source_outscale_flexible_gpus_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
 
-func TestAccDataSourceOutscaleOAPIFlexibleGpus_basic(t *testing.T) {
+func TestAccOthers_DataSourceFlexibleGpus_basic(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{

outscale/data_source_outscale_image_export_task_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleOAPIImageExportTaskDataSource_basic(t *testing.T) {
+func TestAccVM_withImageExportTaskDataSource_basic(t *testing.T) {
 	omi := os.Getenv("OUTSCALE_IMAGEID")
 	imageName := acctest.RandomWithPrefix("test-image-name")
 

outscale/data_source_outscale_image_export_tasks_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleOAPIImageExportTasksDataSource_basic(t *testing.T) {
+func TestAccVM_withImageExportTasksDataSource_basic(t *testing.T) {
 	omi := os.Getenv("OUTSCALE_IMAGEID")
 	imageName := acctest.RandomWithPrefix("test-image-name")
 

outscale/data_source_outscale_image_test.go

@@ -11,29 +11,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
 
-func TestAccOutscaleOAPIImageDataSource_Instance(t *testing.T) {
-	t.Parallel()
-	omi := os.Getenv("OUTSCALE_IMAGEID")
-	imageName := fmt.Sprintf("image-test-%d", acctest.RandInt())
-
-	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Providers: testAccProviders,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccCheckOutscaleOAPIImageConfigBasic(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckOutscaleOAPIImageDataSourceID("data.outscale_image.nat_ami"),
-					resource.TestCheckResourceAttr("data.outscale_image.nat_ami", "architecture", "x86_64"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccOutscaleOAPIImageDataSource_basic(t *testing.T) {
+func TestAccVM_WithImageDataSource_basic(t *testing.T) {
 	t.Parallel()
 	omi := os.Getenv("OUTSCALE_IMAGEID")
 	imageName := fmt.Sprintf("image-test-%d", acctest.RandInt())
@@ -80,34 +58,14 @@ func testAccCheckOutscaleOAPIImageDataSourceBasicConfig(omi, vmType, region, ima
 		
 		resource "outscale_image" "image" {
 			image_name = "%[4]s"
-			vm_id      = "${outscale_vm.basic.id}"
+			vm_id      = outscale_vm.basic.id
 		}
 		
 		data "outscale_image" "omi" {
 			filter {
 				name   = "image_ids"
-				values = ["${outscale_image.image.id}"]
+				values = [outscale_image.image.id]
 			}
 		}
 	`, omi, vmType, region, imageName)
 }
-
-func testAccCheckOutscaleOAPIImageConfigBasic(omi, vmType, region, imageName string) string {
-	return fmt.Sprintf(`
-		resource "outscale_vm" "basic" {
-			image_id			     = "%[1]s"
-			vm_type                  = "%[2]s"
-			keypair_name	           = "terraform-basic"
-			placement_subregion_name = "%[3]sa"
-		}
-
-		resource "outscale_image" "foo" {
-			image_name = "%[4]s"
-			vm_id      = "${outscale_vm.basic.id}"
-		}
-
-		data "outscale_image" "nat_ami" {
-			image_id = "${outscale_image.foo.id}"
-		}
-	`, omi, vmType, region, imageName)
-}

outscale/data_source_outscale_images_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
 
-func TestAccOutscaleOAPIImagesDataSource_Instance(t *testing.T) {
+func TestAccVM_WithImagesDataSource_basic(t *testing.T) {
 	t.Parallel()
 	omi := os.Getenv("OUTSCALE_IMAGEID")
 	imageName := fmt.Sprintf("image-test-%d", acctest.RandInt())
@@ -65,18 +65,18 @@ func testAccCheckOutscaleOAPIImagesDataSourceConfig(omi, vmType, region, imageNa
 
 		resource "outscale_image" "image_one" {
 			image_name = "%[4]s-one"
-			vm_id = "${outscale_vm.basic_one.id}"
+			vm_id = outscale_vm.basic_one.id
 		}
 
 		resource "outscale_image" "image_two" {
 			image_name = "%[4]s-two"
-			vm_id = "${outscale_vm.basic_two.id}"
+			vm_id = outscale_vm.basic_two.id
 		}
 
 		data "outscale_images" "nat_ami" {
 			filter {
 				name = "image_ids"
-				values = ["${outscale_image.image_one.id}", "${outscale_image.image_two.id}"]
+				values = [outscale_image.image_one.id, outscale_image.image_two.id]
 			}
 		}
 	`, omi, vmType, region, imageName)

outscale/data_source_outscale_internet_service_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccOutscaleOAPIInternetServiceDatasource_basic(t *testing.T) {
+func TestAccOthers_InternetServiceDatasource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
@@ -28,7 +28,7 @@ const testAccOutscaleOAPIInternetServiceDatasourceConfig = `
 	data "outscale_internet_service" "outscale_internet_serviced" {
 		filter {
 			name = "internet_service_ids"
-			values = ["${outscale_internet_service.outscale_internet_service.internet_service_id}"]
+			values = [outscale_internet_service.outscale_internet_service.internet_service_id]
 		}
 	}
 `