Merge pull request #1152 from ovh/dev/adrien.pensart/PCINT-7900-storage-name-region-modifiers

amstuta · web-flow · commit 42d688c013c2 · 2025-11-17T16:24:54.000+01:00
fix(ovh_cloud_project_storage): add name and region as plan modifiers
diff --git a/ovh/data_dbaas_logs_input_engine.go b/ovh/data_dbaas_logs_input_engine.go
@@ -78,10 +78,10 @@ func dataSourceDbaasLogsInputEngineRead(d *schema.ResourceData, meta interface{}
 		}
 
 		match := true
-		if nameFilter != nil && strings.ToLower(engine.Name) != strings.ToLower(*nameFilter) {
+		if nameFilter != nil && !strings.EqualFold(engine.Name, *nameFilter) {
 			match = false
 		}
-		if versionFilter != nil && strings.ToLower(engine.Version) != strings.ToLower(*versionFilter) {
+		if versionFilter != nil && !strings.EqualFold(engine.Version, *versionFilter) {
 			match = false
 		}
 		if isDeprecatedFilter != nil && engine.IsDeprecated != *isDeprecatedFilter {
diff --git a/ovh/data_dbaas_logs_output_graylog_stream.go b/ovh/data_dbaas_logs_output_graylog_stream.go
@@ -183,7 +183,7 @@ func dataSourceDbaasLogsOutputGraylogStreamRead(ctx context.Context, d *schema.R
 			strings.ToLower(titleFilter),
 		)
 
-		if strings.ToLower(stream.Title) == strings.ToLower(titleFilter) {
+		if strings.EqualFold(stream.Title, titleFilter) {
 			streams = append(streams, stream)
 		}
 	}
diff --git a/ovh/data_dbaas_logs_output_opensearch_index.go b/ovh/data_dbaas_logs_output_opensearch_index.go
@@ -113,7 +113,7 @@ func dataSourceDbaasLogsOutputOpensearchIndexRead(ctx context.Context, d *schema
 			strings.ToLower(nameFilter),
 		)
 
-		if strings.ToLower(index.Name) == strings.ToLower(nameFilter) {
+		if strings.EqualFold(index.Name, nameFilter) {
 			indexes = append(indexes, index)
 		}
 	}
diff --git a/ovh/me_payment_mean.go b/ovh/me_payment_mean.go
@@ -14,7 +14,7 @@ var (
 
 func MePaymentMeanBankAccounts(c *ovhwrap.Client) ([]*MePaymentMeanBankAccount, error) {
 	ids := &[]int64{}
-	endpoint := fmt.Sprintf("/me/paymentMean/bankAccount")
+	endpoint := "/me/paymentMean/bankAccount"
 	if err := c.Get(endpoint, ids); err != nil {
 		return nil, fmt.Errorf("Error calling GET %s", endpoint)
 	}
@@ -39,7 +39,7 @@ func MePaymentMeanBankAccounts(c *ovhwrap.Client) ([]*MePaymentMeanBankAccount,
 
 func MePaymentMeanCreditCards(c *ovhwrap.Client) ([]*MePaymentMeanCreditCard, error) {
 	ids := &[]int64{}
-	endpoint := fmt.Sprintf("/me/paymentMean/creditCard")
+	endpoint := "/me/paymentMean/creditCard"
 	if err := c.Get(endpoint, ids); err != nil {
 		return nil, fmt.Errorf("Error calling GET %s", endpoint)
 	}
@@ -64,7 +64,7 @@ func MePaymentMeanCreditCards(c *ovhwrap.Client) ([]*MePaymentMeanCreditCard, er
 
 func MePaymentMeanPaypals(c *ovhwrap.Client) ([]*MePaymentMeanPaypal, error) {
 	ids := &[]int64{}
-	endpoint := fmt.Sprintf("/me/paymentMean/paypal")
+	endpoint := "/me/paymentMean/paypal"
 	if err := c.Get(endpoint, ids); err != nil {
 		return nil, fmt.Errorf("Error calling GET %s", endpoint)
 	}
diff --git a/ovh/notification_email.go b/ovh/notification_email.go
@@ -12,7 +12,7 @@ func notificationEmailSortedIds(config *Config) ([]int64, error) {
 	log.Printf("[DEBUG] Will read notification emails ids")
 	res := []int64{}
 
-	endpoint := fmt.Sprintf("/me/notification/email/history")
+	endpoint := "/me/notification/email/history"
 	if err := config.OVHClient.Get(endpoint, &res); err != nil {
 		return nil, fmt.Errorf("calling Get %s:\n\t %q", endpoint, err)
 	}
diff --git a/ovh/order_cart.go b/ovh/order_cart.go
@@ -530,9 +530,7 @@ func orderCartCreate(meta interface{}, params *OrderCartCreateOpts, assign bool)
 	r := &OrderCart{}
 
 	log.Printf("[DEBUG] Will create order cart: %v", params)
-	endpoint := fmt.Sprintf(
-		"/order/cart",
-	)
+	endpoint := "/order/cart"
 
 	err := config.OVHClient.Post(endpoint, params, r)
 	if err != nil {
diff --git a/ovh/resource_cloud_project_containerregistry_ip_restrictions_management.go b/ovh/resource_cloud_project_containerregistry_ip_restrictions_management.go
@@ -1,7 +1,6 @@
 package ovh
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"net"
@@ -47,7 +46,7 @@ func resourceCloudProjectContainerRegistryIPRestrictionsManagement() *schema.Res
 						ipRestriction := ipRestrictionInterface.(map[string]interface{})
 
 						if ipRestriction["ip_block"] == nil {
-							return nil, []error{errors.New(fmt.Sprintf("ipBlock attribute is mandatory for ip_restrictions: %s", path))}
+							return nil, []error{fmt.Errorf("ipBlock attribute is mandatory for ip_restrictions: %s", path)}
 						}
 
 						ipBlockString := ipRestriction["ip_block"].(string)
diff --git a/ovh/resource_cloud_project_containerregistry_ip_restrictions_registry.go b/ovh/resource_cloud_project_containerregistry_ip_restrictions_registry.go
@@ -1,7 +1,6 @@
 package ovh
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"net"
@@ -47,7 +46,7 @@ func resourceCloudProjectContainerRegistryIPRestrictionsRegistry() *schema.Resou
 						ipRestriction := ipRestrictionInterface.(map[string]interface{})
 
 						if ipRestriction["ip_block"] == nil {
-							return nil, []error{errors.New(fmt.Sprintf("ipBlock attribute is mandatory for ip_restrictions: %s", path))}
+							return nil, []error{fmt.Errorf("ipBlock attribute is mandatory for ip_restrictions: %s", path)}
 						}
 
 						ipBlockString := ipRestriction["ip_block"].(string)
diff --git a/ovh/resource_cloud_project_kube_nodepool.go b/ovh/resource_cloud_project_kube_nodepool.go
@@ -1,7 +1,6 @@
 package ovh
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"strings"
@@ -227,11 +226,11 @@ func resourceCloudProjectKubeNodePool() *schema.Resource {
 												taint := taintInterface.(map[string]interface{})
 
 												if taint["key"] == nil {
-													return nil, []error{errors.New(fmt.Sprintf("key attribute is mandatory for taint: %s", path))}
+													return nil, []error{fmt.Errorf("key attribute is mandatory for taint: %s", path)}
 												}
 
 												if taint["effect"] == nil {
-													return nil, []error{errors.New(fmt.Sprintf("effect attribute is mandatory for taint: %s", path))}
+													return nil, []error{fmt.Errorf("effect attribute is mandatory for taint: %s", path)}
 												}
 
 												effectString := taint["effect"].(string)
diff --git a/ovh/resource_cloud_project_storage_gen.go b/ovh/resource_cloud_project_storage_gen.go
diff --git a/ovh/resource_cloud_project_volume.go b/ovh/resource_cloud_project_volume.go
@@ -81,7 +81,7 @@ func (r *cloudProjectVolumeResource) Create(ctx context.Context, req resource.Cr
 	resWait, err := r.WaitForVolumeCreation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), responseData.Id.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
-			fmt.Sprintf("Error calling Operation"),
+			"Error calling Operation",
 			err.Error(),
 		)
 		return
diff --git a/ovh/resource_ip_move.go b/ovh/resource_ip_move.go
@@ -236,7 +236,7 @@ func recursiveWaitTaskFinished(d *schema.ResourceData, meta interface{}, ipTask
 	case IpTaskStatusCancelled, IpTaskStatusOvhError, IpTaskStatusCustomerError:
 		return helpers.GetNilBoolPointer(false), fmt.Errorf("could not assign IP %s to service %v as Ip task is %s", ip, opts.To, ipTask.Status)
 	}
-	timeDiff := time.Now().Sub(ipTask.StartDate)
+	timeDiff := time.Since(ipTask.StartDate)
 	if timeDiff < taskExpiresAfter {
 		log.Printf("[DEBUG] ipTask.Status is currently: %s. Waiting %d second (we allow %f more seconds for the task to complete)", ipTask.Status, waitingTimeInSecondsBeforeRefreshState, taskExpiresAfter.Seconds()-timeDiff.Seconds())
 		time.Sleep(waitingTimeInSecondsBeforeRefreshState * time.Second)
diff --git a/ovh/resource_storage_efs_share.go b/ovh/resource_storage_efs_share.go
@@ -67,7 +67,7 @@ func (r *storageEfsShareResource) Create(ctx context.Context, req resource.Creat
 	resWait, err := r.WaitForShareCreation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), responseData.Id.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
-			fmt.Sprintf("Error calling Operation"),
+			"Error calling Operation",
 			err.Error(),
 		)
 		return
diff --git a/ovh/resource_storage_efs_share_acl.go b/ovh/resource_storage_efs_share_acl.go
@@ -67,7 +67,7 @@ func (r *storageEfsShareAclResource) Create(ctx context.Context, req resource.Cr
 	resWait, err := r.WaitForAclCreation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), data.ShareId.ValueString(), responseData.Id.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
-			fmt.Sprintf("Error calling Operation"),
+			"Error calling Operation",
 			err.Error(),
 		)
 		return
diff --git a/ovh/resource_storage_efs_share_snapshot.go b/ovh/resource_storage_efs_share_snapshot.go
@@ -67,7 +67,7 @@ func (r *storageEfsShareSnapshotResource) Create(ctx context.Context, req resour
 	resWait, err := r.WaitForSnapshotCreation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), data.ShareId.ValueString(), responseData.Id.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
-			fmt.Sprintf("Error calling Operation"),
+			"Error calling Operation",
 			err.Error(),
 		)
 		return
diff --git a/ovh/types_cloud_project_kube_nodepool.go b/ovh/types_cloud_project_kube_nodepool.go
@@ -146,7 +146,7 @@ func loadNodelPoolTemplateFromResource(i interface{}) (*CloudProjectKubeNodePool
 	}
 
 	templateSet := i.(*schema.Set).List()
-	if templateSet == nil || len(templateSet) == 0 {
+	if len(templateSet) == 0 {
 		return &template, nil
 	}
 
diff --git a/ovh/types_ip.go b/ovh/types_ip.go
@@ -33,11 +33,11 @@ const (
 )
 
 type IpTask struct {
-	Comment     *string            `json:"comment;omitempty"`
-	Destination *IpServiceRoutedTo `json:"routedTo;omitempty"`
-	DoneDate    *time.Time         `json:"doneDate;omitempty"`
+	Comment     *string            `json:"comment,omitempty"`
+	Destination *IpServiceRoutedTo `json:"routedTo,omitempty"`
+	DoneDate    *time.Time         `json:"doneDate,omitempty"`
 	Function    IpTaskFunctionEnum `json:"function"`
-	LastUpdate  *time.Time         `json:"lastUpdate;omitempty"`
+	LastUpdate  *time.Time         `json:"lastUpdate,omitempty"`
 	StartDate   time.Time          `json:"startDate"`
 	Status      IpTaskStatusEnum   `json:"status"`
 	TaskId      int64              `json:"taskId"`
diff --git a/ovh/types_ip_service.go b/ovh/types_ip_service.go
@@ -73,7 +73,7 @@ func (opts *IpMoveOpts) FromResource(d *schema.ResourceData) (*IpMoveOpts, error
 
 func GetRoutedToServiceName(d *schema.ResourceData) *string {
 	routedTo := (d.Get("routed_to")).([]interface{})
-	if routedTo == nil || len(routedTo) == 0 || routedTo[0] == nil {
+	if len(routedTo) == 0 || routedTo[0] == nil {
 		return nil
 	}
 	serviceName := (routedTo[0].(map[string]interface{}))["service_name"].(string)
diff --git a/ovh/types_iploadbalancing.go b/ovh/types_iploadbalancing.go
@@ -136,7 +136,7 @@ func (opts *IpLoadbalancingFarmCreateOrUpdateOpts) FromResource(d *schema.Resour
 	opts.Zone = d.Get("zone").(string)
 
 	probe := d.Get("probe").([]interface{})
-	if probe != nil && len(probe) == 1 {
+	if len(probe) == 1 {
 		opts.Probe = (&IpLoadbalancingFarmBackendProbe{}).FromResource(d, "probe.0")
 	}
 
@@ -260,7 +260,7 @@ func (opts *IPLoadbalancingHttpRouteOpts) FromResource(d *schema.ResourceData) *
 	opts.DisplayName = helpers.GetNilStringPointerFromData(d, "display_name")
 
 	actions := d.Get("action").([]interface{})
-	if actions != nil && len(actions) == 1 {
+	if len(actions) == 1 {
 		opts.Action = *((&IPLoadbalancingHttpRouteActionOpts{}).FromResource(d, "action.0"))
 	}
 
@@ -355,7 +355,7 @@ func (opts *IPLoadbalancingTcpRouteOpts) FromResource(d *schema.ResourceData) *I
 	opts.DisplayName = helpers.GetNilStringPointerFromData(d, "display_name")
 
 	actions := d.Get("action").([]interface{})
-	if actions != nil && len(actions) == 1 {
+	if len(actions) == 1 {
 		opts.Action = *((&IPLoadbalancingTcpRouteActionOpts{}).FromResource(d, "action.0"))
 	}
 
diff --git a/ovh/types_me_order.go b/ovh/types_me_order.go
@@ -68,7 +68,7 @@ type MeOrderDetailOperationResource struct {
 
 type MeOrderPaymentOpts struct {
 	PaymentMean   string `json:"paymentMean"`
-	PaymentMeanId *int64 `json:"paymentMeanId,omitEmpty"`
+	PaymentMeanId *int64 `json:"paymentMeanId,omitempty"`
 }
 type MeOrderPaymentMethodOpts struct {
 	PaymentMethod PaymentMethod `json:"paymentMethod"`

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ func dataSourceDbaasLogsInputEngineRead(d *schema.ResourceData, meta interface{}`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`match := true`
`81`		`- if nameFilter != nil && strings.ToLower(engine.Name) != strings.ToLower(*nameFilter) {`
	`81`	`+ if nameFilter != nil && !strings.EqualFold(engine.Name, *nameFilter) {`
`82`	`82`	`match = false`
`83`	`83`	`}`
`84`		`- if versionFilter != nil && strings.ToLower(engine.Version) != strings.ToLower(*versionFilter) {`
	`84`	`+ if versionFilter != nil && !strings.EqualFold(engine.Version, *versionFilter) {`
`85`	`85`	`match = false`
`86`	`86`	`}`
`87`	`87`	`if isDeprecatedFilter != nil && engine.IsDeprecated != *isDeprecatedFilter {`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func dataSourceDbaasLogsOutputGraylogStreamRead(ctx context.Context, d *schema.R`
`183`	`183`	`strings.ToLower(titleFilter),`
`184`	`184`	`)`
`185`	`185`
`186`		`- if strings.ToLower(stream.Title) == strings.ToLower(titleFilter) {`
	`186`	`+ if strings.EqualFold(stream.Title, titleFilter) {`
`187`	`187`	`streams = append(streams, stream)`
`188`	`188`	`}`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func dataSourceDbaasLogsOutputOpensearchIndexRead(ctx context.Context, d *schema`
`113`	`113`	`strings.ToLower(nameFilter),`
`114`	`114`	`)`
`115`	`115`
`116`		`- if strings.ToLower(index.Name) == strings.ToLower(nameFilter) {`
	`116`	`+ if strings.EqualFold(index.Name, nameFilter) {`
`117`	`117`	`indexes = append(indexes, index)`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ func notificationEmailSortedIds(config *Config) ([]int64, error) {`
`12`	`12`	`log.Printf("[DEBUG] Will read notification emails ids")`
`13`	`13`	`res := []int64{}`
`14`	`14`
`15`		`- endpoint := fmt.Sprintf("/me/notification/email/history")`
	`15`	`+ endpoint := "/me/notification/email/history"`
`16`	`16`	`if err := config.OVHClient.Get(endpoint, &res); err != nil {`
`17`	`17`	`return nil, fmt.Errorf("calling Get %s:\n\t %q", endpoint, err)`
`18`	`18`	`}`