From 98cb7b75d9f6d4c13f416718673efd9575efc07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Rod=C3=A1k?= Date: Mon, 6 Oct 2025 18:26:47 +0200 Subject: [PATCH] quadlet: standardize Convert function signatures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unused 'name' parameter from ConvertPod and reorder ConvertContainer parameters to match other Convert functions (unitFile, unitsInfoMap, isUser). Signed-off-by: Jan Rodák --- cmd/quadlet/main.go | 4 ++-- pkg/systemd/quadlet/quadlet.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/quadlet/main.go b/cmd/quadlet/main.go index ab7eb0b161..9ec3ab5253 100644 --- a/cmd/quadlet/main.go +++ b/cmd/quadlet/main.go @@ -537,7 +537,7 @@ func process() bool { switch { case strings.HasSuffix(unit.Filename, ".container"): warnIfAmbiguousName(unit, quadlet.ContainerGroup) - service, warnings, err = quadlet.ConvertContainer(unit, isUserFlag, unitsInfoMap) + service, warnings, err = quadlet.ConvertContainer(unit, unitsInfoMap, isUserFlag) case strings.HasSuffix(unit.Filename, ".volume"): warnIfAmbiguousName(unit, quadlet.VolumeGroup) service, warnings, err = quadlet.ConvertVolume(unit, unitsInfoMap, isUserFlag) @@ -551,7 +551,7 @@ func process() bool { case strings.HasSuffix(unit.Filename, ".build"): service, warnings, err = quadlet.ConvertBuild(unit, unitsInfoMap, isUserFlag) case strings.HasSuffix(unit.Filename, ".pod"): - service, warnings, err = quadlet.ConvertPod(unit, unit.Filename, unitsInfoMap, isUserFlag) + service, warnings, err = quadlet.ConvertPod(unit, unitsInfoMap, isUserFlag) default: Logf("Unsupported file type %q", unit.Filename) continue diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 80a002d5dd..c077043f9d 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -562,7 +562,7 @@ func usernsOpts(kind string, opts []string) string { // service file (unit file with Service group) based on the options in the // Container group. // The original Container group is kept around as X-Container. -func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[string]*UnitInfo) (*parser.UnitFile, error, error) { +func ConvertContainer(container *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) { var warn, warnings error service, _, err := initServiceUnitFile(container, isUser, unitsInfoMap, ContainerGroup) @@ -1527,7 +1527,7 @@ func GetPodResourceName(podUnit *parser.UnitFile) string { return podName } -func ConvertPod(podUnit *parser.UnitFile, _ string, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) { +func ConvertPod(podUnit *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) { var warn, warnings error service, unitInfo, err := initServiceUnitFile(podUnit, isUser, unitsInfoMap, PodGroup)