Skip to content

Commit 3ee3973

Browse files
authored
chore: fix uncompatible type assignement (#628)
1 parent 8058459 commit 3ee3973

6 files changed

+14
-12
lines changed

scaleway/data_source_baremetal_offer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func dataSourceScalewayBaremetalOfferRead(ctx context.Context, d *schema.Resourc
169169
_ = d.Set("zone", zone)
170170
_ = d.Set("name", offer.Name)
171171
_ = d.Set("include_disabled", !offer.Enable)
172-
_ = d.Set("bandwidth", offer.Bandwidth)
172+
_ = d.Set("bandwidth", int(offer.Bandwidth))
173173
_ = d.Set("commercial_range", offer.CommercialRange)
174174
_ = d.Set("cpu", flattenBaremetalCPUs(offer.CPUs))
175175
_ = d.Set("disk", flattenBaremetalDisks(offer.Disks))

scaleway/data_source_registry_image_beta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func dataSourceScalewayRegistryImageBetaRead(d *schema.ResourceData, m interface
101101
_ = d.Set("name", image.Name)
102102
_ = d.Set("namespace_id", image.NamespaceID)
103103
_ = d.Set("visibility", image.Visibility.String())
104-
_ = d.Set("size", image.Size)
104+
_ = d.Set("size", int(image.Size))
105105
_ = d.Set("tags", image.Tags)
106106

107107
return nil

scaleway/resource_instance_volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func resourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceD
134134
_ = d.Set("project_id", res.Volume.Project)
135135
_ = d.Set("zone", string(zone))
136136
_ = d.Set("type", res.Volume.VolumeType.String())
137-
_ = d.Set("size_in_gb", uint64(res.Volume.Size/scw.GB))
137+
_ = d.Set("size_in_gb", int(res.Volume.Size/scw.GB))
138138

139139
if res.Volume.Server != nil {
140140
_ = d.Set("server_id", res.Volume.Server.ID)

scaleway/resource_k8s_cluster_beta.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"strings"
7+
"time"
78

89
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -626,8 +627,8 @@ func resourceScalewayK8SClusterBetaRead(ctx context.Context, d *schema.ResourceD
626627
_ = d.Set("description", response.Description)
627628
_ = d.Set("cni", response.Cni)
628629
_ = d.Set("tags", response.Tags)
629-
_ = d.Set("created_at", response.CreatedAt)
630-
_ = d.Set("updated_at", response.UpdatedAt)
630+
_ = d.Set("created_at", response.CreatedAt.Format(time.RFC3339))
631+
_ = d.Set("updated_at", response.UpdatedAt.Format(time.RFC3339))
631632
_ = d.Set("apiserver_url", response.ClusterURL)
632633
_ = d.Set("wildcard_dns", response.DNSWildcard)
633634
_ = d.Set("status", response.Status.String())

scaleway/resource_k8s_pool_beta.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package scaleway
22

33
import (
44
"context"
5+
"time"
56

67
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
78
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -274,17 +275,17 @@ func resourceScalewayK8SPoolBetaRead(ctx context.Context, d *schema.ResourceData
274275
_ = d.Set("node_type", pool.NodeType)
275276
_ = d.Set("autoscaling", pool.Autoscaling)
276277
_ = d.Set("autohealing", pool.Autohealing)
277-
_ = d.Set("current_size", pool.Size)
278+
_ = d.Set("current_size", int(pool.Size))
278279
if !pool.Autoscaling {
279-
_ = d.Set("size", pool.Size)
280+
_ = d.Set("size", int(pool.Size))
280281
}
281282
_ = d.Set("version", pool.Version)
282-
_ = d.Set("min_size", pool.MinSize)
283-
_ = d.Set("max_size", pool.MaxSize)
283+
_ = d.Set("min_size", int(pool.MinSize))
284+
_ = d.Set("max_size", int(pool.MaxSize))
284285
_ = d.Set("tags", pool.Tags)
285286
_ = d.Set("container_runtime", pool.ContainerRuntime)
286-
_ = d.Set("created_at", pool.CreatedAt)
287-
_ = d.Set("updated_at", pool.UpdatedAt)
287+
_ = d.Set("created_at", pool.CreatedAt.Format(time.RFC3339))
288+
_ = d.Set("updated_at", pool.UpdatedAt.Format(time.RFC3339))
288289
_ = d.Set("nodes", nodes)
289290
_ = d.Set("status", pool.Status)
290291

scaleway/resource_rdb_user_beta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func resourceScalewayRdbUserBetaRead(ctx context.Context, d *schema.ResourceData
103103
}
104104

105105
var user = res.Users[0]
106-
_ = d.Set("instance_id", newRegionalID(region, instanceID))
106+
_ = d.Set("instance_id", newRegionalID(region, instanceID).String())
107107
_ = d.Set("name", user.Name)
108108
_ = d.Set("is_admin", user.IsAdmin)
109109

0 commit comments

Comments
 (0)