fix: add timeout values in schema when they're being used (#1320)

Codelax · web-flow · commit 00f099159add · 2022-06-06T18:24:10.000+02:00
diff --git a/scaleway/resource_apple_silicon_server.go b/scaleway/resource_apple_silicon_server.go
@@ -18,6 +18,7 @@ func resourceScalewayAppleSiliconServer() *schema.Resource {
 		UpdateContext: resourceScalewayAppleSiliconServerUpdate,
 		DeleteContext: resourceScalewayAppleSiliconServerDelete,
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultAppleSiliconServerTimeout),
 			Default: schema.DefaultTimeout(defaultAppleSiliconServerTimeout),
 		},
 		Importer: &schema.ResourceImporter{
diff --git a/scaleway/resource_baremetal_server.go b/scaleway/resource_baremetal_server.go
@@ -23,6 +23,9 @@ func resourceScalewayBaremetalServer() *schema.Resource {
 		SchemaVersion: 0,
 		Timeouts: &schema.ResourceTimeout{
 			Default: schema.DefaultTimeout(defaultBaremetalServerTimeout),
+			Create:  schema.DefaultTimeout(defaultBaremetalServerTimeout),
+			Update:  schema.DefaultTimeout(defaultBaremetalServerTimeout),
+			Delete:  schema.DefaultTimeout(defaultBaremetalServerTimeout),
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/scaleway/resource_container_namespace.go b/scaleway/resource_container_namespace.go
@@ -20,6 +20,10 @@ func resourceScalewayContainerNamespace() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultContainerNamespaceTimeout),
+			Read:    schema.DefaultTimeout(defaultContainerNamespaceTimeout),
+			Update:  schema.DefaultTimeout(defaultContainerNamespaceTimeout),
+			Delete:  schema.DefaultTimeout(defaultContainerNamespaceTimeout),
 			Default: schema.DefaultTimeout(defaultContainerNamespaceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_domain_record.go b/scaleway/resource_domain_record.go
@@ -20,6 +20,10 @@ func resourceScalewayDomainRecord() *schema.Resource {
 		UpdateContext: resourceScalewayDomainRecordUpdate,
 		DeleteContext: resourceScalewayDomainRecordDelete,
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultDomainRecordTimeout),
+			Read:    schema.DefaultTimeout(defaultDomainRecordTimeout),
+			Update:  schema.DefaultTimeout(defaultDomainRecordTimeout),
+			Delete:  schema.DefaultTimeout(defaultDomainRecordTimeout),
 			Default: schema.DefaultTimeout(defaultDomainRecordTimeout),
 		},
 		Importer: &schema.ResourceImporter{
diff --git a/scaleway/resource_function_namespace.go b/scaleway/resource_function_namespace.go
@@ -20,6 +20,10 @@ func resourceScalewayFunctionNamespace() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
+			Read:    schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
+			Update:  schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
+			Delete:  schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
 			Default: schema.DefaultTimeout(defaultFunctionNamespaceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_instance_private_nic.go b/scaleway/resource_instance_private_nic.go
@@ -19,6 +19,10 @@ func resourceScalewayInstancePrivateNIC() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
+			Read:    schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
+			Update:  schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
+			Delete:  schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
 			Default: schema.DefaultTimeout(defaultInstancePrivateNICWaitTimeout),
 		},
 		Schema: map[string]*schema.Schema{
diff --git a/scaleway/resource_instance_server.go b/scaleway/resource_instance_server.go
@@ -30,6 +30,10 @@ func resourceScalewayInstanceServer() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
+			Read:    schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
+			Update:  schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
+			Delete:  schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
 			Default: schema.DefaultTimeout(defaultInstanceServerWaitTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_instance_snapshot.go b/scaleway/resource_instance_snapshot.go
@@ -21,6 +21,8 @@ func resourceScalewayInstanceSnapshot() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultInstanceSnapshotWaitTimeout),
+			Delete:  schema.DefaultTimeout(defaultInstanceSnapshotWaitTimeout),
 			Default: schema.DefaultTimeout(defaultInstanceSnapshotWaitTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_instance_volume.go b/scaleway/resource_instance_volume.go
@@ -21,6 +21,9 @@ func resourceScalewayInstanceVolume() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
+			Update:  schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
+			Delete:  schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
 			Default: schema.DefaultTimeout(defaultInstanceVolumeDeleteTimeout),
 		},
 		Schema: map[string]*schema.Schema{
diff --git a/scaleway/resource_iot_network.go b/scaleway/resource_iot_network.go
@@ -19,6 +19,10 @@ func resourceScalewayIotNetwork() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Delete:  schema.DefaultTimeout(defaultIoTHubTimeout),
+			Default: schema.DefaultTimeout(defaultIoTHubTimeout),
+		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
 			"hub_id": {
diff --git a/scaleway/resource_iot_routes.go b/scaleway/resource_iot_routes.go
@@ -19,6 +19,10 @@ func resourceScalewayIotRoute() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultIoTHubTimeout),
+			Default: schema.DefaultTimeout(defaultIoTHubTimeout),
+		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/scaleway/resource_k8s_cluster.go b/scaleway/resource_k8s_cluster.go
@@ -23,6 +23,10 @@ func resourceScalewayK8SCluster() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultK8SClusterTimeout),
+			Read:    schema.DefaultTimeout(defaultK8SClusterTimeout),
+			Update:  schema.DefaultTimeout(defaultK8SClusterTimeout),
+			Delete:  schema.DefaultTimeout(defaultK8SClusterTimeout),
 			Default: schema.DefaultTimeout(defaultK8SClusterTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_k8s_pool.go b/scaleway/resource_k8s_pool.go
@@ -21,6 +21,8 @@ func resourceScalewayK8SPool() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultK8SPoolTimeout),
+			Update:  schema.DefaultTimeout(defaultK8SPoolTimeout),
 			Default: schema.DefaultTimeout(defaultK8SPoolTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_lb.go b/scaleway/resource_lb.go
@@ -28,6 +28,10 @@ func resourceScalewayLb() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Read:    schema.DefaultTimeout(defaultLbLbTimeout),
+			Update:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Delete:  schema.DefaultTimeout(defaultLbLbTimeout),
 			Default: schema.DefaultTimeout(defaultLbLbTimeout),
 		},
 		SchemaVersion: 1,
diff --git a/scaleway/resource_lb_backend.go b/scaleway/resource_lb_backend.go
@@ -20,6 +20,10 @@ func resourceScalewayLbBackend() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Read:    schema.DefaultTimeout(defaultLbLbTimeout),
+			Update:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Delete:  schema.DefaultTimeout(defaultLbLbTimeout),
 			Default: schema.DefaultTimeout(defaultLbLbTimeout),
 		},
 		SchemaVersion: 1,
diff --git a/scaleway/resource_lb_certificate.go b/scaleway/resource_lb_certificate.go
@@ -19,6 +19,10 @@ func resourceScalewayLbCertificate() *schema.Resource {
 		DeleteContext: resourceScalewayLbCertificateDelete,
 		SchemaVersion: 1,
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Read:    schema.DefaultTimeout(defaultLbLbTimeout),
+			Update:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Delete:  schema.DefaultTimeout(defaultLbLbTimeout),
 			Default: schema.DefaultTimeout(defaultLbLbTimeout),
 		},
 		StateUpgraders: []schema.StateUpgrader{
diff --git a/scaleway/resource_lb_frontend.go b/scaleway/resource_lb_frontend.go
@@ -23,6 +23,9 @@ func resourceScalewayLbFrontend() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Update:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Delete:  schema.DefaultTimeout(defaultLbLbTimeout),
 			Default: schema.DefaultTimeout(defaultLbLbTimeout),
 		},
 		SchemaVersion: 1,
diff --git a/scaleway/resource_lb_ip.go b/scaleway/resource_lb_ip.go
@@ -20,6 +20,9 @@ func resourceScalewayLbIP() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Read:    schema.DefaultTimeout(defaultLbLbTimeout),
+			Update:  schema.DefaultTimeout(defaultLbLbTimeout),
+			Delete:  schema.DefaultTimeout(defaultLbLbTimeout),
 			Default: schema.DefaultTimeout(defaultLbLbTimeout),
 		},
 		SchemaVersion: 1,
diff --git a/scaleway/resource_rdb_acl.go b/scaleway/resource_rdb_acl.go
@@ -25,6 +25,10 @@ func resourceScalewayRdbACL() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Read:    schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Update:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Delete:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
 			Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_rdb_database.go b/scaleway/resource_rdb_database.go
@@ -26,6 +26,8 @@ func resourceScalewayRdbDatabase() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Delete:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
 			Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_rdb_instance.go b/scaleway/resource_rdb_instance.go
@@ -24,6 +24,10 @@ func resourceScalewayRdbInstance() *schema.Resource {
 		UpdateContext: resourceScalewayRdbInstanceUpdate,
 		DeleteContext: resourceScalewayRdbInstanceDelete,
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Read:    schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Update:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Delete:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
 			Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
 		},
 		Importer: &schema.ResourceImporter{
diff --git a/scaleway/resource_rdb_privilege.go b/scaleway/resource_rdb_privilege.go
@@ -22,6 +22,10 @@ func resourceScalewayRdbPrivilege() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Read:    schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Update:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Delete:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
 			Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_rdb_user.go b/scaleway/resource_rdb_user.go
@@ -22,6 +22,10 @@ func resourceScalewayRdbUser() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Read:    schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Update:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
+			Delete:  schema.DefaultTimeout(defaultRdbInstanceTimeout),
 			Default: schema.DefaultTimeout(defaultRdbInstanceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_redis_cluster.go b/scaleway/resource_redis_cluster.go
@@ -17,6 +17,9 @@ func resourceScalewayRedisCluster() *schema.Resource {
 		UpdateContext: resourceScalewayRedisClusterUpdate,
 		DeleteContext: resourceScalewayRedisClusterDelete,
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRedisClusterTimeout),
+			Update:  schema.DefaultTimeout(defaultRedisClusterTimeout),
+			Delete:  schema.DefaultTimeout(defaultRedisClusterTimeout),
 			Default: schema.DefaultTimeout(defaultRedisClusterTimeout),
 		},
 		Importer: &schema.ResourceImporter{
diff --git a/scaleway/resource_registry_namespace.go b/scaleway/resource_registry_namespace.go
@@ -19,6 +19,10 @@ func resourceScalewayRegistryNamespace() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultRedisClusterTimeout),
+			Read:    schema.DefaultTimeout(defaultRedisClusterTimeout),
+			Update:  schema.DefaultTimeout(defaultRedisClusterTimeout),
+			Delete:  schema.DefaultTimeout(defaultRedisClusterTimeout),
 			Default: schema.DefaultTimeout(defaultRegistryNamespaceTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_vpc_gateway_network.go b/scaleway/resource_vpc_gateway_network.go
@@ -20,6 +20,13 @@ func resourceScalewayVPCGatewayNetwork() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Read:    schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Update:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Delete:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
+		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
 			"gateway_id": {
diff --git a/scaleway/resource_vpc_public_gateway.go b/scaleway/resource_vpc_public_gateway.go
@@ -19,6 +19,13 @@ func resourceScalewayVPCPublicGateway() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
+		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Read:    schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Update:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Delete:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
+		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/scaleway/resource_vpc_public_gateway_dhcp_reservation.go b/scaleway/resource_vpc_public_gateway_dhcp_reservation.go
@@ -23,6 +23,9 @@ func resourceScalewayVPCPublicGatewayDHCPReservation() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Update:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Delete:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
 			Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
 		},
 		SchemaVersion: 0,
diff --git a/scaleway/resource_vpc_public_gateway_pat_rule.go b/scaleway/resource_vpc_public_gateway_pat_rule.go
@@ -24,6 +24,9 @@ func resourceScalewayVPCPublicGatewayPATRule() *schema.Resource {
 		},
 		SchemaVersion: 0,
 		Timeouts: &schema.ResourceTimeout{
+			Create:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Update:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
+			Delete:  schema.DefaultTimeout(defaultVPCGatewayTimeout),
 			Default: schema.DefaultTimeout(defaultVPCGatewayTimeout),
 		},
 		Schema: map[string]*schema.Schema{
