Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 6, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions scaleway/resource_apple_silicon_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_baremetal_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_container_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_domain_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_function_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_instance_private_nic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_instance_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions scaleway/resource_instance_snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_instance_volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_iot_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_iot_routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_k8s_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions scaleway/resource_k8s_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ func resourceScalewayK8SPool() *schema.Resource {
StateContext: schema.ImportStatePassthroughContext,
},
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(defaultK8SPoolTimeout),
Codelax marked this conversation as resolved.
Show resolved Hide resolved
Update: schema.DefaultTimeout(defaultK8SPoolTimeout),
Default: schema.DefaultTimeout(defaultK8SPoolTimeout),
},
SchemaVersion: 0,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_lb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_lb_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_lb_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_lb_frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_lb_ip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_rdb_acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions scaleway/resource_rdb_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_rdb_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_rdb_privilege.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_rdb_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_redis_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 4 additions & 0 deletions scaleway/resource_registry_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 7 additions & 0 deletions scaleway/resource_vpc_gateway_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 7 additions & 0 deletions scaleway/resource_vpc_public_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_vpc_public_gateway_dhcp_reservation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions scaleway/resource_vpc_public_gateway_pat_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down