update test

Author: jremy42

internal/services/webhosting/offer_data_source.go

@@ -3,12 +3,14 @@ package webhosting
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	webhosting "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/datasource"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/dsf"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 )
 
@@ -22,11 +24,18 @@ func DataSourceOffer() *schema.Resource {
 				Description:   "Exact name of the desired offer",
 				ConflictsWith: []string{"offer_id"},
 			},
+			"control_panel": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Description:      "Name of the control panel.(Cpanel or Plesk)",
+				DiffSuppressFunc: dsf.IgnoreCase,
+				ConflictsWith:    []string{"offer_id"},
+			},
 			"offer_id": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				Description:   "ID of the desired offer",
-				ConflictsWith: []string{"name"},
+				ConflictsWith: []string{"name", "control_panel"},
 			},
 			"billing_operation_path": {
 				Computed: true,
@@ -187,7 +196,8 @@ func dataSourceOfferRead(ctx context.Context, d *schema.ResourceData, m interfac
 	var filteredOffer *webhosting.Offer
 
 	for _, offer := range res.Offers {
-		if offer.ID == d.Get("offer_id") || offer.Name == d.Get("name") {
+		cp, _ := d.Get("control_panel").(string)
+		if offer.ID == d.Get("offer_id") || (offer.Name == d.Get("name") && (cp == "" || strings.EqualFold(offer.ControlPanelName, cp))) {
 			filteredOffer = offer
 			break
 		}

internal/services/webhosting/offer_data_source_test.go

@@ -27,18 +27,10 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.scaleway_webhosting_offer.by_id", "id"),
 					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_id", "name", "professional"),
-
 					resource.TestCheckResourceAttrSet("data.scaleway_webhosting_offer.by_name", "id"),
 					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "name", "professional"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.option", "false"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.email_accounts_quota", "10"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.email_storage_quota", "5"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.databases_quota", "-1"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.hosting_storage_quota", "100"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.support_included", "true"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.v_cpu", "4"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "product.0.ram", "2"),
-					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "price", "€ 18.99"),
+					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "offer.0.name", "professional"),
+					resource.TestCheckResourceAttr("data.scaleway_webhosting_offer.by_name", "offer.0.price", "€ 18.99"),
 				),
 			},
 		},