Skip to content

Commit 53d6c2d

Browse files
remyleoneremyleone
committed
Fix format
1 parent cc0ab03 commit 53d6c2d

File tree

5 files changed

+54
-54
lines changed

5 files changed

+54
-54
lines changed

‎internal/services/autoscaling/helpers_autoscaling.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
// NewAPIWithZone returns a new autoscaling API and the zone for a Create request
12-
func NewAPIWithZone(d *schema.ResourceData, m interface{}) (*autoscaling.API, scw.Zone, error) {
12+
func NewAPIWithZone(d *schema.ResourceData, m any) (*autoscaling.API, scw.Zone, error) {
1313
autoscalingAPI := autoscaling.NewAPI(meta.ExtractScwClient(m))
1414

1515
zone, err := meta.ExtractZone(d, m)
@@ -21,7 +21,7 @@ func NewAPIWithZone(d *schema.ResourceData, m interface{}) (*autoscaling.API, sc
2121
}
2222

2323
// NewAPIWithZoneAndID returns a new autoscaling API with zone and ID extracted from the state
24-
func NewAPIWithZoneAndID(m interface{}, zonalID string) (*autoscaling.API, scw.Zone, string, error) {
24+
func NewAPIWithZoneAndID(m any, zonalID string) (*autoscaling.API, scw.Zone, string, error) {
2525
autoscalingAPI := autoscaling.NewAPI(meta.ExtractScwClient(m))
2626

2727
zone, ID, err := zonal.ParseID(zonalID)

‎internal/services/autoscaling/instance_group.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func ResourceInstanceGroup() *schema.Resource {
128128
}
129129
}
130130

131-
func ResourceInstanceGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
131+
func ResourceInstanceGroupCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
132132
api, zone, err := NewAPIWithZone(d, m)
133133
if err != nil {
134134
return diag.FromErr(err)
@@ -154,7 +154,7 @@ func ResourceInstanceGroupCreate(ctx context.Context, d *schema.ResourceData, m
154154
return ResourceInstanceGroupRead(ctx, d, m)
155155
}
156156

157-
func ResourceInstanceGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
157+
func ResourceInstanceGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
158158
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
159159
if err != nil {
160160
return diag.FromErr(err)
@@ -187,7 +187,7 @@ func ResourceInstanceGroupRead(ctx context.Context, d *schema.ResourceData, m in
187187
return nil
188188
}
189189

190-
func ResourceInstanceGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
190+
func ResourceInstanceGroupUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
191191
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
192192
if err != nil {
193193
return diag.FromErr(err)
@@ -230,7 +230,7 @@ func ResourceInstanceGroupUpdate(ctx context.Context, d *schema.ResourceData, m
230230
return ResourceInstanceGroupRead(ctx, d, m)
231231
}
232232

233-
func ResourceInstanceGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
233+
func ResourceInstanceGroupDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
234234
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
235235
if err != nil {
236236
return diag.FromErr(err)

‎internal/services/autoscaling/instance_policy.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func ResourceInstancePolicy() *schema.Resource {
116116
}
117117
}
118118

119-
func ResourceInstancePolicyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
119+
func ResourceInstancePolicyCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
120120
api, zone, err := NewAPIWithZone(d, m)
121121
if err != nil {
122122
return diag.FromErr(err)
@@ -130,7 +130,7 @@ func ResourceInstancePolicyCreate(ctx context.Context, d *schema.ResourceData, m
130130
Type: autoscaling.InstancePolicyType(d.Get("type").(string)),
131131
Value: uint32(d.Get("value").(int)),
132132
Priority: uint32(d.Get("priority").(int)),
133-
Metric: expandPolicyMetric(d.Get("metric").([]interface{})),
133+
Metric: expandPolicyMetric(d.Get("metric").([]any)),
134134
}
135135

136136
policy, err := api.CreateInstancePolicy(req, scw.WithContext(ctx))
@@ -143,7 +143,7 @@ func ResourceInstancePolicyCreate(ctx context.Context, d *schema.ResourceData, m
143143
return ResourceInstancePolicyRead(ctx, d, m)
144144
}
145145

146-
func ResourceInstancePolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
146+
func ResourceInstancePolicyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
147147
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
148148
if err != nil {
149149
return diag.FromErr(err)
@@ -175,7 +175,7 @@ func ResourceInstancePolicyRead(ctx context.Context, d *schema.ResourceData, m i
175175
return nil
176176
}
177177

178-
func ResourceInstancePolicyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
178+
func ResourceInstancePolicyUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
179179
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
180180
if err != nil {
181181
return diag.FromErr(err)
@@ -220,7 +220,7 @@ func ResourceInstancePolicyUpdate(ctx context.Context, d *schema.ResourceData, m
220220
return ResourceInstancePolicyRead(ctx, d, m)
221221
}
222222

223-
func ResourceInstancePolicyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
223+
func ResourceInstancePolicyDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
224224
api, zone, id, err := NewAPIWithZoneAndID(m, d.Id())
225225
if err != nil {
226226
return diag.FromErr(err)

‎internal/services/autoscaling/instance_template.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func ResourceInstanceTemplate() *schema.Resource {
185185
}
186186
}
187187

188-
func ResourceInstanceTemplateCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
188+
func ResourceInstanceTemplateCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
189189
api, zone, err := NewAPIWithZone(d, m)
190190
if err != nil {
191191
return diag.FromErr(err)
@@ -210,7 +210,7 @@ func ResourceInstanceTemplateCreate(ctx context.Context, d *schema.ResourceData,
210210
req.CloudInit = &rawCI
211211
}
212212

213-
volumesList := expandVolumes(d.Get("volumes").([]interface{}))
213+
volumesList := expandVolumes(d.Get("volumes").([]any))
214214

215215
req.Volumes = volumesList
216216

@@ -224,7 +224,7 @@ func ResourceInstanceTemplateCreate(ctx context.Context, d *schema.ResourceData,
224224
return ResourceInstanceTemplateRead(ctx, d, m)
225225
}
226226

227-
func ResourceInstanceTemplateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
227+
func ResourceInstanceTemplateRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
228228
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
229229
if err != nil {
230230
return diag.FromErr(err)
@@ -281,7 +281,7 @@ func ResourceInstanceTemplateRead(ctx context.Context, d *schema.ResourceData, m
281281
return nil
282282
}
283283

284-
func ResourceInstanceTemplateUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
284+
func ResourceInstanceTemplateUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
285285
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
286286
if err != nil {
287287
return diag.FromErr(err)
@@ -346,7 +346,7 @@ func ResourceInstanceTemplateUpdate(ctx context.Context, d *schema.ResourceData,
346346
}
347347

348348
if d.HasChange("volumes") {
349-
updateRequest.Volumes = expandVolumes(d.Get("volumes").([]interface{}))
349+
updateRequest.Volumes = expandVolumes(d.Get("volumes").([]any))
350350
hasChanged = true
351351
}
352352

@@ -360,7 +360,7 @@ func ResourceInstanceTemplateUpdate(ctx context.Context, d *schema.ResourceData,
360360
return ResourceInstanceTemplateRead(ctx, d, m)
361361
}
362362

363-
func ResourceInstanceTemplateDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
363+
func ResourceInstanceTemplateDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
364364
api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id())
365365
if err != nil {
366366
return diag.FromErr(err)

‎internal/services/autoscaling/types.go‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
1414
)
1515

16-
func expandInstanceCapacity(raw interface{}) *autoscaling.Capacity {
17-
if raw == nil || len(raw.([]interface{})) != 1 {
16+
func expandInstanceCapacity(raw any) *autoscaling.Capacity {
17+
if raw == nil || len(raw.([]any)) != 1 {
1818
return nil
1919
}
2020

21-
rawMap := raw.([]interface{})[0].(map[string]interface{})
21+
rawMap := raw.([]any)[0].(map[string]any)
2222
capacity := &autoscaling.Capacity{
2323
MaxReplicas: uint32(rawMap["max_replicas"].(int)),
2424
MinReplicas: uint32(rawMap["min_replicas"].(int)),
@@ -31,12 +31,12 @@ func expandInstanceCapacity(raw interface{}) *autoscaling.Capacity {
3131
return capacity
3232
}
3333

34-
func expandUpdateInstanceCapacity(raw interface{}) *autoscaling.UpdateInstanceGroupRequestCapacity {
35-
if raw == nil || len(raw.([]interface{})) != 1 {
34+
func expandUpdateInstanceCapacity(raw any) *autoscaling.UpdateInstanceGroupRequestCapacity {
35+
if raw == nil || len(raw.([]any)) != 1 {
3636
return nil
3737
}
3838

39-
rawMap := raw.([]interface{})[0].(map[string]interface{})
39+
rawMap := raw.([]any)[0].(map[string]any)
4040
capacity := &autoscaling.UpdateInstanceGroupRequestCapacity{}
4141

4242
if rawVal, ok := rawMap["max_replicas"].(int); ok {
@@ -54,12 +54,12 @@ func expandUpdateInstanceCapacity(raw interface{}) *autoscaling.UpdateInstanceGr
5454
return capacity
5555
}
5656

57-
func expandInstanceLoadBalancer(raw interface{}) *autoscaling.Loadbalancer {
58-
if raw == nil || len(raw.([]interface{})) != 1 {
57+
func expandInstanceLoadBalancer(raw any) *autoscaling.Loadbalancer {
58+
if raw == nil || len(raw.([]any)) != 1 {
5959
return nil
6060
}
6161

62-
rawMap := raw.([]interface{})[0].(map[string]interface{})
62+
rawMap := raw.([]any)[0].(map[string]any)
6363

6464
return &autoscaling.Loadbalancer{
6565
ID: locality.ExpandID(rawMap["id"].(string)),
@@ -68,12 +68,12 @@ func expandInstanceLoadBalancer(raw interface{}) *autoscaling.Loadbalancer {
6868
}
6969
}
7070

71-
func expandPolicyMetric(raw interface{}) *autoscaling.Metric {
72-
if raw == nil || len(raw.([]interface{})) != 1 {
71+
func expandPolicyMetric(raw any) *autoscaling.Metric {
72+
if raw == nil || len(raw.([]any)) != 1 {
7373
return nil
7474
}
7575

76-
rawMap := raw.([]interface{})[0].(map[string]interface{})
76+
rawMap := raw.([]any)[0].(map[string]any)
7777

7878
var managedPtr *autoscaling.MetricManagedMetric
7979

@@ -93,12 +93,12 @@ func expandPolicyMetric(raw interface{}) *autoscaling.Metric {
9393
}
9494
}
9595

96-
func expandUpdatePolicyMetric(raw interface{}) *autoscaling.UpdateInstancePolicyRequestMetric {
97-
if raw == nil || len(raw.([]interface{})) != 1 {
96+
func expandUpdatePolicyMetric(raw any) *autoscaling.UpdateInstancePolicyRequestMetric {
97+
if raw == nil || len(raw.([]any)) != 1 {
9898
return nil
9999
}
100100

101-
rawMap := raw.([]interface{})[0].(map[string]interface{})
101+
rawMap := raw.([]any)[0].(map[string]any)
102102

103103
var managedPtr *autoscaling.UpdateInstancePolicyRequestMetricManagedMetric
104104

@@ -118,12 +118,12 @@ func expandUpdatePolicyMetric(raw interface{}) *autoscaling.UpdateInstancePolicy
118118
}
119119
}
120120

121-
func expandUpdateInstanceLoadBalancer(raw interface{}) *autoscaling.UpdateInstanceGroupRequestLoadbalancer {
122-
if raw == nil || len(raw.([]interface{})) != 1 {
121+
func expandUpdateInstanceLoadBalancer(raw any) *autoscaling.UpdateInstanceGroupRequestLoadbalancer {
122+
if raw == nil || len(raw.([]any)) != 1 {
123123
return nil
124124
}
125125

126-
rawMap := raw.([]interface{})[0].(map[string]interface{})
126+
rawMap := raw.([]any)[0].(map[string]any)
127127
lb := &autoscaling.UpdateInstanceGroupRequestLoadbalancer{}
128128

129129
if rawVal, ok := rawMap["backend_ids"].(int); ok {
@@ -133,29 +133,29 @@ func expandUpdateInstanceLoadBalancer(raw interface{}) *autoscaling.UpdateInstan
133133
return lb
134134
}
135135

136-
func expandVolumes(rawVols []interface{}) map[string]*autoscaling.VolumeInstanceTemplate {
136+
func expandVolumes(rawVols []any) map[string]*autoscaling.VolumeInstanceTemplate {
137137
vols := make(map[string]*autoscaling.VolumeInstanceTemplate, len(rawVols))
138138

139139
for i, raw := range rawVols {
140-
m := raw.(map[string]interface{})
140+
m := raw.(map[string]any)
141141
vt := &autoscaling.VolumeInstanceTemplate{
142142
Name: m["name"].(string),
143143
Boot: m["boot"].(bool),
144144
VolumeType: autoscaling.VolumeInstanceTemplateVolumeType(m["volume_type"].(string)),
145-
Tags: types.ExpandStrings(m["tags"].([]interface{})),
145+
Tags: types.ExpandStrings(m["tags"].([]any)),
146146
PerfIops: types.ExpandUint32Ptr(m["perf_iops"].(int)),
147147
}
148148

149-
if slice := m["from_empty"].([]interface{}); len(slice) > 0 && slice[0] != nil {
150-
inner := slice[0].(map[string]interface{})
149+
if slice := m["from_empty"].([]any); len(slice) > 0 && slice[0] != nil {
150+
inner := slice[0].(map[string]any)
151151
sizeGB := inner["size"].(int)
152152
vt.FromEmpty = &autoscaling.VolumeInstanceTemplateFromEmpty{
153153
Size: scw.Size(uint64(sizeGB) * uint64(scw.GB)),
154154
}
155155
}
156156

157-
if slice := m["from_snapshot"].([]interface{}); len(slice) > 0 && slice[0] != nil {
158-
inner := slice[0].(map[string]interface{})
157+
if slice := m["from_snapshot"].([]any); len(slice) > 0 && slice[0] != nil {
158+
inner := slice[0].(map[string]any)
159159
snapshot := &autoscaling.VolumeInstanceTemplateFromSnapshot{
160160
SnapshotID: locality.ExpandID(inner["snapshot_id"].(string)),
161161
}
@@ -173,12 +173,12 @@ func expandVolumes(rawVols []interface{}) map[string]*autoscaling.VolumeInstance
173173
return vols
174174
}
175175

176-
func flattenInstanceCapacity(capacity *autoscaling.Capacity) interface{} {
176+
func flattenInstanceCapacity(capacity *autoscaling.Capacity) any {
177177
if capacity == nil {
178178
return nil
179179
}
180180

181-
return []map[string]interface{}{
181+
return []map[string]any{
182182
{
183183
"max_replicas": capacity.MaxReplicas,
184184
"min_replicas": capacity.MinReplicas,
@@ -187,7 +187,7 @@ func flattenInstanceCapacity(capacity *autoscaling.Capacity) interface{} {
187187
}
188188
}
189189

190-
func flattenInstanceLoadBalancer(lb *autoscaling.Loadbalancer, zone scw.Zone) interface{} {
190+
func flattenInstanceLoadBalancer(lb *autoscaling.Loadbalancer, zone scw.Zone) any {
191191
if lb == nil {
192192
return nil
193193
}
@@ -197,7 +197,7 @@ func flattenInstanceLoadBalancer(lb *autoscaling.Loadbalancer, zone scw.Zone) in
197197
return diag.FromErr(err)
198198
}
199199

200-
return []map[string]interface{}{
200+
return []map[string]any{
201201
{
202202
"id": zonal.NewIDString(zone, lb.ID),
203203
"backend_ids": zonal.NewIDStrings(zone, lb.BackendIDs),
@@ -206,7 +206,7 @@ func flattenInstanceLoadBalancer(lb *autoscaling.Loadbalancer, zone scw.Zone) in
206206
}
207207
}
208208

209-
func flattenPolicyMetric(metric *autoscaling.Metric) interface{} {
209+
func flattenPolicyMetric(metric *autoscaling.Metric) any {
210210
if metric == nil {
211211
return nil
212212
}
@@ -216,7 +216,7 @@ func flattenPolicyMetric(metric *autoscaling.Metric) interface{} {
216216
managedMetric = metric.ManagedMetric.String()
217217
}
218218

219-
return []map[string]interface{}{
219+
return []map[string]any{
220220
{
221221
"name": metric.Name,
222222
"managed_metric": managedMetric,
@@ -229,19 +229,19 @@ func flattenPolicyMetric(metric *autoscaling.Metric) interface{} {
229229
}
230230
}
231231

232-
func flattenVolumes(zone scw.Zone, volMap map[string]*autoscaling.VolumeInstanceTemplate) []interface{} {
232+
func flattenVolumes(zone scw.Zone, volMap map[string]*autoscaling.VolumeInstanceTemplate) []any {
233233
keys := make([]string, 0, len(volMap))
234234
for k := range volMap {
235235
keys = append(keys, k)
236236
}
237237

238238
sort.Strings(keys)
239239

240-
volumes := make([]interface{}, len(keys))
240+
volumes := make([]any, len(keys))
241241

242242
for i, k := range keys {
243243
v := volMap[k]
244-
m := map[string]interface{}{
244+
m := map[string]any{
245245
"name": v.Name,
246246
"boot": v.Boot,
247247
"volume_type": v.VolumeType.String(),
@@ -250,21 +250,21 @@ func flattenVolumes(zone scw.Zone, volMap map[string]*autoscaling.VolumeInstance
250250
}
251251

252252
if v.FromEmpty != nil {
253-
m["from_empty"] = []interface{}{map[string]interface{}{
253+
m["from_empty"] = []any{map[string]any{
254254
"size": int(v.FromEmpty.Size / scw.GB),
255255
}}
256256
}
257257

258258
if v.FromSnapshot != nil {
259-
inner := map[string]interface{}{
259+
inner := map[string]any{
260260
"snapshot_id": zonal.NewIDString(zone, v.FromSnapshot.SnapshotID),
261261
}
262262

263263
if v.FromSnapshot.Size != nil {
264264
inner["size"] = int(*v.FromSnapshot.Size / scw.GB)
265265
}
266266

267-
m["from_snapshot"] = []interface{}{inner}
267+
m["from_snapshot"] = []any{inner}
268268
}
269269

270270
volumes[i] = m

0 commit comments

Comments
 (0)