remove OAPI/Oapi from functions name

Signed-off-by: Matthias Gatto <[email protected]>
outscale · Apr 4, 2024 · 21d7730 · 21d7730
1 parent b0a5742
commit 21d7730
Show file tree

Hide file tree

Showing 183 changed files with 986 additions and 986 deletions.
diff --git a/outscale/data_source_outscale_api_access_policy_test.go b/outscale/data_source_outscale_api_access_policy_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-func TestAccDataSourceOutscaleOAPIApiAccessPolicy_basic(t *testing.T) {
+func TestAccDataSourceOutscaleApiAccessPolicy_basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
@@ -16,13 +16,13 @@ func TestAccDataSourceOutscaleOAPIApiAccessPolicy_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceOutscaleOAPIApiAccessPolicyConfig(),
+				Config: testAccDataSourceOutscaleApiAccessPolicyConfig(),
 			},
 		},
 	})
 }
 
-func testAccDataSourceOutscaleOAPIApiAccessPolicyConfig() string {
+func testAccDataSourceOutscaleApiAccessPolicyConfig() string {
 	return fmt.Sprintf(`
               data "outscale_api_access_policy" "api_access_policy" {}
 	`)

diff --git a/outscale/data_source_outscale_api_access_rule_test.go b/outscale/data_source_outscale_api_access_rule_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/outscale/terraform-provider-outscale/utils"
 )
 
-func TestAccOthers_DataOutscaleOAPIApiAccessRule_basic(t *testing.T) {
+func TestAccOthers_DataOutscaleApiAccessRule_basic(t *testing.T) {
 	t.Parallel()
 	resourceName := "outscale_api_access_rule.rule_data"
 	ca_path := os.Getenv("CA_PATH")
@@ -24,7 +24,7 @@ func TestAccOthers_DataOutscaleOAPIApiAccessRule_basic(t *testing.T) {
 		CheckDestroy: testAccDataCheckOutscaleApiAccessRuleDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataOutscaleOAPIApiAccessRuleConfig(ca_path),
+				Config: testAccDataOutscaleApiAccessRuleConfig(ca_path),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckOutscaleApiAccessRuleExists(resourceName),
 				),
@@ -71,7 +71,7 @@ func testAccDataCheckOutscaleApiAccessRuleDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccDataOutscaleOAPIApiAccessRuleConfig(path string) string {
+func testAccDataOutscaleApiAccessRuleConfig(path string) string {
 	return fmt.Sprintf(`
 resource "outscale_ca" "ca_rule" { 
    ca_pem       = file(%q)

diff --git a/outscale/data_source_outscale_api_access_rules_test.go b/outscale/data_source_outscale_api_access_rules_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/outscale/terraform-provider-outscale/utils"
 )
 
-func TestAccDataOutscaleOAPIApiAccessRules_basic(t *testing.T) {
+func TestAccDataOutscaleApiAccessRules_basic(t *testing.T) {
 	t.Parallel()
 	resourceName := "outscale_api_access_rule.rule_data"
 	resource.Test(t, resource.TestCase{
@@ -21,7 +21,7 @@ func TestAccDataOutscaleOAPIApiAccessRules_basic(t *testing.T) {
 		CheckDestroy: testAccDataCheckOutscaleApiAccessRuleDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataOutscaleOAPIApiAccessRulesConfig(),
+				Config: testAccDataOutscaleApiAccessRulesConfig(),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckOutscaleApiAccessRuleExists(resourceName),
 				),
@@ -68,7 +68,7 @@ func testAccDataCheckOutscaleApiAccessRulesDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccDataOutscaleOAPIApiAccessRulesConfig() string {
+func testAccDataOutscaleApiAccessRulesConfig() string {
 	return fmt.Sprintf(`
 resource "outscale_ca" "ca_rule" { 
    ca_pem       = file("./test-cert.pem")

diff --git a/outscale/data_source_outscale_ca.go b/outscale/data_source_outscale_ca.go
@@ -51,7 +51,7 @@ func DataSourceOutscaleCaRead(d *schema.ResourceData, meta interface{}) error {
 
 	params := oscgo.ReadCasRequest{}
 	if filtersOk {
-		params.Filters = buildOutscaleOAPIDataSourceCaFilters(filters.(*schema.Set))
+		params.Filters = buildOutscaleDataSourceCaFilters(filters.(*schema.Set))
 	}
 	var resp oscgo.ReadCasResponse
 	var err error
@@ -93,7 +93,7 @@ func DataSourceOutscaleCaRead(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func buildOutscaleOAPIDataSourceCaFilters(set *schema.Set) *oscgo.FiltersCa {
+func buildOutscaleDataSourceCaFilters(set *schema.Set) *oscgo.FiltersCa {
 	var filters oscgo.FiltersCa
 	for _, v := range set.List() {
 		m := v.(map[string]interface{})

diff --git a/outscale/data_source_outscale_ca_test.go b/outscale/data_source_outscale_ca_test.go
@@ -23,7 +23,7 @@ func TestAccOthers_DataOutscaleCa_basic(t *testing.T) {
 		CheckDestroy: testAccDataCheckOutscaleCaDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataOutscaleOAPICaConfig(ca_path),
+				Config: testAccDataOutscaleCaConfig(ca_path),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckOutscaleCaExists(resourceName),
 				),
@@ -72,7 +72,7 @@ func testAccDataCheckOutscaleCaDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccDataOutscaleOAPICaConfig(path string) string {
+func testAccDataOutscaleCaConfig(path string) string {
 	return fmt.Sprintf(`
 resource "outscale_ca" "ca_test" {
    ca_pem        = file(%q)

diff --git a/outscale/data_source_outscale_cas.go b/outscale/data_source_outscale_cas.go
@@ -51,7 +51,7 @@ func DataSourceOutscaleCasRead(d *schema.ResourceData, meta interface{}) error {
 	params := oscgo.ReadCasRequest{}
 
 	if filtersOk {
-		params.Filters = buildOutscaleOAPIDataSourceCaFilters(filters.(*schema.Set))
+		params.Filters = buildOutscaleDataSourceCaFilters(filters.(*schema.Set))
 	}
 	var resp oscgo.ReadCasResponse
 	var err error

diff --git a/outscale/data_source_outscale_cas_test.go b/outscale/data_source_outscale_cas_test.go
@@ -23,7 +23,7 @@ func TestAccOthers_DataOutscaleCas_basic(t *testing.T) {
 		CheckDestroy: testAccDataCheckOutscaleCasDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataOutscaleOAPICasConfig(ca_path),
+				Config: testAccDataOutscaleCasConfig(ca_path),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckOutscaleCaExists(resName),
 				),
@@ -72,7 +72,7 @@ func testAccDataCheckOutscaleCasDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccDataOutscaleOAPICasConfig(path string) string {
+func testAccDataOutscaleCasConfig(path string) string {
 	return fmt.Sprintf(`
 resource "outscale_ca" "ca_test" {
    ca_pem        =  file(%[1]q)

diff --git a/outscale/data_source_outscale_flexible_gpu.go b/outscale/data_source_outscale_flexible_gpu.go
@@ -72,7 +72,7 @@ func DataSourceOutscaleFlexibleGpuRead(d *schema.ResourceData, meta interface{})
 		FlexibleGpuIds: &[]string{flexID.(string)},
 	}
 
-	req.SetFilters(buildOutscaleOAPIDataSourceFlexibleGpuFilters(filters.(*schema.Set)))
+	req.SetFilters(buildOutscaleDataSourceFlexibleGpuFilters(filters.(*schema.Set)))
 
 	var resp oscgo.ReadFlexibleGpusResponse
 	var err error
@@ -122,7 +122,7 @@ func DataSourceOutscaleFlexibleGpuRead(d *schema.ResourceData, meta interface{})
 	return nil
 }
 
-func buildOutscaleOAPIDataSourceFlexibleGpuFilters(set *schema.Set) oscgo.FiltersFlexibleGpu {
+func buildOutscaleDataSourceFlexibleGpuFilters(set *schema.Set) oscgo.FiltersFlexibleGpu {
 	var filters oscgo.FiltersFlexibleGpu
 	for _, v := range set.List() {
 		m := v.(map[string]interface{})

diff --git a/outscale/data_source_outscale_flexible_gpu_catalog_test.go b/outscale/data_source_outscale_flexible_gpu_catalog_test.go
@@ -16,13 +16,13 @@ func TestAccOthers_DataSourceFlexibleGpuCatalog_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceOutscaleOAPIFlexibleGpuCatalogConfig(),
+				Config: testAccDataSourceOutscaleFlexibleGpuCatalogConfig(),
 			},
 		},
 	})
 }
 
-func testAccDataSourceOutscaleOAPIFlexibleGpuCatalogConfig() string {
+func testAccDataSourceOutscaleFlexibleGpuCatalogConfig() string {
 	return fmt.Sprintf(`
               data "outscale_flexible_gpu_catalog" "catalog-fGPU" { }
 	`)

diff --git a/outscale/data_source_outscale_flexible_gpu_test.go b/outscale/data_source_outscale_flexible_gpu_test.go
@@ -17,13 +17,13 @@ func TestAccOthers_DataSourceFlexibleGpu_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceOutscaleOAPIFlexibleGpuConfig(utils.GetRegion()),
+				Config: testAccDataSourceOutscaleFlexibleGpuConfig(utils.GetRegion()),
 			},
 		},
 	})
 }
 
-func testAccDataSourceOutscaleOAPIFlexibleGpuConfig(region string) string {
+func testAccDataSourceOutscaleFlexibleGpuConfig(region string) string {
 	return fmt.Sprintf(`
                 resource "outscale_flexible_gpu" "dataGPU" {
                         model_name             =  "nvidia-p6"

diff --git a/outscale/data_source_outscale_flexible_gpus.go b/outscale/data_source_outscale_flexible_gpus.go
@@ -73,7 +73,7 @@ func DataSourceOutscaleFlexibleGpusRead(d *schema.ResourceData, meta interface{}
 	}
 
 	req := oscgo.ReadFlexibleGpusRequest{}
-	req.SetFilters(buildOutscaleOAPIDataSourceFlexibleGpuFilters(filters.(*schema.Set)))
+	req.SetFilters(buildOutscaleDataSourceFlexibleGpuFilters(filters.(*schema.Set)))
 
 	var resp oscgo.ReadFlexibleGpusResponse
 	var err error

diff --git a/outscale/data_source_outscale_flexible_gpus_test.go b/outscale/data_source_outscale_flexible_gpus_test.go
@@ -17,13 +17,13 @@ func TestAccOthers_DataSourceFlexibleGpus_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceOutscaleOAPIFlexibleGpusConfig(utils.GetRegion()),
+				Config: testAccDataSourceOutscaleFlexibleGpusConfig(utils.GetRegion()),
 			},
 		},
 	})
 }
 
-func testAccDataSourceOutscaleOAPIFlexibleGpusConfig(region string) string {
+func testAccDataSourceOutscaleFlexibleGpusConfig(region string) string {
 	return fmt.Sprintf(`
                 resource "outscale_flexible_gpu" "fGPUS-1" {
                         model_name             =  "nvidia-p6"

diff --git a/outscale/data_source_outscale_image.go b/outscale/data_source_outscale_image.go
@@ -207,7 +207,7 @@ func DataSourceOutscaleImageRead(d *schema.ResourceData, meta interface{}) error
 
 	filtersReq := &oscgo.FiltersImage{}
 	if filtersOk {
-		filtersReq = buildOutscaleOAPIDataSourceImagesFilters(filters.(*schema.Set))
+		filtersReq = buildOutscaleDataSourceImagesFilters(filters.(*schema.Set))
 	}
 	if imageIDOk {
 		filtersReq.SetImageIds([]string{imageID.(string)})

diff --git a/outscale/data_source_outscale_image_export_task_test.go b/outscale/data_source_outscale_image_export_task_test.go
@@ -25,7 +25,7 @@ func TestAccVM_withImageExportTaskDataSource_basic(t *testing.T) {
 			Providers: testAccProviders,
 			Steps: []resource.TestStep{
 				{
-					Config: testAccOutscaleOAPIImageExportTaskDataSourceConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
+					Config: testAccOutscaleImageExportTaskDataSourceConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
 					Check: resource.ComposeTestCheckFunc(
 						testAccCheckOutscaleImageExportTaskDataSourceID("data.outscale_image_export_task.test"),
 					),
@@ -52,7 +52,7 @@ func testAccCheckOutscaleImageExportTaskDataSourceID(n string) resource.TestChec
 	}
 }
 
-func testAccOutscaleOAPIImageExportTaskDataSourceConfig(omi, vmType, region, imageName string) string {
+func testAccOutscaleImageExportTaskDataSourceConfig(omi, vmType, region, imageName string) string {
 	return fmt.Sprintf(`
 	resource "outscale_vm" "basicExport" {
 		image_id	         = "%s"

diff --git a/outscale/data_source_outscale_image_export_tasks_test.go b/outscale/data_source_outscale_image_export_tasks_test.go
@@ -24,7 +24,7 @@ func TestAccVM_withImageExportTasksDataSource_basic(t *testing.T) {
 			Providers: testAccProviders,
 			Steps: []resource.TestStep{
 				{
-					Config: testAccOutscaleOAPIImageExportTasksDataSourceConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
+					Config: testAccOutscaleImageExportTasksDataSourceConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
 					Check: resource.ComposeTestCheckFunc(
 						testAccCheckOutscaleImageExportTaskDataSourceID("outscale_image_export_task.outscale_image_export_task"),
 					),
@@ -36,7 +36,7 @@ func TestAccVM_withImageExportTasksDataSource_basic(t *testing.T) {
 	}
 }
 
-func testAccOutscaleOAPIImageExportTasksDataSourceConfig(omi, vmType, region, imageName string) string {
+func testAccOutscaleImageExportTasksDataSourceConfig(omi, vmType, region, imageName string) string {
 	return fmt.Sprintf(`
 	resource "outscale_vm" "basic" {
 		image_id			      = "%s"

diff --git a/outscale/data_source_outscale_image_test.go b/outscale/data_source_outscale_image_test.go
@@ -23,16 +23,16 @@ func TestAccVM_WithImageDataSource_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckOutscaleOAPIImageDataSourceBasicConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
+				Config: testAccCheckOutscaleImageDataSourceBasicConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckOutscaleOAPIImageDataSourceID("data.outscale_image.omi"),
+					testAccCheckOutscaleImageDataSourceID("data.outscale_image.omi"),
 				),
 			},
 		},
 	})
 }
 
-func testAccCheckOutscaleOAPIImageDataSourceID(n string) resource.TestCheckFunc {
+func testAccCheckOutscaleImageDataSourceID(n string) resource.TestCheckFunc {
 	// Wait for IAM role
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -47,7 +47,7 @@ func testAccCheckOutscaleOAPIImageDataSourceID(n string) resource.TestCheckFunc
 	}
 }
 
-func testAccCheckOutscaleOAPIImageDataSourceBasicConfig(omi, vmType, region, imageName string) string {
+func testAccCheckOutscaleImageDataSourceBasicConfig(omi, vmType, region, imageName string) string {
 	return fmt.Sprintf(`
 		resource "outscale_security_group" "sg_img_data" {
 			security_group_name = "sg_imgData"

diff --git a/outscale/data_source_outscale_images.go b/outscale/data_source_outscale_images.go
@@ -223,7 +223,7 @@ func DataSourceOutscaleImagesRead(d *schema.ResourceData, meta interface{}) erro
 
 	filtersReq := &oscgo.FiltersImage{}
 	if filtersOk {
-		filtersReq = buildOutscaleOAPIDataSourceImagesFilters(filters.(*schema.Set))
+		filtersReq = buildOutscaleDataSourceImagesFilters(filters.(*schema.Set))
 	}
 	if ownersOk {
 		filtersReq.SetAccountIds([]string{aids.(string)})
@@ -281,7 +281,7 @@ func DataSourceOutscaleImagesRead(d *schema.ResourceData, meta interface{}) erro
 	})
 }
 
-func buildOutscaleOAPIDataSourceImagesFilters(set *schema.Set) *oscgo.FiltersImage {
+func buildOutscaleDataSourceImagesFilters(set *schema.Set) *oscgo.FiltersImage {
 	filters := &oscgo.FiltersImage{}
 	for _, v := range set.List() {
 		m := v.(map[string]interface{})

diff --git a/outscale/data_source_outscale_images_test.go b/outscale/data_source_outscale_images_test.go
@@ -23,16 +23,16 @@ func TestAccVM_WithImagesDataSource_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckOutscaleOAPIImagesDataSourceConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
+				Config: testAccCheckOutscaleImagesDataSourceConfig(omi, "tinav4.c2r2p2", utils.GetRegion(), imageName),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckOutscaleOAPIImagesDataSourceID("data.outscale_images.nat_ami"),
+					testAccCheckOutscaleImagesDataSourceID("data.outscale_images.nat_ami"),
 				),
 			},
 		},
 	})
 }
 
-func testAccCheckOutscaleOAPIImagesDataSourceID(n string) resource.TestCheckFunc {
+func testAccCheckOutscaleImagesDataSourceID(n string) resource.TestCheckFunc {
 	// Wait for IAM role
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -47,7 +47,7 @@ func testAccCheckOutscaleOAPIImagesDataSourceID(n string) resource.TestCheckFunc
 	}
 }
 
-func testAccCheckOutscaleOAPIImagesDataSourceConfig(omi, vmType, region, imageName string) string {
+func testAccCheckOutscaleImagesDataSourceConfig(omi, vmType, region, imageName string) string {
 	return fmt.Sprintf(`
 		resource "outscale_security_group" "sg_imgs_data" {
 			security_group_name = "sg_imgsData"

diff --git a/outscale/data_source_outscale_internet_service.go b/outscale/data_source_outscale_internet_service.go
@@ -13,9 +13,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func datasourceOutscaleOAPIInternetService() *schema.Resource {
+func datasourceOutscaleInternetService() *schema.Resource {
 	return &schema.Resource{
-		Read: datasourceOutscaleOAPIInternetServiceRead,
+		Read: datasourceOutscaleInternetServiceRead,
 		Schema: map[string]*schema.Schema{
 			"filter": dataSourceFiltersSchema(),
 			"state": {
@@ -39,7 +39,7 @@ func datasourceOutscaleOAPIInternetService() *schema.Resource {
 	}
 }
 
-func datasourceOutscaleOAPIInternetServiceRead(d *schema.ResourceData, meta interface{}) error {
+func datasourceOutscaleInternetServiceRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*OutscaleClient).OSCAPI
 
 	filters, filtersOk := d.GetOk("filter")

diff --git a/outscale/data_source_outscale_internet_service_test.go b/outscale/data_source_outscale_internet_service_test.go
@@ -13,7 +13,7 @@ func TestAccOthers_InternetServiceDatasource_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccOutscaleOAPIInternetServiceDatasourceConfig,
+				Config: testAccOutscaleInternetServiceDatasourceConfig,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.outscale_internet_service.outscale_internet_serviced", "internet_service_id"),
 				),
@@ -22,7 +22,7 @@ func TestAccOthers_InternetServiceDatasource_basic(t *testing.T) {
 	})
 }
 
-const testAccOutscaleOAPIInternetServiceDatasourceConfig = `
+const testAccOutscaleInternetServiceDatasourceConfig = `
 	resource "outscale_internet_service" "outscale_internet_service" {}
 
 	data "outscale_internet_service" "outscale_internet_serviced" {

diff --git a/outscale/data_source_outscale_internet_services.go b/outscale/data_source_outscale_internet_services.go
@@ -13,9 +13,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func datasourceOutscaleOAPIInternetServices() *schema.Resource {
+func datasourceOutscaleInternetServices() *schema.Resource {
 	return &schema.Resource{
-		Read: datasourceOutscaleOAPIInternetServicesRead,
+		Read: datasourceOutscaleInternetServicesRead,
 		Schema: map[string]*schema.Schema{
 			"filter": dataSourceFiltersSchema(),
 			"internet_service_ids": {
@@ -54,7 +54,7 @@ func datasourceOutscaleOAPIInternetServices() *schema.Resource {
 	}
 }
 
-func datasourceOutscaleOAPIInternetServicesRead(d *schema.ResourceData, meta interface{}) error {
+func datasourceOutscaleInternetServicesRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*OutscaleClient).OSCAPI
 
 	filters, filtersOk := d.GetOk("filter")