Skip to content

Commit eaeb99d

Browse files
remyleoneremyleone
committed
Fix
1 parent 5d2b8ba commit eaeb99d

25 files changed

+35
-35
lines changed

‎scaleway/helpers_account.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
const (
10-
accountSSHKeyTimeout = 1 * time.Minute
10+
defaultAccountSSHKeyTimeout = 1 * time.Minute
1111
)
1212

1313
// accountAPI returns a new account API.

‎scaleway/helpers_baremetal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
const (
1212
baremetalServerWaitForTimeout = 60 * time.Minute
1313
baremetalServerRetryFuncTimeout = baremetalServerWaitForTimeout + time.Minute // some RetryFunc are calling a WaitFor
14-
baremetalServerResourceTimeout = baremetalServerRetryFuncTimeout + time.Minute
14+
defaultBaremetalServerTimeout = baremetalServerRetryFuncTimeout + time.Minute
1515
)
1616

1717
// instanceAPIWithZone returns a new baremetal API and the zone for a Create request

‎scaleway/helpers_instance.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ const (
1717
InstanceServerStateStarted = "started"
1818
InstanceServerStateStandby = "standby"
1919

20-
InstanceServerWaitForTimeout = 10 * time.Minute
21-
InstanceVolumeDeleteTimeout = 10 * time.Minute
22-
instanceSecurityGroupTimeout = 1 * time.Minute
23-
instanceSecurityGroupRuleTimeout = 1 * time.Minute
24-
instancePlacementGroupTimeout = 1 * time.Minute
25-
instanceIPTimeout = 1 * time.Minute
20+
defaultInstanceServerWaitTimeout = 10 * time.Minute
21+
defaultInstanceVolumeDeleteTimeout = 10 * time.Minute
22+
defaultInstanceSecurityGroupTimeout = 1 * time.Minute
23+
defaultInstanceSecurityGroupRuleTimeout = 1 * time.Minute
24+
defaultInstancePlacementGroupTimeout = 1 * time.Minute
25+
defaultInstanceIPTimeout = 1 * time.Minute
2626
)
2727

2828
// instanceAPIWithZone returns a new instance API and the zone for a Create request
@@ -151,7 +151,7 @@ func reachState(ctx context.Context, instanceAPI *instance.API, zone scw.Zone, s
151151
ServerID: serverID,
152152
Action: a,
153153
Zone: zone,
154-
Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout),
154+
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
155155
})
156156
if err != nil {
157157
return err

‎scaleway/helpers_lb.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
)
1111

1212
const (
13-
LbWaitForTimeout = 10 * time.Minute
14-
defaultLbTimeout = 10 * time.Minute
13+
LbWaitForTimeout = 10 * time.Minute
14+
defaultLbLbTimeout = 10 * time.Minute
1515
)
1616

1717
// lbAPI returns a new lb API

‎scaleway/helpers_object.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
)
1414

1515
const (
16-
defaultObjectTimeout = 10 * time.Minute
16+
defaultObjectBucketTimeout = 10 * time.Minute
1717
)
1818

1919
func newS3Client(region, accessKey, secretKey string) (*s3.S3, error) {

‎scaleway/helpers_rdb.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
const (
12-
defaultRdbTimeout = 15 * time.Minute
12+
defaultRdbInstanceTimeout = 15 * time.Minute
1313
)
1414

1515
// rdbAPIWithRegion returns a new lb API and the region for a Create request

‎scaleway/helpers_registry.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
const (
12-
defaultRegistryTimeout = 5 * time.Minute
12+
defaultRegistryNamespaceTimeout = 5 * time.Minute
1313
)
1414

1515
// registryAPIWithRegion returns a new container registry API and the region.

‎scaleway/resource_account_ssh_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func resourceScalewayAccountSSKKey() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23-
Default: schema.DefaultTimeout(accountSSHKeyTimeout),
23+
Default: schema.DefaultTimeout(defaultAccountSSHKeyTimeout),
2424
},
2525
Schema: map[string]*schema.Schema{
2626
"name": {

‎scaleway/resource_baremetal_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func resourceScalewayBaremetalServer() *schema.Resource {
2222
},
2323
SchemaVersion: 0,
2424
Timeouts: &schema.ResourceTimeout{
25-
Default: schema.DefaultTimeout(baremetalServerResourceTimeout),
25+
Default: schema.DefaultTimeout(defaultBaremetalServerTimeout),
2626
},
2727
Schema: map[string]*schema.Schema{
2828
"name": {

‎scaleway/resource_instance_ip.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func resourceScalewayInstanceIP() *schema.Resource {
1818
StateContext: schema.ImportStatePassthroughContext,
1919
},
2020
Timeouts: &schema.ResourceTimeout{
21-
Default: schema.DefaultTimeout(instanceIPTimeout),
21+
Default: schema.DefaultTimeout(defaultInstanceIPTimeout),
2222
},
2323
SchemaVersion: 0,
2424
Schema: map[string]*schema.Schema{

‎scaleway/resource_instance_ip_reverse_dns.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func resourceScalewayInstanceIPReverseDNS() *schema.Resource {
1919
StateContext: schema.ImportStatePassthroughContext,
2020
},
2121
Timeouts: &schema.ResourceTimeout{
22-
Default: schema.DefaultTimeout(instanceIPTimeout),
22+
Default: schema.DefaultTimeout(defaultInstanceIPTimeout),
2323
},
2424
SchemaVersion: 0,
2525
Schema: map[string]*schema.Schema{

‎scaleway/resource_instance_placement_group.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func resourceScalewayInstancePlacementGroup() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23-
Default: schema.DefaultTimeout(instancePlacementGroupTimeout),
23+
Default: schema.DefaultTimeout(defaultInstancePlacementGroupTimeout),
2424
},
2525
SchemaVersion: 0,
2626
Schema: map[string]*schema.Schema{

‎scaleway/resource_instance_security_group.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func resourceScalewayInstanceSecurityGroup() *schema.Resource {
2222
StateContext: schema.ImportStatePassthroughContext,
2323
},
2424
Timeouts: &schema.ResourceTimeout{
25-
Default: schema.DefaultTimeout(instanceSecurityGroupTimeout),
25+
Default: schema.DefaultTimeout(defaultInstanceSecurityGroupTimeout),
2626
},
2727
Schema: map[string]*schema.Schema{
2828
"name": {

‎scaleway/resource_instance_security_group_rules.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func resourceScalewayInstanceSecurityGroupRules() *schema.Resource {
1717
StateContext: schema.ImportStatePassthroughContext,
1818
},
1919
Timeouts: &schema.ResourceTimeout{
20-
Default: schema.DefaultTimeout(instanceSecurityGroupRuleTimeout),
20+
Default: schema.DefaultTimeout(defaultInstanceSecurityGroupRuleTimeout),
2121
},
2222
Schema: map[string]*schema.Schema{
2323
"security_group_id": {

‎scaleway/resource_instance_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func resourceScalewayInstanceServer() *schema.Resource {
2626
StateContext: schema.ImportStatePassthroughContext,
2727
},
2828
Timeouts: &schema.ResourceTimeout{
29-
Default: schema.DefaultTimeout(InstanceServerWaitForTimeout),
29+
Default: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
3030
},
3131
SchemaVersion: 0,
3232
Schema: map[string]*schema.Schema{

‎scaleway/resource_instance_volume.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func resourceScalewayInstanceVolume() *schema.Resource {
2222
StateContext: schema.ImportStatePassthroughContext,
2323
},
2424
Timeouts: &schema.ResourceTimeout{
25-
Default: schema.DefaultTimeout(InstanceVolumeDeleteTimeout),
25+
Default: schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
2626
},
2727
Schema: map[string]*schema.Schema{
2828
"name": {

‎scaleway/resource_lb.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func resourceScalewayLb() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23-
Default: schema.DefaultTimeout(defaultLbTimeout),
23+
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2424
},
2525
SchemaVersion: 0,
2626
Schema: map[string]*schema.Schema{
@@ -93,7 +93,7 @@ func resourceScalewayLbCreate(ctx context.Context, d *schema.ResourceData, m int
9393
_, err = lbAPI.WaitForLb(&lb.WaitForLBRequest{
9494
Region: region,
9595
LBID: res.ID,
96-
Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout),
96+
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
9797
}, scw.WithContext(ctx))
9898
if err != nil {
9999
return diag.FromErr(err)

‎scaleway/resource_lb_backend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func resourceScalewayLbBackend() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23-
Default: schema.DefaultTimeout(defaultLbTimeout),
23+
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2424
},
2525
SchemaVersion: 0,
2626
Schema: map[string]*schema.Schema{

‎scaleway/resource_lb_certificate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func resourceScalewayLbCertificate() *schema.Resource {
1818
DeleteContext: resourceScalewayLbCertificateDelete,
1919
SchemaVersion: 0,
2020
Timeouts: &schema.ResourceTimeout{
21-
Default: schema.DefaultTimeout(defaultLbTimeout),
21+
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2222
},
2323
Schema: map[string]*schema.Schema{
2424
"lb_id": {

‎scaleway/resource_lb_frontend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func resourceScalewayLbFrontend() *schema.Resource {
2323
StateContext: schema.ImportStatePassthroughContext,
2424
},
2525
Timeouts: &schema.ResourceTimeout{
26-
Default: schema.DefaultTimeout(defaultLbTimeout),
26+
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2727
},
2828
SchemaVersion: 0,
2929
Schema: map[string]*schema.Schema{

‎scaleway/resource_lb_ip.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func resourceScalewayLbIP() *schema.Resource {
1919
StateContext: schema.ImportStatePassthroughContext,
2020
},
2121
Timeouts: &schema.ResourceTimeout{
22-
Default: schema.DefaultTimeout(defaultLbTimeout),
22+
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2323
},
2424
SchemaVersion: 0,
2525
Schema: map[string]*schema.Schema{

‎scaleway/resource_object_bucket.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func resourceScalewayObjectBucket() *schema.Resource {
1919
UpdateContext: resourceScalewayObjectBucketUpdate,
2020
DeleteContext: resourceScalewayObjectBucketDelete,
2121
Timeouts: &schema.ResourceTimeout{
22-
Default: schema.DefaultTimeout(defaultObjectTimeout),
22+
Default: schema.DefaultTimeout(defaultObjectBucketTimeout),
2323
},
2424
Importer: &schema.ResourceImporter{
2525
StateContext: schema.ImportStatePassthroughContext,

‎scaleway/resource_rdb_instance.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func resourceScalewayRdbInstance() *schema.Resource {
1818
UpdateContext: resourceScalewayRdbInstanceUpdate,
1919
DeleteContext: resourceScalewayRdbInstanceDelete,
2020
Timeouts: &schema.ResourceTimeout{
21-
Default: schema.DefaultTimeout(defaultRdbTimeout),
21+
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2222
},
2323
Importer: &schema.ResourceImporter{
2424
StateContext: schema.ImportStatePassthroughContext,
@@ -153,7 +153,7 @@ func resourceScalewayRdbInstanceCreate(ctx context.Context, d *schema.ResourceDa
153153
_, err = rdbAPI.WaitForInstance(&rdb.WaitForInstanceRequest{
154154
Region: region,
155155
InstanceID: res.ID,
156-
Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout),
156+
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
157157
}, scw.WithContext(ctx))
158158
if err != nil {
159159
return diag.FromErr(err)
@@ -270,7 +270,7 @@ func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceDa
270270
_, err = rdbAPI.WaitForInstance(&rdb.WaitForInstanceRequest{
271271
Region: region,
272272
InstanceID: ID,
273-
Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout * 3), // upgrade takes some time
273+
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout * 3), // upgrade takes some time
274274
}, scw.WithContext(ctx))
275275
if err != nil {
276276
return diag.FromErr(err)

‎scaleway/resource_rdb_user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func resourceScalewayRdbUser() *schema.Resource {
2121
StateContext: schema.ImportStatePassthroughContext,
2222
},
2323
Timeouts: &schema.ResourceTimeout{
24-
Default: schema.DefaultTimeout(defaultRdbTimeout),
24+
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2525
},
2626
SchemaVersion: 0,
2727
Schema: map[string]*schema.Schema{

‎scaleway/resource_registry_namespace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func resourceScalewayRegistryNamespace() *schema.Resource {
1919
StateContext: schema.ImportStatePassthroughContext,
2020
},
2121
Timeouts: &schema.ResourceTimeout{
22-
Default: schema.DefaultTimeout(defaultRegistryTimeout),
22+
Default: schema.DefaultTimeout(defaultRegistryNamespaceTimeout),
2323
},
2424
SchemaVersion: 0,
2525
Schema: map[string]*schema.Schema{

0 commit comments

Comments
 (0)