From 0c3b5e433e26d6a8a99a0967be91be897bbdc068 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 15 Jan 2024 07:37:42 -0700 Subject: [PATCH] quadlet.go: clean up keys - A number of keys had a "Network" prefix, for historical reasons that never panned out ("KeyNetworkGateway"). Remove that prefix and remove the two duplicates. - Three RemapXXX keys were mismatched in case ("UID" vs "Uid"). Make those consistent. Signed-off-by: Ed Santiago --- pkg/systemd/quadlet/quadlet.go | 82 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index e18857aa7d..3771d724cf 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -101,16 +101,14 @@ const ( KeyMask = "Mask" KeyMount = "Mount" KeyNetwork = "Network" - KeyNetworkDisableDNS = "DisableDNS" - KeyNetworkDriver = "Driver" - KeyNetworkGateway = "Gateway" - KeyNetworkIPAMDriver = "IPAMDriver" - KeyNetworkIPRange = "IPRange" - KeyNetworkIPv6 = "IPv6" - KeyNetworkInternal = "Internal" + KeyDisableDNS = "DisableDNS" + KeyGateway = "Gateway" + KeyIPAMDriver = "IPAMDriver" + KeyIPRange = "IPRange" + KeyIPv6 = "IPv6" + KeyInternal = "Internal" KeyNetworkName = "NetworkName" - KeyNetworkOptions = "Options" - KeyNetworkSubnet = "Subnet" + KeySubnet = "Subnet" KeyNoNewPrivileges = "NoNewPrivileges" KeyNotify = "Notify" KeyOptions = "Options" @@ -123,10 +121,10 @@ const ( KeyPull = "Pull" KeyReadOnly = "ReadOnly" KeyReadOnlyTmpfs = "ReadOnlyTmpfs" - KeyRemapGID = "RemapGid" - KeyRemapUID = "RemapUid" - KeyRemapUIDSize = "RemapUidSize" - KeyRemapUsers = "RemapUsers" + KeyRemapGid = "RemapGid" //nolint:stylecheck + KeyRemapUid = "RemapUid" //nolint:stylecheck + KeyRemapUidSize = "RemapUidSize" //nolint:stylecheck + KeyRemapUsers = "RemapUsers" // deprecated KeyRootfs = "Rootfs" KeyRunInit = "RunInit" KeySeccompProfile = "SeccompProfile" @@ -217,9 +215,9 @@ var ( KeyPull: true, KeyReadOnly: true, KeyReadOnlyTmpfs: true, - KeyRemapGID: true, - KeyRemapUID: true, - KeyRemapUIDSize: true, + KeyRemapGid: true, + KeyRemapUid: true, + KeyRemapUidSize: true, KeyRemapUsers: true, KeyRootfs: true, KeyRunInit: true, @@ -270,16 +268,16 @@ var ( KeyDNS: true, KeyContainersConfModule: true, KeyGlobalArgs: true, - KeyNetworkDisableDNS: true, - KeyNetworkDriver: true, - KeyNetworkGateway: true, - KeyNetworkIPAMDriver: true, - KeyNetworkIPRange: true, - KeyNetworkIPv6: true, - KeyNetworkInternal: true, + KeyDisableDNS: true, + KeyDriver: true, + KeyGateway: true, + KeyIPAMDriver: true, + KeyIPRange: true, + KeyIPv6: true, + KeyInternal: true, KeyNetworkName: true, - KeyNetworkOptions: true, - KeyNetworkSubnet: true, + KeyOptions: true, + KeySubnet: true, KeyPodmanArgs: true, } @@ -295,9 +293,9 @@ var ( KeyNetwork: true, KeyPodmanArgs: true, KeyPublishPort: true, - KeyRemapGID: true, - KeyRemapUID: true, - KeyRemapUIDSize: true, + KeyRemapGid: true, + KeyRemapUid: true, + KeyRemapUidSize: true, KeyRemapUsers: true, KeySetWorkingDirectory: true, KeyUserNS: true, @@ -826,7 +824,7 @@ func ConvertNetwork(network *parser.UnitFile, name string) (*parser.UnitFile, st podman.add("network", "create", "--ignore") - if disableDNS := network.LookupBooleanWithDefault(NetworkGroup, KeyNetworkDisableDNS, false); disableDNS { + if disableDNS := network.LookupBooleanWithDefault(NetworkGroup, KeyDisableDNS, false); disableDNS { podman.add("--disable-dns") } @@ -835,14 +833,14 @@ func ConvertNetwork(network *parser.UnitFile, name string) (*parser.UnitFile, st podman.addf("--dns=%s", ipAddr) } - driver, ok := network.Lookup(NetworkGroup, KeyNetworkDriver) + driver, ok := network.Lookup(NetworkGroup, KeyDriver) if ok && len(driver) > 0 { podman.addf("--driver=%s", driver) } - subnets := network.LookupAll(NetworkGroup, KeyNetworkSubnet) - gateways := network.LookupAll(NetworkGroup, KeyNetworkGateway) - ipRanges := network.LookupAll(NetworkGroup, KeyNetworkIPRange) + subnets := network.LookupAll(NetworkGroup, KeySubnet) + gateways := network.LookupAll(NetworkGroup, KeyGateway) + ipRanges := network.LookupAll(NetworkGroup, KeyIPRange) if len(subnets) > 0 { if len(gateways) > len(subnets) { return nil, "", fmt.Errorf("cannot set more gateways than subnets") @@ -863,19 +861,19 @@ func ConvertNetwork(network *parser.UnitFile, name string) (*parser.UnitFile, st return nil, "", fmt.Errorf("cannot set gateway or range without subnet") } - if internal := network.LookupBooleanWithDefault(NetworkGroup, KeyNetworkInternal, false); internal { + if internal := network.LookupBooleanWithDefault(NetworkGroup, KeyInternal, false); internal { podman.add("--internal") } - if ipamDriver, ok := network.Lookup(NetworkGroup, KeyNetworkIPAMDriver); ok && len(ipamDriver) > 0 { + if ipamDriver, ok := network.Lookup(NetworkGroup, KeyIPAMDriver); ok && len(ipamDriver) > 0 { podman.addf("--ipam-driver=%s", ipamDriver) } - if ipv6 := network.LookupBooleanWithDefault(NetworkGroup, KeyNetworkIPv6, false); ipv6 { + if ipv6 := network.LookupBooleanWithDefault(NetworkGroup, KeyIPv6, false); ipv6 { podman.add("--ipv6") } - networkOptions := network.LookupAllKeyVal(NetworkGroup, KeyNetworkOptions) + networkOptions := network.LookupAllKeyVal(NetworkGroup, KeyOptions) if len(networkOptions) > 0 { podman.addKeys("--opt", networkOptions) } @@ -1390,8 +1388,8 @@ func handleUserMappings(unitFile *parser.UnitFile, groupName string, podman *Pod } if mappingsDefined { - _, hasRemapUID := unitFile.Lookup(groupName, KeyRemapUID) - _, hasRemapGID := unitFile.Lookup(groupName, KeyRemapGID) + _, hasRemapUID := unitFile.Lookup(groupName, KeyRemapUid) + _, hasRemapGID := unitFile.Lookup(groupName, KeyRemapGid) _, RemapUsers := unitFile.LookupLast(groupName, KeyRemapUsers) if hasRemapUID || hasRemapGID || RemapUsers { return fmt.Errorf("deprecated Remap keys are set along with explicit mapping keys") @@ -1403,8 +1401,8 @@ func handleUserMappings(unitFile *parser.UnitFile, groupName string, podman *Pod } func handleUserRemap(unitFile *parser.UnitFile, groupName string, podman *PodmanCmdline, isUser, supportManual bool) error { - uidMaps := unitFile.LookupAllStrv(groupName, KeyRemapUID) - gidMaps := unitFile.LookupAllStrv(groupName, KeyRemapGID) + uidMaps := unitFile.LookupAllStrv(groupName, KeyRemapUid) + gidMaps := unitFile.LookupAllStrv(groupName, KeyRemapGid) remapUsers, _ := unitFile.LookupLast(groupName, KeyRemapUsers) switch remapUsers { case "": @@ -1433,7 +1431,7 @@ func handleUserRemap(unitFile *parser.UnitFile, groupName string, podman *Podman for _, gidMap := range gidMaps { autoOpts = append(autoOpts, "gidmapping="+gidMap) } - uidSize := unitFile.LookupUint32(groupName, KeyRemapUIDSize, 0) + uidSize := unitFile.LookupUint32(groupName, KeyRemapUidSize, 0) if uidSize > 0 { autoOpts = append(autoOpts, fmt.Sprintf("size=%v", uidSize)) }