Skip to content

Commit 00f0991

Browse files
CodelaxCodelax
authored
fix: add timeout values in schema when they're being used (#1320)
1 parent 8033c72 commit 00f0991

29 files changed

+106
-0
lines changed

‎scaleway/resource_apple_silicon_server.go

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func resourceScalewayAppleSiliconServer() *schema.Resource {
1818
UpdateContext: resourceScalewayAppleSiliconServerUpdate,
1919
DeleteContext: resourceScalewayAppleSiliconServerDelete,
2020
Timeouts: &schema.ResourceTimeout{
21+
Create: schema.DefaultTimeout(defaultAppleSiliconServerTimeout),
2122
Default: schema.DefaultTimeout(defaultAppleSiliconServerTimeout),
2223
},
2324
Importer: &schema.ResourceImporter{

‎scaleway/resource_baremetal_server.go

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ func resourceScalewayBaremetalServer() *schema.Resource {
2323
SchemaVersion: 0,
2424
Timeouts: &schema.ResourceTimeout{
2525
Default: schema.DefaultTimeout(defaultBaremetalServerTimeout),
26+
Create: schema.DefaultTimeout(defaultBaremetalServerTimeout),
27+
Update: schema.DefaultTimeout(defaultBaremetalServerTimeout),
28+
Delete: schema.DefaultTimeout(defaultBaremetalServerTimeout),
2629
},
2730
Schema: map[string]*schema.Schema{
2831
"name": {

‎scaleway/resource_container_namespace.go

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ func resourceScalewayContainerNamespace() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23+
Create: schema.DefaultTimeout(defaultContainerNamespaceTimeout),
24+
Read: schema.DefaultTimeout(defaultContainerNamespaceTimeout),
25+
Update: schema.DefaultTimeout(defaultContainerNamespaceTimeout),
26+
Delete: schema.DefaultTimeout(defaultContainerNamespaceTimeout),
2327
Default: schema.DefaultTimeout(defaultContainerNamespaceTimeout),
2428
},
2529
SchemaVersion: 0,

‎scaleway/resource_domain_record.go

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ func resourceScalewayDomainRecord() *schema.Resource {
2020
UpdateContext: resourceScalewayDomainRecordUpdate,
2121
DeleteContext: resourceScalewayDomainRecordDelete,
2222
Timeouts: &schema.ResourceTimeout{
23+
Create: schema.DefaultTimeout(defaultDomainRecordTimeout),
24+
Read: schema.DefaultTimeout(defaultDomainRecordTimeout),
25+
Update: schema.DefaultTimeout(defaultDomainRecordTimeout),
26+
Delete: schema.DefaultTimeout(defaultDomainRecordTimeout),
2327
Default: schema.DefaultTimeout(defaultDomainRecordTimeout),
2428
},
2529
Importer: &schema.ResourceImporter{

‎scaleway/resource_function_namespace.go

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ func resourceScalewayFunctionNamespace() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23+
Create: schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
24+
Read: schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
25+
Update: schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
26+
Delete: schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
2327
Default: schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
2428
},
2529
SchemaVersion: 0,

‎scaleway/resource_instance_private_nic.go

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ func resourceScalewayInstancePrivateNIC() *schema.Resource {
1919
StateContext: schema.ImportStatePassthroughContext,
2020
},
2121
Timeouts: &schema.ResourceTimeout{
22+
Create: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
23+
Read: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
24+
Update: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
25+
Delete: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
2226
Default: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
2327
},
2428
Schema: map[string]*schema.Schema{

‎scaleway/resource_instance_server.go

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ func resourceScalewayInstanceServer() *schema.Resource {
3030
StateContext: schema.ImportStatePassthroughContext,
3131
},
3232
Timeouts: &schema.ResourceTimeout{
33+
Create: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
34+
Read: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
35+
Update: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
36+
Delete: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
3337
Default: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
3438
},
3539
SchemaVersion: 0,

‎scaleway/resource_instance_snapshot.go

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ func resourceScalewayInstanceSnapshot() *schema.Resource {
2121
StateContext: schema.ImportStatePassthroughContext,
2222
},
2323
Timeouts: &schema.ResourceTimeout{
24+
Create: schema.DefaultTimeout(defaultInstanceSnapshotWaitTimeout),
25+
Delete: schema.DefaultTimeout(defaultInstanceSnapshotWaitTimeout),
2426
Default: schema.DefaultTimeout(defaultInstanceSnapshotWaitTimeout),
2527
},
2628
SchemaVersion: 0,

‎scaleway/resource_instance_volume.go

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ func resourceScalewayInstanceVolume() *schema.Resource {
2121
StateContext: schema.ImportStatePassthroughContext,
2222
},
2323
Timeouts: &schema.ResourceTimeout{
24+
Create: schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
25+
Update: schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
26+
Delete: schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
2427
Default: schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
2528
},
2629
Schema: map[string]*schema.Schema{

‎scaleway/resource_iot_network.go

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ func resourceScalewayIotNetwork() *schema.Resource {
1919
Importer: &schema.ResourceImporter{
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
22+
Timeouts: &schema.ResourceTimeout{
23+
Delete: schema.DefaultTimeout(defaultIoTHubTimeout),
24+
Default: schema.DefaultTimeout(defaultIoTHubTimeout),
25+
},
2226
SchemaVersion: 0,
2327
Schema: map[string]*schema.Schema{
2428
"hub_id": {

‎scaleway/resource_iot_routes.go

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ func resourceScalewayIotRoute() *schema.Resource {
1919
Importer: &schema.ResourceImporter{
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
22+
Timeouts: &schema.ResourceTimeout{
23+
Create: schema.DefaultTimeout(defaultIoTHubTimeout),
24+
Default: schema.DefaultTimeout(defaultIoTHubTimeout),
25+
},
2226
SchemaVersion: 0,
2327
Schema: map[string]*schema.Schema{
2428
"name": {

‎scaleway/resource_k8s_cluster.go

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ func resourceScalewayK8SCluster() *schema.Resource {
2323
StateContext: schema.ImportStatePassthroughContext,
2424
},
2525
Timeouts: &schema.ResourceTimeout{
26+
Create: schema.DefaultTimeout(defaultK8SClusterTimeout),
27+
Read: schema.DefaultTimeout(defaultK8SClusterTimeout),
28+
Update: schema.DefaultTimeout(defaultK8SClusterTimeout),
29+
Delete: schema.DefaultTimeout(defaultK8SClusterTimeout),
2630
Default: schema.DefaultTimeout(defaultK8SClusterTimeout),
2731
},
2832
SchemaVersion: 0,

‎scaleway/resource_k8s_pool.go

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ func resourceScalewayK8SPool() *schema.Resource {
2121
StateContext: schema.ImportStatePassthroughContext,
2222
},
2323
Timeouts: &schema.ResourceTimeout{
24+
Create: schema.DefaultTimeout(defaultK8SPoolTimeout),
25+
Update: schema.DefaultTimeout(defaultK8SPoolTimeout),
2426
Default: schema.DefaultTimeout(defaultK8SPoolTimeout),
2527
},
2628
SchemaVersion: 0,

‎scaleway/resource_lb.go

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ func resourceScalewayLb() *schema.Resource {
2828
StateContext: schema.ImportStatePassthroughContext,
2929
},
3030
Timeouts: &schema.ResourceTimeout{
31+
Create: schema.DefaultTimeout(defaultLbLbTimeout),
32+
Read: schema.DefaultTimeout(defaultLbLbTimeout),
33+
Update: schema.DefaultTimeout(defaultLbLbTimeout),
34+
Delete: schema.DefaultTimeout(defaultLbLbTimeout),
3135
Default: schema.DefaultTimeout(defaultLbLbTimeout),
3236
},
3337
SchemaVersion: 1,

‎scaleway/resource_lb_backend.go

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ func resourceScalewayLbBackend() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23+
Create: schema.DefaultTimeout(defaultLbLbTimeout),
24+
Read: schema.DefaultTimeout(defaultLbLbTimeout),
25+
Update: schema.DefaultTimeout(defaultLbLbTimeout),
26+
Delete: schema.DefaultTimeout(defaultLbLbTimeout),
2327
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2428
},
2529
SchemaVersion: 1,

‎scaleway/resource_lb_certificate.go

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ func resourceScalewayLbCertificate() *schema.Resource {
1919
DeleteContext: resourceScalewayLbCertificateDelete,
2020
SchemaVersion: 1,
2121
Timeouts: &schema.ResourceTimeout{
22+
Create: schema.DefaultTimeout(defaultLbLbTimeout),
23+
Read: schema.DefaultTimeout(defaultLbLbTimeout),
24+
Update: schema.DefaultTimeout(defaultLbLbTimeout),
25+
Delete: schema.DefaultTimeout(defaultLbLbTimeout),
2226
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2327
},
2428
StateUpgraders: []schema.StateUpgrader{

‎scaleway/resource_lb_frontend.go

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ func resourceScalewayLbFrontend() *schema.Resource {
2323
StateContext: schema.ImportStatePassthroughContext,
2424
},
2525
Timeouts: &schema.ResourceTimeout{
26+
Create: schema.DefaultTimeout(defaultLbLbTimeout),
27+
Update: schema.DefaultTimeout(defaultLbLbTimeout),
28+
Delete: schema.DefaultTimeout(defaultLbLbTimeout),
2629
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2730
},
2831
SchemaVersion: 1,

‎scaleway/resource_lb_ip.go

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ func resourceScalewayLbIP() *schema.Resource {
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
2222
Timeouts: &schema.ResourceTimeout{
23+
Read: schema.DefaultTimeout(defaultLbLbTimeout),
24+
Update: schema.DefaultTimeout(defaultLbLbTimeout),
25+
Delete: schema.DefaultTimeout(defaultLbLbTimeout),
2326
Default: schema.DefaultTimeout(defaultLbLbTimeout),
2427
},
2528
SchemaVersion: 1,

‎scaleway/resource_rdb_acl.go

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ func resourceScalewayRdbACL() *schema.Resource {
2525
StateContext: schema.ImportStatePassthroughContext,
2626
},
2727
Timeouts: &schema.ResourceTimeout{
28+
Create: schema.DefaultTimeout(defaultRdbInstanceTimeout),
29+
Read: schema.DefaultTimeout(defaultRdbInstanceTimeout),
30+
Update: schema.DefaultTimeout(defaultRdbInstanceTimeout),
31+
Delete: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2832
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2933
},
3034
SchemaVersion: 0,

‎scaleway/resource_rdb_database.go

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ func resourceScalewayRdbDatabase() *schema.Resource {
2626
StateContext: schema.ImportStatePassthroughContext,
2727
},
2828
Timeouts: &schema.ResourceTimeout{
29+
Create: schema.DefaultTimeout(defaultRdbInstanceTimeout),
30+
Delete: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2931
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
3032
},
3133
SchemaVersion: 0,

‎scaleway/resource_rdb_instance.go

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ func resourceScalewayRdbInstance() *schema.Resource {
2424
UpdateContext: resourceScalewayRdbInstanceUpdate,
2525
DeleteContext: resourceScalewayRdbInstanceDelete,
2626
Timeouts: &schema.ResourceTimeout{
27+
Create: schema.DefaultTimeout(defaultRdbInstanceTimeout),
28+
Read: schema.DefaultTimeout(defaultRdbInstanceTimeout),
29+
Update: schema.DefaultTimeout(defaultRdbInstanceTimeout),
30+
Delete: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2731
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2832
},
2933
Importer: &schema.ResourceImporter{

‎scaleway/resource_rdb_privilege.go

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func resourceScalewayRdbPrivilege() *schema.Resource {
2222
StateContext: schema.ImportStatePassthroughContext,
2323
},
2424
Timeouts: &schema.ResourceTimeout{
25+
Create: schema.DefaultTimeout(defaultRdbInstanceTimeout),
26+
Read: schema.DefaultTimeout(defaultRdbInstanceTimeout),
27+
Update: schema.DefaultTimeout(defaultRdbInstanceTimeout),
28+
Delete: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2529
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2630
},
2731
SchemaVersion: 0,

‎scaleway/resource_rdb_user.go

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func resourceScalewayRdbUser() *schema.Resource {
2222
StateContext: schema.ImportStatePassthroughContext,
2323
},
2424
Timeouts: &schema.ResourceTimeout{
25+
Create: schema.DefaultTimeout(defaultRdbInstanceTimeout),
26+
Read: schema.DefaultTimeout(defaultRdbInstanceTimeout),
27+
Update: schema.DefaultTimeout(defaultRdbInstanceTimeout),
28+
Delete: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2529
Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
2630
},
2731
SchemaVersion: 0,

‎scaleway/resource_redis_cluster.go

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ func resourceScalewayRedisCluster() *schema.Resource {
1717
UpdateContext: resourceScalewayRedisClusterUpdate,
1818
DeleteContext: resourceScalewayRedisClusterDelete,
1919
Timeouts: &schema.ResourceTimeout{
20+
Create: schema.DefaultTimeout(defaultRedisClusterTimeout),
21+
Update: schema.DefaultTimeout(defaultRedisClusterTimeout),
22+
Delete: schema.DefaultTimeout(defaultRedisClusterTimeout),
2023
Default: schema.DefaultTimeout(defaultRedisClusterTimeout),
2124
},
2225
Importer: &schema.ResourceImporter{

‎scaleway/resource_registry_namespace.go

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ func resourceScalewayRegistryNamespace() *schema.Resource {
1919
StateContext: schema.ImportStatePassthroughContext,
2020
},
2121
Timeouts: &schema.ResourceTimeout{
22+
Create: schema.DefaultTimeout(defaultRedisClusterTimeout),
23+
Read: schema.DefaultTimeout(defaultRedisClusterTimeout),
24+
Update: schema.DefaultTimeout(defaultRedisClusterTimeout),
25+
Delete: schema.DefaultTimeout(defaultRedisClusterTimeout),
2226
Default: schema.DefaultTimeout(defaultRegistryNamespaceTimeout),
2327
},
2428
SchemaVersion: 0,

‎scaleway/resource_vpc_gateway_network.go

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ func resourceScalewayVPCGatewayNetwork() *schema.Resource {
2020
Importer: &schema.ResourceImporter{
2121
StateContext: schema.ImportStatePassthroughContext,
2222
},
23+
Timeouts: &schema.ResourceTimeout{
24+
Create: schema.DefaultTimeout(defaultVPCGatewayTimeout),
25+
Read: schema.DefaultTimeout(defaultVPCGatewayTimeout),
26+
Update: schema.DefaultTimeout(defaultVPCGatewayTimeout),
27+
Delete: schema.DefaultTimeout(defaultVPCGatewayTimeout),
28+
Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
29+
},
2330
SchemaVersion: 0,
2431
Schema: map[string]*schema.Schema{
2532
"gateway_id": {

‎scaleway/resource_vpc_public_gateway.go

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ func resourceScalewayVPCPublicGateway() *schema.Resource {
1919
Importer: &schema.ResourceImporter{
2020
StateContext: schema.ImportStatePassthroughContext,
2121
},
22+
Timeouts: &schema.ResourceTimeout{
23+
Create: schema.DefaultTimeout(defaultVPCGatewayTimeout),
24+
Read: schema.DefaultTimeout(defaultVPCGatewayTimeout),
25+
Update: schema.DefaultTimeout(defaultVPCGatewayTimeout),
26+
Delete: schema.DefaultTimeout(defaultVPCGatewayTimeout),
27+
Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
28+
},
2229
SchemaVersion: 0,
2330
Schema: map[string]*schema.Schema{
2431
"name": {

‎scaleway/resource_vpc_public_gateway_dhcp_reservation.go

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ func resourceScalewayVPCPublicGatewayDHCPReservation() *schema.Resource {
2323
StateContext: schema.ImportStatePassthroughContext,
2424
},
2525
Timeouts: &schema.ResourceTimeout{
26+
Create: schema.DefaultTimeout(defaultVPCGatewayTimeout),
27+
Update: schema.DefaultTimeout(defaultVPCGatewayTimeout),
28+
Delete: schema.DefaultTimeout(defaultVPCGatewayTimeout),
2629
Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
2730
},
2831
SchemaVersion: 0,

‎scaleway/resource_vpc_public_gateway_pat_rule.go

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ func resourceScalewayVPCPublicGatewayPATRule() *schema.Resource {
2424
},
2525
SchemaVersion: 0,
2626
Timeouts: &schema.ResourceTimeout{
27+
Create: schema.DefaultTimeout(defaultVPCGatewayTimeout),
28+
Update: schema.DefaultTimeout(defaultVPCGatewayTimeout),
29+
Delete: schema.DefaultTimeout(defaultVPCGatewayTimeout),
2730
Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
2831
},
2932
Schema: map[string]*schema.Schema{

0 commit comments

Comments
 (0)