Skip to content

Commit 60f47d7

Browse files
authored
feat: bump scaleway-sdk-go and fix compilation issues (#3384)
1 parent a4d6f1c commit 60f47d7

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/nats-io/jwt/v2 v2.8.0
3030
github.com/nats-io/nats.go v1.46.1
3131
github.com/robfig/cron/v3 v3.0.1
32-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250721082157-a9b7a7bd9686
32+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35
3333
github.com/stretchr/testify v1.11.1
3434
golang.org/x/crypto v0.42.0
3535
gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
456456
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
457457
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
458458
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
459-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250721082157-a9b7a7bd9686 h1:rSbtkU5fMMXbv0qwIH5dBq+TvAYnbClahwPP1KtN9bs=
460-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250721082157-a9b7a7bd9686/go.mod h1:fw6BmcfYRs2BEHYW0c3/rR0JgZHvdx6uMYqpeUJx3Bc=
459+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35 h1:8xfn1RzeI9yoCUuEwDy08F+No6PcKZGEDOQ6hrRyLts=
460+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35/go.mod h1:47B1d/YXmSAxlJxUJxClzHR6b3T4M1WyCvwENPQNBWc=
461461
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
462462
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
463463
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

internal/services/container/namespace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat
122122
Name: types.ExpandOrGenerateString(d.Get("name").(string), "ns"),
123123
ProjectID: d.Get("project_id").(string),
124124
Region: region,
125-
ActivateVpcIntegration: true,
125+
ActivateVpcIntegration: scw.BoolPtr(true),
126126
}
127127

128128
rawTag, tagExist := d.GetOk("tags")

internal/services/function/namespace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func ResourceFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData
113113
Name: types.ExpandOrGenerateString(d.Get("name").(string), "func"),
114114
ProjectID: d.Get("project_id").(string),
115115
Region: region,
116-
ActivateVpcIntegration: true,
116+
ActivateVpcIntegration: scw.BoolPtr(true),
117117
}
118118

119119
rawTag, tagExist := d.GetOk("tags")

internal/services/iam/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func resourceIamUserRead(ctx context.Context, d *schema.ResourceData, m any) dia
188188
_ = d.Set("deletable", user.Deletable)
189189
_ = d.Set("last_login_at", types.FlattenTime(user.LastLoginAt))
190190
_ = d.Set("type", user.Type)
191-
_ = d.Set("status", user.Status)
191+
_ = d.Set("status", user.Status.String()) //nolint:staticcheck // convert enum to string for schema compatibility
192192
_ = d.Set("mfa", user.Mfa)
193193
_ = d.Set("account_root_user_id", user.AccountRootUserID)
194194
_ = d.Set("locked", user.Locked)

internal/services/webhosting/webhosting.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any)
303303
}
304304

305305
dnsRecordsResponse, err := dnsAPI.GetDomainDNSRecords(&webhosting.DNSAPIGetDomainDNSRecordsRequest{
306-
Domain: webhostingResponse.Domain,
306+
Domain: *webhostingResponse.Domain, //nolint:staticcheck // deprecated in SDK, kept until domain_info fully propagated
307307
}, scw.WithContext(ctx))
308308
if err != nil {
309309
return diag.FromErr(err)
@@ -314,7 +314,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any)
314314

315315
_ = d.Set("tags", webhostingResponse.Tags)
316316
_ = d.Set("offer_id", regional.NewIDString(region, webhostingResponse.Offer.ID))
317-
_ = d.Set("domain", webhostingResponse.Domain)
317+
_ = d.Set("domain", webhostingResponse.Domain) //nolint:staticcheck // deprecated in SDK, exported for backward compatibility
318318
_ = d.Set("created_at", types.FlattenTime(webhostingResponse.CreatedAt))
319319
_ = d.Set("updated_at", types.FlattenTime(webhostingResponse.UpdatedAt))
320320
_ = d.Set("status", webhostingResponse.Status.String())

internal/services/webhosting/webhosting_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func DataSourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any
6464

6565
foundDomain, err := datasource.FindExact(
6666
res.Hostings,
67-
func(s *webhosting.HostingSummary) bool { return s.Domain == hostingDomain },
67+
func(s *webhosting.HostingSummary) bool { return *s.Domain == hostingDomain }, //nolint:staticcheck // deprecated in SDK, used until domain_info available here
6868
hostingDomain,
6969
)
7070
if err != nil {

0 commit comments

Comments
 (0)