kgess-mirror/terraform-provider-ovh
1
0
Fork 0
mirror of https://github.com/ovh/terraform-provider-ovh.git synced 2026-01-11 20:07:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: additional pending state + replace deprecated functions

Browse source 
Signed-off-by: Jérémy Dubus <jeremy.dubus@ovhcloud.com>
This commit is contained in:
Jérémy Dubus 2026-01-09 08:11:12 +00:00
parent 32d86a1a05
commit 4124a2946d
No known key found for this signature in database
GPG key ID: CC43C6656E8ABA2C
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ovh/resource_cloud_project_containerregistry.go
View file

@ -1,6 +1,7 @@
package ovh
import (
"context"
"fmt"
"log"
"net/url"
@ -8,8 +9,8 @@ import (
"strings"
"time"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/ovh/go-ovh/ovh"
"github.com/ovh/terraform-provider-ovh/v2/ovh/helpers"
"github.com/ovh/terraform-provider-ovh/v2/ovh/ovhwrap"
@ -195,8 +196,8 @@ func resourceCloudProjectContainerRegistryCreate(d *schema.ResourceData, meta in
}
d.SetId(reg.Id)
log.Printf("[DEBUG] container registry created with id %s", reg.Id)
stateConf := &resource.StateChangeConf{
Pending: []string{"INSTALLING"},
stateConf := &retry.StateChangeConf{
Pending: []string{"INSTALLING", "DELIVERING"},
Target: []string{"READY"},
Refresh: waitForCloudProjectContainerRegistry(config.OVHClient, serviceName, d.Id()),
Timeout: 60 * time.Minute,
@ -204,7 +205,7 @@ func resourceCloudProjectContainerRegistryCreate(d *schema.ResourceData, meta in
MinTimeout: 3 * time.Second,
}
if _, err := stateConf.WaitForState(); err != nil {
if _, err := stateConf.WaitForStateContext(context.Background()); err != nil {
return fmt.Errorf("waiting for registry (%s): %s", d.Id(), err)
}
log.Printf("[INFO] container registry created with id %s", reg.Id)
@ -323,7 +324,7 @@ func cloudProjectContainerRegistryPlanUpdate(d *schema.ResourceData, meta interf
return fmt.Errorf("Error calling put %s:\n\t %q", endpoint, err)
}
stateConf := &resource.StateChangeConf{
stateConf := &retry.StateChangeConf{
Pending: []string{"SCALING_UP"},
Target: []string{"READY"},
Refresh: waitForCloudProjectContainerRegistry(config.OVHClient, serviceName, d.Id()),
@ -332,7 +333,7 @@ func cloudProjectContainerRegistryPlanUpdate(d *schema.ResourceData, meta interf
MinTimeout: 3 * time.Second,
}
if _, err := stateConf.WaitForState(); err != nil {
if _, err := stateConf.WaitForStateContext(context.Background()); err != nil {
return fmt.Errorf("waiting for registry (%s): %s", d.Id(), err)
}
@ -356,7 +357,7 @@ func resourceCloudProjectContainerRegistryDelete(d *schema.ResourceData, meta in
return helpers.CheckDeleted(d, err, endpoint)
}
stateConf := &resource.StateChangeConf{
stateConf := &retry.StateChangeConf{
Pending: []string{"DELETING"},
Target: []string{"DELETED", "deleted"},
Refresh: waitForCloudProjectContainerRegistry(config.OVHClient, serviceName, d.Id()),
@ -365,7 +366,7 @@ func resourceCloudProjectContainerRegistryDelete(d *schema.ResourceData, meta in
MinTimeout: 3 * time.Second,
}
if _, err := stateConf.WaitForState(); err != nil {
if _, err := stateConf.WaitForStateContext(context.Background()); err != nil {
return fmt.Errorf("Deleting container registry %s from project %s: %s", id, serviceName, err)
}
@ -374,7 +375,7 @@ func resourceCloudProjectContainerRegistryDelete(d *schema.ResourceData, meta in
return nil
}
func waitForCloudProjectContainerRegistry(c *ovhwrap.Client, serviceName, id string) resource.StateRefreshFunc {
func waitForCloudProjectContainerRegistry(c *ovhwrap.Client, serviceName, id string) retry.StateRefreshFunc {
return func() (interface{}, string, error) {
r := &CloudProjectContainerRegistry{}
endpoint := fmt.Sprintf(