From 4cb8404b7b2ea40a9ad4052fb2d75dff7856ce48 Mon Sep 17 00:00:00 2001
From: Sergey <6213510+sshnaidm@users.noreply.github.com>
Date: Sun, 2 Jun 2024 21:01:06 +0300
Subject: [PATCH] Fix issue with pushing podman image to repo name and org
 (#771)

If destination doesn't have image, but only repo name and org,
complete with image name and tag.

Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
---
 plugins/modules/podman_image.py               |  3 ++
 .../targets/podman_image/tasks/idem_push.yml  | 46 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/plugins/modules/podman_image.py b/plugins/modules/podman_image.py
index d121cd8..e32d014 100644
--- a/plugins/modules/podman_image.py
+++ b/plugins/modules/podman_image.py
@@ -797,6 +797,9 @@ class PodmanImageManager(object):
             dest_string = dest_format_string.format(transport=transport, name=self.name, dest=dest)
         else:
             dest_string = dest
+            # In case of dest as a repository with org name only, append image name to it
+            if ":" not in dest and "@" not in dest and len(dest.rstrip("/").split("/")) == 2:
+                dest_string = dest.rstrip("/") + "/" + self.image_name
 
         if "/" not in dest_string and "@" not in dest_string and "docker-daemon" not in dest_string:
             self.module.fail_json(msg="Destination must be a full URL or path to a directory.")
diff --git a/tests/integration/targets/podman_image/tasks/idem_push.yml b/tests/integration/targets/podman_image/tasks/idem_push.yml
index 93d3ea9..064ce8f 100644
--- a/tests/integration/targets/podman_image/tasks/idem_push.yml
+++ b/tests/integration/targets/podman_image/tasks/idem_push.yml
@@ -99,6 +99,52 @@
       - "'authentication required' in img_result4.stderr"
       - "'push testimage2:testtag quay.io/testing/testimage' in img_result4.actions"
 
+- containers.podman.podman_image:
+    name: testimage2
+    tag: testtag
+    pull: false
+    push: true
+    push_args:
+      dest: quay.io/testing
+  ignore_errors: true
+  register: img_result4a
+
+- name: Check outputs
+  assert:
+    that:
+      - "'authentication required' in img_result4a.stderr"
+      - "'push testimage2:testtag quay.io/testing/testimage2:testtag' in img_result4a.actions"
+
+- containers.podman.podman_image:
+    name: testimage2:testtag
+    pull: false
+    push: true
+    push_args:
+      dest: quay.io/testing/
+  ignore_errors: true
+  register: img_result4b
+
+- name: Check outputs
+  assert:
+    that:
+      - "'authentication required' in img_result4b.stderr"
+      - "'push testimage2:testtag quay.io/testing/testimage2:testtag' in img_result4b.actions"
+
+- containers.podman.podman_image:
+    name: testimage2
+    pull: false
+    push: true
+    push_args:
+      dest: quay.io/testing/
+  ignore_errors: true
+  register: img_result4c
+
+- name: Check outputs
+  assert:
+    that:
+      - "'authentication required' in img_result4c.stderr"
+      - "'push testimage2:latest quay.io/testing/testimage2:latest' in img_result4c.actions"
+
 - containers.podman.podman_image:
     name: testimage2
     pull: false