Skip to content

Commit 6a39f9b

Browse files
committed
ic: aws: replace deprecated sets syntax
1 parent a5ea96c commit 6a39f9b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkg/asset/installconfig/aws/validation.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,16 @@ func validateSubnets(ctx context.Context, meta *Metadata, fldPath *field.Path, s
179179
allErrs = append(allErrs, validateDuplicateSubnetZones(fldPath, publicSubnets, publicSubnetsIdx, "public")...)
180180
allErrs = append(allErrs, validateDuplicateSubnetZones(fldPath, edgeSubnets, edgeSubnetsIdx, "edge")...)
181181

182-
privateZones := sets.NewString()
183-
publicZones := sets.NewString()
182+
privateZones := sets.New[string]()
183+
publicZones := sets.New[string]()
184184
for _, subnet := range privateSubnets {
185185
privateZones.Insert(subnet.Zone.Name)
186186
}
187187
for _, subnet := range publicSubnets {
188188
publicZones.Insert(subnet.Zone.Name)
189189
}
190190
if publish == types.ExternalPublishingStrategy && !publicZones.IsSuperset(privateZones) {
191-
errMsg := fmt.Sprintf("No public subnet provided for zones %s", privateZones.Difference(publicZones).List())
191+
errMsg := fmt.Sprintf("No public subnet provided for zones %s", sets.List(privateZones.Difference(publicZones)))
192192
allErrs = append(allErrs, field.Invalid(fldPath, subnets, errMsg))
193193
}
194194

@@ -230,7 +230,7 @@ func validateMachinePool(ctx context.Context, meta *Metadata, fldPath *field.Pat
230230
}
231231

232232
if pool.Zones != nil && len(pool.Zones) > 0 {
233-
availableZones := sets.String{}
233+
availableZones := sets.New[string]()
234234
diffErrMsgPrefix := "One or more zones are unavailable"
235235
if len(platform.Subnets) > 0 {
236236
diffErrMsgPrefix = "No subnets provided for zones"
@@ -260,8 +260,8 @@ func validateMachinePool(ctx context.Context, meta *Metadata, fldPath *field.Pat
260260
availableZones.Insert(allzones...)
261261
}
262262

263-
if diff := sets.NewString(pool.Zones...).Difference(availableZones); diff.Len() > 0 {
264-
errMsg := fmt.Sprintf("%s %s", diffErrMsgPrefix, diff.List())
263+
if diff := sets.New[string](pool.Zones...).Difference(availableZones); diff.Len() > 0 {
264+
errMsg := fmt.Sprintf("%s %s", diffErrMsgPrefix, sets.List(diff))
265265
allErrs = append(allErrs, field.Invalid(fldPath.Child("zones"), pool.Zones, errMsg))
266266
}
267267
}

0 commit comments

Comments
 (0)