opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-17 11:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27234 from Honny1/fix-linter

Browse Source 
quadlet: remove unused 'name' parameter from ConvertNetwork and ConvertVolume
This commit is contained in:
openshift-merge-bot[bot]
2025-10-06 13:59:36 +00:00
committed by GitHub
parent 8daac5220c 09e535fb46
commit 80b20c7614
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/quadlet/main.go
View File

@ -540,11 +540,11 @@ func process() bool {
service, warnings, err = quadlet.ConvertContainer(unit, isUserFlag, unitsInfoMap) service, warnings, err = quadlet.ConvertContainer(unit, isUserFlag, unitsInfoMap)
case strings.HasSuffix(unit.Filename, ".volume"): case strings.HasSuffix(unit.Filename, ".volume"):
warnIfAmbiguousName(unit, quadlet.VolumeGroup) warnIfAmbiguousName(unit, quadlet.VolumeGroup)
service, warnings, err = quadlet.ConvertVolume(unit, unit.Filename, unitsInfoMap, isUserFlag) service, warnings, err = quadlet.ConvertVolume(unit, unitsInfoMap, isUserFlag)
case strings.HasSuffix(unit.Filename, ".kube"): case strings.HasSuffix(unit.Filename, ".kube"):
service, err = quadlet.ConvertKube(unit, unitsInfoMap, isUserFlag) service, err = quadlet.ConvertKube(unit, unitsInfoMap, isUserFlag)
case strings.HasSuffix(unit.Filename, ".network"): case strings.HasSuffix(unit.Filename, ".network"):
service, warnings, err = quadlet.ConvertNetwork(unit, unit.Filename, unitsInfoMap, isUserFlag) service, warnings, err = quadlet.ConvertNetwork(unit, unitsInfoMap, isUserFlag)
case strings.HasSuffix(unit.Filename, ".image"): case strings.HasSuffix(unit.Filename, ".image"):
warnIfAmbiguousName(unit, quadlet.ImageGroup) warnIfAmbiguousName(unit, quadlet.ImageGroup)
service, err = quadlet.ConvertImage(unit, unitsInfoMap, isUserFlag) service, err = quadlet.ConvertImage(unit, unitsInfoMap, isUserFlag)

4
pkg/systemd/quadlet/quadlet.go
View File

@ -958,7 +958,7 @@ func defaultOneshotServiceGroup(service *parser.UnitFile, remainAfterExit bool)
// The original Network group is kept around as X-Network. // The original Network group is kept around as X-Network.
// Also returns the canonical network name, either auto-generated or user-defined via the // Also returns the canonical network name, either auto-generated or user-defined via the
// NetworkName key-value. // NetworkName key-value.
func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) { func ConvertNetwork(network *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) {
var warn, warnings error var warn, warnings error
service, unitInfo, err := initServiceUnitFile(network, isUser, unitsInfoMap, NetworkGroup) service, unitInfo, err := initServiceUnitFile(network, isUser, unitsInfoMap, NetworkGroup)
@ -1047,7 +1047,7 @@ func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[stri
// The original Volume group is kept around as X-Volume. // The original Volume group is kept around as X-Volume.
// Also returns the canonical volume name, either auto-generated or user-defined via the VolumeName // Also returns the canonical volume name, either auto-generated or user-defined via the VolumeName
// key-value. // key-value.
func ConvertVolume(volume *parser.UnitFile, name string, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) { func ConvertVolume(volume *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) {
var warn, warnings error var warn, warnings error
service, unitInfo, err := initServiceUnitFile(volume, isUser, unitsInfoMap, VolumeGroup) service, unitInfo, err := initServiceUnitFile(volume, isUser, unitsInfoMap, VolumeGroup)