Skip to content

Commit 637b885

Browse files
remyleoneremyleone
authored
chore: cleanup redundant declaration and deprecated (#731)
1 parent 2f91304 commit 637b885

17 files changed

+24
-38
lines changed

‎scaleway/data_source_instance_server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.Resourc
5050
if err != nil {
5151
return diag.FromErr(err)
5252
}
53-
for _, instance := range res.Servers {
54-
if instance.Name == d.Get("name").(string) {
53+
for _, server := range res.Servers {
54+
if server.Name == d.Get("name").(string) {
5555
if serverID != "" {
5656
return diag.FromErr(fmt.Errorf("more than 1 server found with the same name %s", d.Get("name")))
5757
}
58-
serverID = instance.ID
58+
serverID = server.ID
5959
}
6060
}
6161
if serverID == "" {

‎scaleway/data_source_instance_volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
9-
instance "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
9+
"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
)
1212

‎scaleway/data_source_k8s_cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
9-
k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
9+
"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
)
1212

‎scaleway/data_source_k8s_pool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
9-
k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
9+
"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
)
1212

‎scaleway/data_source_registry_image_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestAccScalewayDataSourceRegistryImage_Basic(t *testing.T) {
3131
}
3232
`,
3333
Check: resource.ComposeTestCheckFunc(
34-
testAccCheckScalewayRegistryImageExists("data.scaleway_registry_image.ubuntu"),
34+
testAccCheckScalewayRegistryImageExists(tt, "data.scaleway_registry_image.ubuntu"),
3535

3636
resource.TestCheckResourceAttr("data.scaleway_registry_image.ubuntu", "name", "ubuntu"),
3737
resource.TestCheckResourceAttr("data.scaleway_registry_image.ubuntu", "id", "fr-par/"+ubuntuImageID),
@@ -56,14 +56,14 @@ func TestAccScalewayDataSourceRegistryImage_Basic(t *testing.T) {
5656
})
5757
}
5858

59-
func testAccCheckScalewayRegistryImageExists(n string) resource.TestCheckFunc {
59+
func testAccCheckScalewayRegistryImageExists(tt *TestTools, n string) resource.TestCheckFunc {
6060
return func(state *terraform.State) error {
6161
rs, ok := state.RootModule().Resources[n]
6262
if !ok {
6363
return fmt.Errorf("resource not found: %s", n)
6464
}
6565

66-
api, region, id, err := registryAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
66+
api, region, id, err := registryAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
6767
if err != nil {
6868
return nil
6969
}

‎scaleway/helpers_baremetal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"time"
55

66
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
7-
baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
7+
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
88
"github.com/scaleway/scaleway-sdk-go/scw"
99
)
1010

‎scaleway/helpers_k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10-
k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
10+
"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
1111
"github.com/scaleway/scaleway-sdk-go/scw"
1212
)
1313

‎scaleway/helpers_lb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8-
lb "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
8+
"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
99
"github.com/scaleway/scaleway-sdk-go/scw"
1010
)
1111

‎scaleway/helpers_vpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package scaleway
22

33
import (
44
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
5-
vpc "github.com/scaleway/scaleway-sdk-go/api/vpc/v1"
5+
"github.com/scaleway/scaleway-sdk-go/api/vpc/v1"
66
"github.com/scaleway/scaleway-sdk-go/scw"
77
)
88

‎scaleway/provider_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,10 @@ import (
1919
)
2020

2121
var (
22-
// Deprecated
23-
testAccProviders map[string]*schema.Provider
24-
// Deprecated
25-
testAccProvider *schema.Provider
26-
2722
// UpdateCassettes will update all cassettes of a given test
2823
UpdateCassettes = flag.Bool("cassettes", os.Getenv("TF_UPDATE_CASSETTES") == "true", "Record Cassettes")
2924
)
3025

31-
func init() {
32-
p := Provider(DefaultProviderConfig())()
33-
testAccProvider = p
34-
version += "-tftest"
35-
testAccProviders = map[string]*schema.Provider{
36-
"scaleway": p,
37-
}
38-
}
39-
4026
func testAccPreCheck(_ *testing.T) {}
4127

4228
// getTestFilePath returns a valid filename path based on the go test name and suffix. (Take care of non fs friendly char)

‎scaleway/resource_baremetal_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
9-
baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
9+
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
sdkValidation "github.com/scaleway/scaleway-sdk-go/validation"
1212
)

‎scaleway/resource_instance_security_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func resourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.Re
154154
_ = d.Set("enable_default_security", res.SecurityGroup.EnableDefaultSecurity)
155155

156156
if !d.Get("external_rules").(bool) {
157-
inboundRules, outboundRules, err := getSecurityGroupRules(instanceAPI, zone, ID, d)
157+
inboundRules, outboundRules, err := getSecurityGroupRules(ctx, instanceAPI, zone, ID, d)
158158
if err != nil {
159159
return diag.FromErr(err)
160160
}
@@ -164,11 +164,11 @@ func resourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.Re
164164
return nil
165165
}
166166

167-
func getSecurityGroupRules(instanceAPI *instance.API, zone scw.Zone, securityGroupID string, d *schema.ResourceData) ([]interface{}, []interface{}, error) {
167+
func getSecurityGroupRules(ctx context.Context, instanceAPI *instance.API, zone scw.Zone, securityGroupID string, d *schema.ResourceData) ([]interface{}, []interface{}, error) {
168168
resRules, err := instanceAPI.ListSecurityGroupRules(&instance.ListSecurityGroupRulesRequest{
169169
Zone: zone,
170170
SecurityGroupID: expandID(securityGroupID),
171-
}, scw.WithAllPages())
171+
}, scw.WithAllPages(), scw.WithContext(ctx))
172172
if err != nil {
173173
return nil, nil, err
174174
}

‎scaleway/resource_instance_security_group_rules.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func resourceScalewayInstanceSecurityGroupRulesRead(ctx context.Context, d *sche
6161

6262
_ = d.Set("security_group_id", securityGroupZonedID)
6363

64-
inboundRules, outboundRules, err := getSecurityGroupRules(instanceAPI, zone, securityGroupID, d)
64+
inboundRules, outboundRules, err := getSecurityGroupRules(ctx, instanceAPI, zone, securityGroupID, d)
6565
if err != nil {
6666
return diag.FromErr(err)
6767
}

‎scaleway/resource_k8s_cluster.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
12-
k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
12+
"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
1313
"github.com/scaleway/scaleway-sdk-go/scw"
1414
)
1515

@@ -252,7 +252,7 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat
252252
autoscalerReq := &k8s.CreateClusterRequestAutoscalerConfig{}
253253

254254
if scaleDownDisabled, ok := d.GetOk("autoscaler_config.0.disable_scale_down"); ok {
255-
autoscalerReq.ScaleDownDisabled = scw.BoolPtr((scaleDownDisabled.(bool)))
255+
autoscalerReq.ScaleDownDisabled = scw.BoolPtr(scaleDownDisabled.(bool))
256256
}
257257

258258
if scaleDownDelayAfterAdd, ok := d.GetOk("autoscaler_config.0.scale_down_delay_after_add"); ok {
@@ -779,7 +779,7 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat
779779
autoscalerReq := &k8s.UpdateClusterRequestAutoscalerConfig{}
780780

781781
if d.HasChange("autoscaler_config.0.disable_scale_down") {
782-
autoscalerReq.ScaleDownDisabled = scw.BoolPtr((d.Get("autoscaler_config.0.disable_scale_down").(bool)))
782+
autoscalerReq.ScaleDownDisabled = scw.BoolPtr(d.Get("autoscaler_config.0.disable_scale_down").(bool))
783783
}
784784

785785
if d.HasChange("autoscaler_config.0.scale_down_delay_after_add") {

‎scaleway/resource_lb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
9-
lb "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
9+
"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
)
1212

‎scaleway/resource_lb_ip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8-
lb "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
8+
"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
99
"github.com/scaleway/scaleway-sdk-go/scw"
1010
)
1111

‎scaleway/resource_rdb_instance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func testAccCheckScalewayRdbInstanceDestroy(tt *TestTools) resource.TestCheckFun
152152

153153
// If no error resource still exist
154154
if err == nil {
155-
return fmt.Errorf("Instance (%s) still exists", rs.Primary.ID)
155+
return fmt.Errorf("instance (%s) still exists", rs.Primary.ID)
156156
}
157157

158158
// Unexpected api error we return it

0 commit comments

Comments
 (0)