Skip to content

Commit 231b483

Browse files
remyleoneremyleone
authored
chore: rename meta argument from m to meta (#786)
1 parent ed51251 commit 231b483

36 files changed

+264
-269
lines changed

‎scaleway/data_source_baremetal_offer.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ func dataSourceScalewayBaremetalOffer() *schema.Resource {
131131
}
132132
}
133133

134-
func dataSourceScalewayBaremetalOfferRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
135-
meta := m.(*Meta)
134+
func dataSourceScalewayBaremetalOfferRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
136135
baremetalAPI, fallBackZone, err := baremetalAPIWithZone(d, meta)
137136
if err != nil {
138137
return diag.FromErr(err)

‎scaleway/data_source_instance_image.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ func dataSourceScalewayInstanceImage() *schema.Resource {
9393
}
9494
}
9595

96-
func dataSourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
97-
meta := m.(*Meta)
96+
func dataSourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
9897
instanceAPI, zone, err := instanceAPIWithZone(d, meta)
9998
if err != nil {
10099
return diag.FromErr(err)

‎scaleway/data_source_instance_security_group.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ func dataSourceScalewayInstanceSecurityGroup() *schema.Resource {
3333
}
3434
}
3535

36-
func dataSourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
37-
meta := m.(*Meta)
36+
func dataSourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
3837
instanceAPI, zone, err := instanceAPIWithZone(d, meta)
3938
if err != nil {
4039
return diag.FromErr(err)
@@ -66,5 +65,5 @@ func dataSourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.
6665
zonedID := datasourceNewZonedID(securityGroupID, zone)
6766
d.SetId(zonedID)
6867
_ = d.Set("security_group_id", zonedID)
69-
return resourceScalewayInstanceSecurityGroupRead(ctx, d, m)
68+
return resourceScalewayInstanceSecurityGroupRead(ctx, d, meta)
7069
}

‎scaleway/data_source_instance_server.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ func dataSourceScalewayInstanceServer() *schema.Resource {
3333
}
3434
}
3535

36-
func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
37-
meta := m.(*Meta)
36+
func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
3837
instanceAPI, zone, err := instanceAPIWithZone(d, meta)
3938
if err != nil {
4039
return diag.FromErr(err)
@@ -66,5 +65,5 @@ func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.Resourc
6665
zonedID := datasourceNewZonedID(serverID, zone)
6766
d.SetId(zonedID)
6867
_ = d.Set("server_id", zonedID)
69-
return resourceScalewayInstanceServerRead(ctx, d, m)
68+
return resourceScalewayInstanceServerRead(ctx, d, meta)
7069
}

‎scaleway/data_source_instance_volume.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ func dataSourceScalewayInstanceVolume() *schema.Resource {
3232
}
3333
}
3434

35-
func dataSourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
36-
meta := m.(*Meta)
35+
func dataSourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
3736
instanceAPI, zone, err := instanceAPIWithZone(d, meta)
3837
if err != nil {
3938
return diag.FromErr(err)
@@ -68,5 +67,5 @@ func dataSourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.Resourc
6867
if err != nil {
6968
return diag.FromErr(err)
7069
}
71-
return resourceScalewayInstanceVolumeRead(ctx, d, m)
70+
return resourceScalewayInstanceVolumeRead(ctx, d, meta)
7271
}

‎scaleway/data_source_k8s_cluster.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ func dataSourceScalewayK8SCluster() *schema.Resource {
3434
}
3535
}
3636

37-
func dataSourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
38-
meta := m.(*Meta)
37+
func dataSourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
3938
k8sAPI, region, err := k8sAPIWithRegion(d, meta)
4039
if err != nil {
4140
return diag.FromErr(err)
@@ -67,5 +66,5 @@ func dataSourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceDat
6766
regionalizedID := datasourceNewRegionalizedID(clusterID, region)
6867
d.SetId(regionalizedID)
6968
_ = d.Set("cluster_id", regionalizedID)
70-
return resourceScalewayK8SClusterRead(ctx, d, m)
69+
return resourceScalewayK8SClusterRead(ctx, d, meta)
7170
}

‎scaleway/data_source_k8s_pool.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ func dataSourceScalewayK8SPool() *schema.Resource {
3535
}
3636
}
3737

38-
func dataSourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
39-
meta := m.(*Meta)
38+
func dataSourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
4039
k8sAPI, region, err := k8sAPIWithRegion(d, meta)
4140
if err != nil {
4241
return diag.FromErr(err)
@@ -69,5 +68,5 @@ func dataSourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData,
6968
regionalizedID := datasourceNewRegionalizedID(poolID, region)
7069
d.SetId(regionalizedID)
7170
_ = d.Set("pool_id", regionalizedID)
72-
return resourceScalewayK8SPoolRead(ctx, d, m)
71+
return resourceScalewayK8SPoolRead(ctx, d, meta)
7372
}

‎scaleway/data_source_lb_ip.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ func dataSourceScalewayLbIP() *schema.Resource {
3434
}
3535
}
3636

37-
func dataSourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
38-
api, region, err := lbAPIWithRegion(d, m)
37+
func dataSourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
38+
api, region, err := lbAPIWithRegion(d, meta)
3939
if err != nil {
4040
return diag.FromErr(err)
4141
}
@@ -65,5 +65,5 @@ func dataSourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, m i
6565
if err != nil {
6666
return diag.FromErr(err)
6767
}
68-
return resourceScalewayLbIPRead(ctx, d, m)
68+
return resourceScalewayLbIPRead(ctx, d, meta)
6969
}

‎scaleway/data_source_marketplace_image.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func dataSourceScalewayMarketplaceImage() *schema.Resource {
2929
}
3030
}
3131

32-
func dataSourceScalewayMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
33-
marketplaceAPI, zone, err := marketplaceAPIWithZone(d, m)
32+
func dataSourceScalewayMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
33+
marketplaceAPI, zone, err := marketplaceAPIWithZone(d, meta)
3434
if err != nil {
3535
return diag.FromErr(err)
3636
}

‎scaleway/data_source_rdb_instance.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func dataSourceScalewayRDBInstance() *schema.Resource {
3131
}
3232
}
3333

34-
func dataSourceScalewayRDBInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
35-
api, region, err := rdbAPIWithRegion(d, m)
34+
func dataSourceScalewayRDBInstanceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
35+
api, region, err := rdbAPIWithRegion(d, meta)
3636
if err != nil {
3737
return diag.FromErr(err)
3838
}
@@ -61,5 +61,5 @@ func dataSourceScalewayRDBInstanceRead(ctx context.Context, d *schema.ResourceDa
6161
if err != nil {
6262
return diag.FromErr(err)
6363
}
64-
return resourceScalewayRdbInstanceRead(ctx, d, m)
64+
return resourceScalewayRdbInstanceRead(ctx, d, meta)
6565
}

‎scaleway/data_source_registry_namespace.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func dataSourceScalewayRegistryNamespace() *schema.Resource {
3232
}
3333
}
3434

35-
func dataSourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
36-
api, region, err := registryAPIWithRegion(d, m)
35+
func dataSourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
36+
api, region, err := registryAPIWithRegion(d, meta)
3737
if err != nil {
3838
return diag.FromErr(err)
3939
}
@@ -60,5 +60,5 @@ func dataSourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.Reso
6060
d.SetId(regionalID)
6161
_ = d.Set("namespace_id", regionalID)
6262

63-
return resourceScalewayRegistryNamespaceRead(ctx, d, m)
63+
return resourceScalewayRegistryNamespaceRead(ctx, d, meta)
6464
}

‎scaleway/data_source_vpc_private_network.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ func dataSourceScalewayVPCPrivateNetwork() *schema.Resource {
3232
}
3333
}
3434

35-
func dataSourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
36-
meta := m.(*Meta)
35+
func dataSourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
3736
vpcAPI, zone, err := vpcAPIWithZone(d, meta)
3837
if err != nil {
3938
return diag.FromErr(err)
@@ -72,5 +71,5 @@ func dataSourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.Reso
7271
zonedID := datasourceNewZonedID(privateNetworkID, zone)
7372
d.SetId(zonedID)
7473
_ = d.Set("private_network_id", zonedID)
75-
return resourceScalewayVPCPrivateNetworkRead(ctx, d, m)
74+
return resourceScalewayVPCPrivateNetworkRead(ctx, d, meta)
7675
}

‎scaleway/resource_account_ssh_key.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func resourceScalewayAccountSSKKey() *schema.Resource {
4444
}
4545
}
4646

47-
func resourceScalewayAccountSSHKeyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
48-
accountAPI := accountAPI(m)
47+
func resourceScalewayAccountSSHKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
48+
accountAPI := accountAPI(meta)
4949

5050
res, err := accountAPI.CreateSSHKey(&account.CreateSSHKeyRequest{
5151
Name: d.Get("name").(string),
@@ -58,11 +58,11 @@ func resourceScalewayAccountSSHKeyCreate(ctx context.Context, d *schema.Resource
5858

5959
d.SetId(res.ID)
6060

61-
return resourceScalewayAccountSSHKeyRead(ctx, d, m)
61+
return resourceScalewayAccountSSHKeyRead(ctx, d, meta)
6262
}
6363

64-
func resourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
65-
accountAPI := accountAPI(m)
64+
func resourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
65+
accountAPI := accountAPI(meta)
6666

6767
res, err := accountAPI.GetSSHKey(&account.GetSSHKeyRequest{
6868
SSHKeyID: d.Id(),
@@ -83,8 +83,8 @@ func resourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.ResourceDa
8383
return nil
8484
}
8585

86-
func resourceScalewayAccountSSHKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
87-
accountAPI := accountAPI(m)
86+
func resourceScalewayAccountSSHKeyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
87+
accountAPI := accountAPI(meta)
8888

8989
if d.HasChange("name") {
9090
_, err := accountAPI.UpdateSSHKey(&account.UpdateSSHKeyRequest{
@@ -96,11 +96,11 @@ func resourceScalewayAccountSSHKeyUpdate(ctx context.Context, d *schema.Resource
9696
}
9797
}
9898

99-
return resourceScalewayAccountSSHKeyRead(ctx, d, m)
99+
return resourceScalewayAccountSSHKeyRead(ctx, d, meta)
100100
}
101101

102-
func resourceScalewayAccountSSHKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
103-
accountAPI := accountAPI(m)
102+
func resourceScalewayAccountSSHKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
103+
accountAPI := accountAPI(meta)
104104

105105
err := accountAPI.DeleteSSHKey(&account.DeleteSSHKeyRequest{
106106
SSHKeyID: d.Id(),

‎scaleway/resource_apple_silicon_server.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ func resourceScalewayAppleSiliconServer() *schema.Resource {
7373
}
7474
}
7575

76-
func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
77-
asAPI, zone, err := asAPIWithZone(d, m)
76+
func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
77+
asAPI, zone, err := asAPIWithZone(d, meta)
7878
if err != nil {
7979
return diag.FromErr(err)
8080
}
@@ -101,11 +101,11 @@ func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.Res
101101
return diag.FromErr(err)
102102
}
103103

104-
return resourceScalewayRdbInstanceRead(ctx, d, m)
104+
return resourceScalewayRdbInstanceRead(ctx, d, meta)
105105
}
106106

107-
func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
108-
asAPI, zone, ID, err := asAPIWithZoneAndID(m, d.Id())
107+
func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
108+
asAPI, zone, ID, err := asAPIWithZoneAndID(meta, d.Id())
109109
if err != nil {
110110
return diag.FromErr(err)
111111
}
@@ -137,8 +137,8 @@ func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.Resou
137137
return nil
138138
}
139139

140-
func resourceScalewayAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
141-
asAPI, zone, ID, err := asAPIWithZoneAndID(m, d.Id())
140+
func resourceScalewayAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
141+
asAPI, zone, ID, err := asAPIWithZoneAndID(meta, d.Id())
142142
if err != nil {
143143
return diag.FromErr(err)
144144
}
@@ -157,11 +157,11 @@ func resourceScalewayAppleSiliconServerUpdate(ctx context.Context, d *schema.Res
157157
return diag.FromErr(err)
158158
}
159159

160-
return resourceScalewayAppleSiliconServerRead(ctx, d, m)
160+
return resourceScalewayAppleSiliconServerRead(ctx, d, meta)
161161
}
162162

163-
func resourceScalewayAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
164-
asAPI, zone, ID, err := asAPIWithZoneAndID(m, d.Id())
163+
func resourceScalewayAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
164+
asAPI, zone, ID, err := asAPIWithZoneAndID(meta, d.Id())
165165
if err != nil {
166166
return diag.FromErr(err)
167167
}

‎scaleway/resource_baremetal_server.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ func resourceScalewayBaremetalServer() *schema.Resource {
120120
}
121121
}
122122

123-
func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
124-
baremetalAPI, zone, err := baremetalAPIWithZone(d, m)
123+
func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
124+
baremetalAPI, zone, err := baremetalAPIWithZone(d, meta)
125125
if err != nil {
126126
return diag.FromErr(err)
127127
}
@@ -181,11 +181,11 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
181181
return diag.FromErr(err)
182182
}
183183

184-
return resourceScalewayBaremetalServerRead(ctx, d, m)
184+
return resourceScalewayBaremetalServerRead(ctx, d, meta)
185185
}
186186

187-
func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
188-
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id())
187+
func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
188+
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id())
189189
if err != nil {
190190
return diag.FromErr(err)
191191
}
@@ -227,8 +227,8 @@ func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.Resource
227227
return nil
228228
}
229229

230-
func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
231-
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id())
230+
func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
231+
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id())
232232
if err != nil {
233233
return diag.FromErr(err)
234234
}
@@ -268,11 +268,11 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
268268
}
269269
}
270270

271-
return resourceScalewayBaremetalServerRead(ctx, d, m)
271+
return resourceScalewayBaremetalServerRead(ctx, d, meta)
272272
}
273273

274-
func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
275-
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id())
274+
func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
275+
baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id())
276276
if err != nil {
277277
return diag.FromErr(err)
278278
}

‎scaleway/resource_instance_ip.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func resourceScalewayInstanceIP() *schema.Resource {
4444
}
4545
}
4646

47-
func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
48-
instanceAPI, zone, err := instanceAPIWithZone(d, m)
47+
func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
48+
instanceAPI, zone, err := instanceAPIWithZone(d, meta)
4949
if err != nil {
5050
return diag.FromErr(err)
5151
}
@@ -59,11 +59,11 @@ func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceDat
5959
}
6060

6161
d.SetId(newZonedIDString(zone, res.IP.ID))
62-
return resourceScalewayInstanceIPRead(ctx, d, m)
62+
return resourceScalewayInstanceIPRead(ctx, d, meta)
6363
}
6464

65-
func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
66-
instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id())
65+
func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
66+
instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id())
6767
if err != nil {
6868
return diag.FromErr(err)
6969
}
@@ -97,8 +97,8 @@ func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData,
9797
return nil
9898
}
9999

100-
func resourceScalewayInstanceIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
101-
instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id())
100+
func resourceScalewayInstanceIPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
101+
instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id())
102102
if err != nil {
103103
return diag.FromErr(err)
104104
}

0 commit comments

Comments
 (0)