ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-09-30 05:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Forgot the fetch file method

Browse source
This commit is contained in:
Jorge Gallegos 2025-09-02 12:00:14 -07:00
commit 5889c6e667
No known key found for this signature in database
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/connection/gcloud.py
View file

@ -335,7 +335,7 @@ class Connection(connection.ConnectionBase):
if cmd == "put": if cmd == "put":
parts.append(str(in_path)) parts.append(str(in_path))
parts.append(f"{self.user}@{self.host}:{out_path}") parts.append(f"{self.user}@{self.host}:{out_path}")
elif cmd == "fetch": elif cmd == "get":
parts.append(f"{self.user}@{self.host}:{in_path}") parts.append(f"{self.user}@{self.host}:{in_path}")
parts.append(str(out_path)) parts.append(str(out_path))
@ -433,10 +433,10 @@ class Connection(connection.ConnectionBase):
return self._run(cmd=full_cmd, in_data=in_data, sudoable=sudoable) return self._run(cmd=full_cmd, in_data=in_data, sudoable=sudoable)
def put_file(self, in_path: str, out_path: str) -> tuple[int, bytes, bytes]: # type: ignore[override] def _transfer_file(
"""uploads a file to the cloud instance""" self, in_path: str, out_path: str, cmd: str
) -> tuple[int, bytes, bytes]:
super(Connection, self).put_file(in_path, out_path) """Common reads for both put and fetch"""
self.host: T.Optional[str] = self.get_option("instance") self.host: T.Optional[str] = self.get_option("instance")
self.user: T.Optional[str] = self.get_option("remote_user") self.user: T.Optional[str] = self.get_option("remote_user")
@ -452,7 +452,7 @@ class Connection(connection.ConnectionBase):
self.gcp_zone: T.Optional[str] = self.get_option("zone") self.gcp_zone: T.Optional[str] = self.get_option("zone")
self.timeout: int = int(self.get_option("timeout") or DEFAULT_TIMEOUT) self.timeout: int = int(self.get_option("timeout") or DEFAULT_TIMEOUT)
D.vvv(f"PUT: {in_path} TO {out_path}", host=self.host) D.vvv(f"{cmd.upper()}: {in_path} TO {out_path}", host=self.host)
if not ospath.exists( if not ospath.exists(
converters.to_bytes(in_path, errors="surrogate_or_strict") converters.to_bytes(in_path, errors="surrogate_or_strict")
): ):
@ -460,11 +460,20 @@ class Connection(connection.ConnectionBase):
f"File or module does not exist: {converters.to_native(in_path)}" f"File or module does not exist: {converters.to_native(in_path)}"
) )
full_cmd: T.List[str] = self._build_command("scp", "put", in_path, out_path) full_cmd: T.List[str] = self._build_command("scp", cmd, in_path, out_path)
return self._run(full_cmd, None) return self._run(full_cmd, None)
def put_file(self, in_path: str, out_path: str) -> tuple[int, bytes, bytes]: # type: ignore[override]
"""uploads a file to the cloud instance"""
super(Connection, self).put_file(in_path, out_path)
return self._transfer_file(in_path, out_path, "put")
def fetch_file(self, in_path: str, out_path: str) -> None: def fetch_file(self, in_path: str, out_path: str) -> None:
"""downloads a file from the cloud instance""" """downloads a file from the cloud instance"""
super(Connection, self).fetch_file(in_path, out_path) super(Connection, self).fetch_file(in_path, out_path)
return self._transfer_file(in_path, out_path, "get")