a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: use ints for uid and gid

pull/9659/head
Peter Siegel 2025-02-02 10:39:24 +01:00
parent bdb9ab354f
commit 894c28fa28
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/connection/lxd.py
View File

@ -162,7 +162,7 @@ class Connection(ConnectionBase):
return process.returncode, stdout, stderr return process.returncode, stdout, stderr
def _get_remote_uid_gid(self) -> tuple[str, str]: def _get_remote_uid_gid(self) -> tuple[int, int]:
"""Get the user and group id of 'remote_user' from the instance.""" """Get the user and group id of 'remote_user' from the instance."""
rc, uid_out, err = self.exec_command("/bin/id -u") rc, uid_out, err = self.exec_command("/bin/id -u")
@ -175,7 +175,7 @@ class Connection(ConnectionBase):
raise AnsibleError(f"Failed to get remote gid for user {self.get_option('remote_user')}: {err}") raise AnsibleError(f"Failed to get remote gid for user {self.get_option('remote_user')}: {err}")
gid = gid_out.strip() gid = gid_out.strip()
return uid, gid return int(uid), int(gid)
def put_file(self, in_path, out_path): def put_file(self, in_path, out_path):
@ -191,12 +191,12 @@ class Connection(ConnectionBase):
if self.get_option("project"): if self.get_option("project"):
local_cmd.extend(["--project", self.get_option("project")]) local_cmd.extend(["--project", self.get_option("project")])
uid, gid = ("-1", "-1") # lxd default values uid, gid = (-1, -1)
if self.get_option("remote_user") != "root": if self.get_option("remote_user") != "root":
uid, gid = self._get_remote_uid_gid() uid, gid = self._get_remote_uid_gid()
local_cmd.extend([ local_cmd.extend([
"file", "push", "--uid", uid, "--gid", gid, "file", "push", "--uid", str(uid), "--gid", str(gid),
in_path, in_path,
f"{self.get_option('remote')}:{self._host()}/{out_path}" f"{self.get_option('remote')}:{self._host()}/{out_path}"
]) ])