Skip to content

Commit 12a0b0b

Browse files
committed
cli/compose: fix prealloc linting
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 99cef6f commit 12a0b0b

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

cli/compose/convert/service.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ func Service(
174174
}
175175

176176
func getPlacementPreference(preferences []composetypes.PlacementPreferences) []swarm.PlacementPreference {
177-
result := []swarm.PlacementPreference{}
177+
if len(preferences) == 0 {
178+
return nil
179+
}
180+
181+
result := make([]swarm.PlacementPreference, 0, len(preferences))
178182
for _, preference := range preferences {
179183
spreadDescriptor := preference.Spread
180184
result = append(result, swarm.PlacementPreference{
@@ -198,7 +202,7 @@ func convertServiceNetworks(
198202
}
199203
}
200204

201-
nets := []swarm.NetworkAttachmentConfig{}
205+
nets := make([]swarm.NetworkAttachmentConfig, 0, len(networks))
202206
for networkName, nw := range networks {
203207
networkConfig, ok := networkConfigs[networkName]
204208
if !ok && networkName != defaultNetwork {
@@ -241,15 +245,15 @@ func convertServiceSecrets(
241245
secrets []composetypes.ServiceSecretConfig,
242246
secretSpecs map[string]composetypes.SecretConfig,
243247
) ([]*swarm.SecretReference, error) {
244-
refs := []*swarm.SecretReference{}
245-
246248
lookup := func(key string) (composetypes.FileObjectConfig, error) {
247249
secretSpec, exists := secretSpecs[key]
248250
if !exists {
249251
return composetypes.FileObjectConfig{}, fmt.Errorf("undefined secret %q", key)
250252
}
251253
return composetypes.FileObjectConfig(secretSpec), nil
252254
}
255+
256+
refs := make([]*swarm.SecretReference, 0, len(secrets))
253257
for _, secret := range secrets {
254258
obj, err := convertFileObject(namespace, composetypes.FileReferenceConfig(secret), lookup)
255259
if err != nil {
@@ -564,7 +568,7 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
564568
}
565569

566570
func convertEndpointSpec(endpointMode string, source []composetypes.ServicePortConfig) *swarm.EndpointSpec {
567-
portConfigs := []swarm.PortConfig{}
571+
portConfigs := make([]swarm.PortConfig, 0, len(source))
568572
for _, port := range source {
569573
portConfig := swarm.PortConfig{
570574
Protocol: network.IPProtocol(port.Protocol),

cli/compose/loader/merge.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func toServiceVolumeConfigsMap(s any) (map[any]any, error) {
134134
}
135135

136136
func toServiceSecretConfigsSlice(dst reflect.Value, m map[any]any) error {
137-
s := []types.ServiceSecretConfig{}
137+
s := make([]types.ServiceSecretConfig, 0, len(m))
138138
for _, v := range m {
139139
s = append(s, v.(types.ServiceSecretConfig))
140140
}
@@ -144,7 +144,7 @@ func toServiceSecretConfigsSlice(dst reflect.Value, m map[any]any) error {
144144
}
145145

146146
func toSServiceConfigObjConfigsSlice(dst reflect.Value, m map[any]any) error {
147-
s := []types.ServiceConfigObjConfig{}
147+
s := make([]types.ServiceConfigObjConfig, 0, len(m))
148148
for _, v := range m {
149149
s = append(s, v.(types.ServiceConfigObjConfig))
150150
}
@@ -154,7 +154,7 @@ func toSServiceConfigObjConfigsSlice(dst reflect.Value, m map[any]any) error {
154154
}
155155

156156
func toServicePortConfigsSlice(dst reflect.Value, m map[any]any) error {
157-
s := []types.ServicePortConfig{}
157+
s := make([]types.ServicePortConfig, 0, len(m))
158158
for _, v := range m {
159159
s = append(s, v.(types.ServicePortConfig))
160160
}
@@ -164,7 +164,7 @@ func toServicePortConfigsSlice(dst reflect.Value, m map[any]any) error {
164164
}
165165

166166
func toServiceVolumeConfigsSlice(dst reflect.Value, m map[any]any) error {
167-
s := []types.ServiceVolumeConfig{}
167+
s := make([]types.ServiceVolumeConfig, 0, len(m))
168168
for _, v := range m {
169169
s = append(s, v.(types.ServiceVolumeConfig))
170170
}

0 commit comments

Comments
 (0)