Skip to content

Commit 745d5d4

Browse files
remyleoneremyleone
committed
ignore some alerts
1 parent d2fbb3f commit 745d5d4

File tree

13 files changed

+58
-56
lines changed

13 files changed

+58
-56
lines changed

‎internal/datasource/search.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
// FindExact finds the first element in 'slice' matching the condition defined by 'finder'.
1111
// It returns the first matching element and an error if either no match is found or multiple matches are found.
12-
func FindExact[T any](slice []T, finder func(T) bool, searchName string) (T, error) {
12+
func FindExact[T any](slice []T, finder func(T) bool, searchName string) (T, error) { //nolint:ireturn
1313
var found T
1414
var foundFlag bool
1515

‎internal/services/instance/ip_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ func isIPAttachedToServer(tt *acctest.TestTools, ipResource, serverResource stri
308308
return err
309309
}
310310

311-
if server.Server.PublicIP.Address.String() != ip.IP.Address.String() {
312-
return fmt.Errorf("IPs should be the same in %s and %s: %v is different than %v", ipResource, serverResource, server.Server.PublicIP.Address, ip.IP.Address)
311+
if server.Server.PublicIP != nil && server.Server.PublicIP.Address.String() != ip.IP.Address.String() { //nolint:staticcheck
312+
return fmt.Errorf("IPs should be the same in %s and %s: %v is different than %v", ipResource, serverResource, server.Server.PublicIP.Address, ip.IP.Address) //nolint:staticcheck
313313
}
314314

315315
return nil
@@ -336,7 +336,7 @@ func serverHasNoIPAssigned(tt *acctest.TestTools, serverResource string) resourc
336336
return err
337337
}
338338

339-
if server.Server.PublicIP != nil && !server.Server.PublicIP.Dynamic {
339+
if server.Server.PublicIP != nil && !server.Server.PublicIP.Dynamic { //nolint:staticcheck
340340
return fmt.Errorf("no flexible IP should be assigned to %s", serverResource)
341341
}
342342

‎internal/services/instance/server.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
384384

385385
enableIPv6, ok := d.GetOk("enable_ipv6")
386386
if ok {
387-
req.EnableIPv6 = scw.BoolPtr(enableIPv6.(bool))
387+
req.EnableIPv6 = scw.BoolPtr(enableIPv6.(bool)) //nolint:staticcheck
388388
}
389389

390390
if bootType, ok := d.GetOk("boot_type"); ok {
@@ -393,7 +393,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
393393
}
394394

395395
if ipID, ok := d.GetOk("ip_id"); ok {
396-
req.PublicIP = types.ExpandStringPtr(zonal.ExpandID(ipID).ID)
396+
req.PublicIP = types.ExpandStringPtr(zonal.ExpandID(ipID).ID) //nolint:staticcheck
397397
}
398398

399399
if ipIDs, ok := d.GetOk("ip_ids"); ok {
@@ -569,7 +569,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
569569
_ = d.Set("tags", server.Tags)
570570
}
571571
_ = d.Set("security_group_id", zonal.NewID(zone, server.SecurityGroup.ID).String())
572-
_ = d.Set("enable_ipv6", server.EnableIPv6)
572+
_ = d.Set("enable_ipv6", server.EnableIPv6) //nolint:staticcheck
573573
_ = d.Set("enable_dynamic_ip", server.DynamicIPRequired)
574574
_ = d.Set("organization_id", server.Organization)
575575
_ = d.Set("project_id", server.Project)
@@ -590,21 +590,21 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
590590
_ = d.Set("private_ip", types.FlattenStringPtr(server.PrivateIP))
591591
}
592592

593-
if _, hasIPID := d.GetOk("ip_id"); server.PublicIP != nil && hasIPID {
594-
if !server.PublicIP.Dynamic {
595-
_ = d.Set("ip_id", zonal.NewID(zone, server.PublicIP.ID).String())
593+
if _, hasIPID := d.GetOk("ip_id"); server.PublicIP != nil && hasIPID { //nolint:staticcheck
594+
if !server.PublicIP.Dynamic { //nolint:staticcheck
595+
_ = d.Set("ip_id", zonal.NewID(zone, server.PublicIP.ID).String()) //nolint:staticcheck
596596
} else {
597597
_ = d.Set("ip_id", "")
598598
}
599599
} else {
600600
_ = d.Set("ip_id", "")
601601
}
602602

603-
if server.PublicIP != nil {
604-
_ = d.Set("public_ip", server.PublicIP.Address.String())
603+
if server.PublicIP != nil { //nolint:staticcheck
604+
_ = d.Set("public_ip", server.PublicIP.Address.String()) //nolint:staticcheck
605605
d.SetConnInfo(map[string]string{
606606
"type": "ssh",
607-
"host": server.PublicIP.Address.String(),
607+
"host": server.PublicIP.Address.String(), //nolint:staticcheck
608608
})
609609
} else {
610610
_ = d.Set("public_ip", "")
@@ -623,10 +623,10 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
623623
_ = d.Set("ip_ids", []interface{}{})
624624
}
625625

626-
if server.IPv6 != nil {
627-
_ = d.Set("ipv6_address", server.IPv6.Address.String())
628-
_ = d.Set("ipv6_gateway", server.IPv6.Gateway.String())
629-
prefixLength, err := strconv.Atoi(server.IPv6.Netmask)
626+
if server.IPv6 != nil { //nolint:staticcheck
627+
_ = d.Set("ipv6_address", server.IPv6.Address.String()) //nolint:staticcheck
628+
_ = d.Set("ipv6_gateway", server.IPv6.Gateway.String()) //nolint:staticcheck
629+
prefixLength, err := strconv.Atoi(server.IPv6.Netmask) //nolint:staticcheck
630630
if err != nil {
631631
return diag.FromErr(err)
632632
}
@@ -817,10 +817,10 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
817817

818818
ipID := zonal.ExpandID(d.Get("ip_id")).ID
819819
// If an IP is already attached, and it's not a dynamic IP we detach it.
820-
if server.PublicIP != nil && !server.PublicIP.Dynamic {
820+
if server.PublicIP != nil && !server.PublicIP.Dynamic { //nolint:staticcheck
821821
_, err = api.UpdateIP(&instanceSDK.UpdateIPRequest{
822822
Zone: zone,
823-
IP: server.PublicIP.ID,
823+
IP: server.PublicIP.ID, //nolint:staticcheck
824824
Server: &instanceSDK.NullableStringValue{Null: true},
825825
})
826826
if err != nil {

‎internal/services/instance/servers_data_source.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
161161
for _, server := range res.Servers {
162162
rawServer := make(map[string]interface{})
163163
rawServer["id"] = zonal.NewID(server.Zone, server.ID).String()
164-
if server.PublicIP != nil {
165-
rawServer["public_ip"] = server.PublicIP.Address.String()
164+
if server.PublicIP != nil { //nolint:staticcheck
165+
rawServer["public_ip"] = server.PublicIP.Address.String() //nolint:staticcheck
166166
}
167167
if server.PublicIPs != nil {
168168
rawServer["public_ips"] = flattenServerPublicIPs(server.Zone, server.PublicIPs)
@@ -184,7 +184,9 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
184184
rawServer["tags"] = server.Tags
185185
}
186186
rawServer["security_group_id"] = zonal.NewID(zone, server.SecurityGroup.ID).String()
187-
rawServer["enable_ipv6"] = server.EnableIPv6
187+
if server.EnableIPv6 != nil { //nolint:staticcheck
188+
rawServer["enable_ipv6"] = server.EnableIPv6 //nolint:staticcheck
189+
}
188190
rawServer["enable_dynamic_ip"] = server.DynamicIPRequired
189191
rawServer["routed_ip_enabled"] = server.RoutedIPEnabled
190192
rawServer["organization_id"] = server.Organization
@@ -196,10 +198,10 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
196198
rawServer["placement_group_id"] = zonal.NewID(zone, server.PlacementGroup.ID).String()
197199
rawServer["placement_group_policy_respected"] = server.PlacementGroup.PolicyRespected
198200
}
199-
if server.IPv6 != nil {
200-
rawServer["ipv6_address"] = server.IPv6.Address.String()
201-
rawServer["ipv6_gateway"] = server.IPv6.Gateway.String()
202-
prefixLength, err := strconv.Atoi(server.IPv6.Netmask)
201+
if server.IPv6 != nil { //nolint:staticcheck
202+
rawServer["ipv6_address"] = server.IPv6.Address.String() //nolint:staticcheck
203+
rawServer["ipv6_gateway"] = server.IPv6.Gateway.String() //nolint:staticcheck
204+
prefixLength, err := strconv.Atoi(server.IPv6.Netmask) //nolint:staticcheck
203205
if err != nil {
204206
diags = append(diags, diag.FromErr(fmt.Errorf("failed to read ipv6 netmask: %w", err))...)
205207
continue

‎internal/services/k8s/cluster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ func ResourceK8SClusterCreate(ctx context.Context, d *schema.ResourceData, m int
436436

437437
// Auto-upgrade configuration
438438

439-
autoUpgradeEnable, okAutoUpgradeEnable := d.GetOkExists("auto_upgrade.0.enable")
440-
autoUpgradeStartHour, okAutoUpgradeStartHour := d.GetOkExists("auto_upgrade.0.maintenance_window_start_hour")
439+
autoUpgradeEnable, okAutoUpgradeEnable := d.GetOkExists("auto_upgrade.0.enable") //nolint:staticcheck
440+
autoUpgradeStartHour, okAutoUpgradeStartHour := d.GetOkExists("auto_upgrade.0.maintenance_window_start_hour") //nolint:staticcheck
441441
autoUpgradeDay, okAutoUpgradeDay := d.GetOk("auto_upgrade.0.maintenance_window_day")
442442

443443
if okAutoUpgradeEnable {

‎internal/services/k8s/helpers_k8s.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ func convertNodes(res *k8s.ListNodesResponse) []map[string]interface{} {
8383
n := make(map[string]interface{})
8484
n["name"] = node.Name
8585
n["status"] = node.Status.String()
86-
if node.PublicIPV4 != nil && node.PublicIPV4.String() != types.NetIPNil {
87-
n["public_ip"] = node.PublicIPV4.String()
86+
if node.PublicIPV4 != nil && node.PublicIPV4.String() != types.NetIPNil { //nolint:staticcheck
87+
n["public_ip"] = node.PublicIPV4.String() //nolint:staticcheck
8888
}
89-
if node.PublicIPV6 != nil && node.PublicIPV6.String() != types.NetIPNil {
90-
n["public_ip_v6"] = node.PublicIPV6.String()
89+
if node.PublicIPV6 != nil && node.PublicIPV6.String() != types.NetIPNil { //nolint:staticcheck
90+
n["public_ip_v6"] = node.PublicIPV6.String() //nolint:staticcheck
9191
}
9292
result = append(result, n)
9393
}

‎internal/services/lb/backend.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ func resourceLbBackendCreate(ctx context.Context, d *schema.ResourceData, m inte
420420
}
421421

422422
// deprecated attribute
423-
createReq.SendProxyV2 = types.ExpandBoolPtr(types.GetBool(d, "send_proxy_v2"))
423+
createReq.SendProxyV2 = types.ExpandBoolPtr(types.GetBool(d, "send_proxy_v2")) //nolint:staticcheck
424424

425425
res, err := lbAPI.CreateBackend(createReq, scw.WithContext(ctx))
426426
if err != nil {
@@ -472,7 +472,7 @@ func resourceLbBackendRead(ctx context.Context, d *schema.ResourceData, m interf
472472
_ = d.Set("timeout_connect", types.FlattenDuration(backend.TimeoutConnect))
473473
_ = d.Set("timeout_tunnel", types.FlattenDuration(backend.TimeoutTunnel))
474474
_ = d.Set("on_marked_down_action", flattenLbBackendMarkdownAction(backend.OnMarkedDownAction))
475-
_ = d.Set("send_proxy_v2", types.FlattenBoolPtr(backend.SendProxyV2))
475+
_ = d.Set("send_proxy_v2", types.FlattenBoolPtr(backend.SendProxyV2)) //nolint:staticcheck
476476
_ = d.Set("failover_host", backend.FailoverHost)
477477
_ = d.Set("ssl_bridging", types.FlattenBoolPtr(backend.SslBridging))
478478
_ = d.Set("ignore_ssl_server_verify", types.FlattenBoolPtr(backend.IgnoreSslServerVerify))
@@ -569,7 +569,7 @@ func resourceLbBackendUpdate(ctx context.Context, d *schema.ResourceData, m inte
569569
}
570570

571571
// deprecated
572-
req.SendProxyV2 = types.ExpandBoolPtr(types.GetBool(d, "send_proxy_v2"))
572+
req.SendProxyV2 = types.ExpandBoolPtr(types.GetBool(d, "send_proxy_v2")) //nolint:staticcheck
573573

574574
_, err = lbAPI.UpdateBackend(req, scw.WithContext(ctx))
575575
if err != nil {

‎internal/services/lb/frontend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ func resourceLbFrontendRead(ctx context.Context, d *schema.ResourceData, m inter
316316
_ = d.Set("timeout_client", types.FlattenDuration(frontend.TimeoutClient))
317317
_ = d.Set("enable_http3", frontend.EnableHTTP3)
318318

319-
if frontend.Certificate != nil {
320-
_ = d.Set("certificate_id", zonal.NewIDString(zone, frontend.Certificate.ID))
319+
if frontend.Certificate != nil { //nolint:staticcheck
320+
_ = d.Set("certificate_id", zonal.NewIDString(zone, frontend.Certificate.ID)) //nolint:staticcheck
321321
} else {
322322
_ = d.Set("certificate_id", "")
323323
}

‎internal/services/lb/helpers_lb.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ func IsPrivateNetworkEqual(a, b *lbSDK.PrivateNetwork) bool {
5656
if a.PrivateNetworkID != b.PrivateNetworkID {
5757
return false
5858
}
59-
if !reflect.DeepEqual(a.DHCPConfig, b.DHCPConfig) {
59+
if !reflect.DeepEqual(a.DHCPConfig, b.DHCPConfig) { //nolint:staticcheck
6060
return false
6161
}
62-
if !reflect.DeepEqual(a.StaticConfig, b.StaticConfig) {
62+
if !reflect.DeepEqual(a.StaticConfig, b.StaticConfig) { //nolint:staticcheck
6363
return false
6464
}
6565

‎internal/services/lb/types.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func flattenPrivateNetworkConfigs(privateNetworks []*lb.PrivateNetwork) interfac
2626
pnI := []map[string]interface{}(nil)
2727
var dhcpConfigExist bool
2828
for _, pn := range privateNetworks {
29-
if pn.DHCPConfig != nil {
29+
if pn.DHCPConfig != nil { //nolint:staticcheck
3030
dhcpConfigExist = true
3131
}
3232
pnRegion, err := pn.LB.Zone.Region()
@@ -39,7 +39,7 @@ func flattenPrivateNetworkConfigs(privateNetworks []*lb.PrivateNetwork) interfac
3939
"dhcp_config": dhcpConfigExist,
4040
"status": pn.Status.String(),
4141
"zone": pn.LB.Zone.String(),
42-
"static_config": flattenLbPrivateNetworkStaticConfig(pn.StaticConfig),
42+
"static_config": flattenLbPrivateNetworkStaticConfig(pn.StaticConfig), //nolint:staticcheck
4343
"ipam_ids": flattenLBIPAMIDs(pnRegion, pn.IpamIDs),
4444
})
4545
}
@@ -320,9 +320,9 @@ func expandPrivateNetworks(data interface{}) ([]*lb.PrivateNetwork, error) {
320320
privateNetwork := &lb.PrivateNetwork{}
321321
privateNetwork.PrivateNetworkID = locality.ExpandID(rawPn["private_network_id"].(string))
322322
if staticConfig, hasStaticConfig := rawPn["static_config"]; hasStaticConfig && len(staticConfig.([]interface{})) > 0 {
323-
privateNetwork.StaticConfig = expandLbPrivateNetworkStaticConfig(staticConfig)
323+
privateNetwork.StaticConfig = expandLbPrivateNetworkStaticConfig(staticConfig) //nolint:staticcheck
324324
} else {
325-
privateNetwork.DHCPConfig = expandLbPrivateNetworkDHCPConfig(rawPn["dhcp_config"])
325+
privateNetwork.DHCPConfig = expandLbPrivateNetworkDHCPConfig(rawPn["dhcp_config"]) //nolint:staticcheck
326326
}
327327
privateNetwork.IpamIDs = locality.ExpandIDs(rawPn["ipam_ids"])
328328

@@ -345,7 +345,7 @@ func flattenLbPrivateNetworkStaticConfig(cfg *lb.PrivateNetworkStaticConfig) []s
345345
return nil
346346
}
347347

348-
return *cfg.IPAddress
348+
return *cfg.IPAddress //nolint:staticcheck
349349
}
350350

351351
func expandLbPrivateNetworkDHCPConfig(raw interface{}) *lb.PrivateNetworkDHCPConfig {
@@ -363,8 +363,8 @@ func attachLBPrivateNetworks(ctx context.Context, lbAPI *lb.ZonedAPI, zone scw.Z
363363
Zone: zone,
364364
LBID: lbID,
365365
PrivateNetworkID: pnConfigs[i].PrivateNetworkID,
366-
StaticConfig: pnConfigs[i].StaticConfig,
367-
DHCPConfig: pnConfigs[i].DHCPConfig,
366+
StaticConfig: pnConfigs[i].StaticConfig, //nolint:staticcheck
367+
DHCPConfig: pnConfigs[i].DHCPConfig, //nolint:staticcheck
368368
IpamIDs: pnConfigs[i].IpamIDs,
369369
}, scw.WithContext(ctx))
370370
if err != nil && !httperrors.Is404(err) {
@@ -386,8 +386,8 @@ func attachLBPrivateNetworks(ctx context.Context, lbAPI *lb.ZonedAPI, zone scw.Z
386386
if err != nil && !httperrors.Is404(err) {
387387
return nil, err
388388
}
389-
tflog.Debug(ctx, fmt.Sprintf("DHCP config: %v", pn.DHCPConfig))
390-
tflog.Debug(ctx, fmt.Sprintf("Static config: %v", pn.StaticConfig))
389+
tflog.Debug(ctx, fmt.Sprintf("DHCP config: %v", pn.DHCPConfig)) //nolint:staticcheck
390+
tflog.Debug(ctx, fmt.Sprintf("Static config: %v", pn.StaticConfig)) //nolint:staticcheck
391391
return nil, fmt.Errorf("attaching private network with id: %s on error state. please check your config", pn.PrivateNetworkID)
392392
}
393393
}

‎internal/services/object/bucket.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/aws/aws-sdk-go/service/s3"
1111
"github.com/hashicorp/terraform-plugin-log/tflog"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
13-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
13+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1616
"github.com/scaleway/scaleway-sdk-go/scw"
@@ -377,7 +377,7 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.S3, d *schema.R
377377
if val, ok := r["id"].(string); ok && val != "" {
378378
rule.ID = aws.String(val)
379379
} else {
380-
rule.ID = aws.String(resource.PrefixedUniqueId("tf-scw-bucket-lifecycle-"))
380+
rule.ID = aws.String(id.PrefixedUniqueId("tf-scw-bucket-lifecycle-"))
381381
}
382382

383383
// Enabled
@@ -598,8 +598,8 @@ func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m int
598598
}
599599
}
600600
} else {
601-
if lifecycleRule.Prefix != nil {
602-
rule["prefix"] = aws.StringValue(lifecycleRule.Prefix)
601+
if lifecycleRule.Prefix != nil { //nolint:staticcheck
602+
rule["prefix"] = aws.StringValue(lifecycleRule.Prefix) //nolint:staticcheck
603603
}
604604
}
605605

‎internal/services/rdb/instance.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,9 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte
457457
_ = d.Set("backup_schedule_retention", int(res.BackupSchedule.Retention))
458458
_ = d.Set("backup_same_region", res.BackupSameRegion)
459459
_ = d.Set("tags", types.FlattenSliceString(res.Tags))
460-
if res.Endpoint != nil {
461-
_ = d.Set("endpoint_ip", types.FlattenIPPtr(res.Endpoint.IP))
462-
_ = d.Set("endpoint_port", int(res.Endpoint.Port))
460+
if res.Endpoint != nil { //nolint:staticcheck
461+
_ = d.Set("endpoint_ip", types.FlattenIPPtr(res.Endpoint.IP)) //nolint:staticcheck
462+
_ = d.Set("endpoint_port", int(res.Endpoint.Port)) //nolint:staticcheck
463463
} else {
464464
_ = d.Set("endpoint_ip", "")
465465
_ = d.Set("endpoint_port", 0)

‎internal/types/bool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func ExpandBoolPtr(data interface{}) *bool {
2020
}
2121

2222
func GetBool(d *schema.ResourceData, key string) interface{} {
23-
val, ok := d.GetOkExists(key)
23+
val, ok := d.GetOkExists(key) //nolint:staticcheck
2424
if !ok {
2525
return nil
2626
}

0 commit comments

Comments
 (0)