fix linter issue

Oppodelldog · Oct 31, 2023 · 9922298 · 9922298
1 parent 59ead15
commit 9922298
Showing 1 changed file with 8 additions and 40 deletions.
diff --git a/config/merge.go b/config/merge.go
@@ -23,46 +23,14 @@ func mergeCommand(baseCommand CommandDefinition, overlayCommand CommandDefinitio
 	mergedCommand.IsDaemon = resolvePropertyBool(baseCommand.IsDaemon, overlayCommand.IsDaemon)
 	mergedCommand.UniqueNames = resolvePropertyBool(baseCommand.UniqueNames, overlayCommand.UniqueNames)
 
-	mergedCommand.MergeTemplateArrays = resolvePropertyStringArray(
-		false,
-		baseCommand.MergeTemplateArrays,
-		overlayCommand.MergeTemplateArrays,
-	)
-	mergedCommand.Volumes = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("Volumes"),
-		baseCommand.Volumes,
-		overlayCommand.Volumes,
-	)
-	mergedCommand.Tmpfs = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("Tmpfs"),
-		baseCommand.Tmpfs,
-		overlayCommand.Tmpfs,
-	)
-	mergedCommand.Links = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("Links"),
-		baseCommand.Links,
-		overlayCommand.Links,
-	)
-	mergedCommand.EnvVars = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("EnvVars"),
-		baseCommand.EnvVars,
-		overlayCommand.EnvVars,
-	)
-	mergedCommand.Ports = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("Ports"),
-		baseCommand.Ports,
-		overlayCommand.Ports,
-	)
-	mergedCommand.PortsFromParams = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("PortsFromParams"),
-		baseCommand.PortsFromParams,
-		overlayCommand.PortsFromParams,
-	)
-	mergedCommand.AdditionalArgs = resolvePropertyStringArray(
-		mergedCommand.IsTemplateArrayMerged("AdditionalArgs"),
-		baseCommand.AdditionalArgs,
-		overlayCommand.AdditionalArgs,
-	)
+	mergedCommand.MergeTemplateArrays = resolvePropertyStringArray(false, baseCommand.MergeTemplateArrays, overlayCommand.MergeTemplateArrays)
+	mergedCommand.Volumes = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("Volumes"), baseCommand.Volumes, overlayCommand.Volumes)
+	mergedCommand.Tmpfs = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("Tmpfs"), baseCommand.Tmpfs, overlayCommand.Tmpfs)
+	mergedCommand.Links = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("Links"), baseCommand.Links, overlayCommand.Links)
+	mergedCommand.EnvVars = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("EnvVars"), baseCommand.EnvVars, overlayCommand.EnvVars)
+	mergedCommand.Ports = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("Ports"), baseCommand.Ports, overlayCommand.Ports)
+	mergedCommand.PortsFromParams = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("PortsFromParams"), baseCommand.PortsFromParams, overlayCommand.PortsFromParams)
+	mergedCommand.AdditionalArgs = resolvePropertyStringArray(mergedCommand.IsTemplateArrayMerged("AdditionalArgs"), baseCommand.AdditionalArgs, overlayCommand.AdditionalArgs)
 
 	mergedCommand.ReplaceArgs = resolvePropertyStringArray2D(baseCommand.ReplaceArgs, overlayCommand.ReplaceArgs)