From 6439160176d76dae0b412d786d380bff429cfb0d Mon Sep 17 00:00:00 2001
From: Lee Goolsbee <lgoolsbee@atlassian.com>
Date: Mon, 3 Nov 2025 17:10:35 -0600
Subject: [PATCH] ITPLT-4583 rework latest version URL logic for all products

---
 roles/product_install/defaults/main.yml                |  7 ++++++-
 .../product_install/tasks/jira-core_version_latest.yml | 10 +---------
 .../tasks/jira-software_version_latest.yml             | 10 +---------
 roles/product_install/tasks/product_version_latest.yml |  4 ++--
 4 files changed, 10 insertions(+), 21 deletions(-)
 mode change 100644 => 120000 roles/product_install/tasks/jira-core_version_latest.yml
 mode change 100644 => 120000 roles/product_install/tasks/jira-software_version_latest.yml

diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml
index f5d317a..d2c9ffa 100644
--- a/roles/product_install/defaults/main.yml
+++ b/roles/product_install/defaults/main.yml
@@ -6,7 +6,6 @@ atl_cached_version: ''
 #  with values for both password and username
 atl_download_secret_name: ''
 
-atl_product_latest_version_url: "https://marketplace.atlassian.com/rest/2/products/key/{{ atl_product_family }}/versions"
 atl_product_version_cache_dir: "{{ atl_product_home_shared }}"
 atl_product_version_cache: "{{ atl_product_home_shared }}/{{ atl_product_edition }}.version"
 
@@ -30,9 +29,15 @@ atl_product_home_shared_download: "{{ atl_product_home_shared_download_dir }}/{{
 atl_product_home_shared_moving_lock: "{{ atl_product_home_shared_download }}_moving"
 atl_product_home_shared_completed_lock: "{{ atl_product_home_shared_download }}_completed"
 
+atl_product_family_to_mpac_parent_software_id_map:
+  confluence: "confluence"
+  crowd: "crowd"
+  jira: "jira"
+  stash: "bitbucket"
 atl_mpac_base_url: "https://marketplace.atlassian.com"
 atl_mpac_api_base_url: "{{ atl_mpac_base_url }}/rest/3"
 atl_mpac_jsm_app_software_id: "1bbd1b4a-95cd-4762-b7ae-3e3e99eee7d8"
+atl_mpac_product_latest_version_url: "{{ atl_mpac_api_base_url }}/parent-software/{{ atl_product_family_to_mpac_parent_software_id_map[atl_product_family] }}/versions?state=ACTIVE&limit=1"
 
 atl_install_jsd_as_obr: false
 atl_source_obr_from_marketplace: true
diff --git a/roles/product_install/tasks/jira-core_version_latest.yml b/roles/product_install/tasks/jira-core_version_latest.yml
deleted file mode 100644
index 5c2fa82..0000000
--- a/roles/product_install/tasks/jira-core_version_latest.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Fetch the latest version from URL
-  ansible.builtin.set_fact:
-    atl_product_version_json: "{{ lookup('url', '{{ atl_mpac_api_base_url }}/parent-software/jira/versions?state=ACTIVE&limit=1') }}"
-
-- name: Set the local var to retrieved version
-  ansible.builtin.set_fact:
-    atl_latest_version: "{{ atl_product_version_json.versions[0].versionNumber }}"
diff --git a/roles/product_install/tasks/jira-core_version_latest.yml b/roles/product_install/tasks/jira-core_version_latest.yml
new file mode 120000
index 0000000..d80ce2f
--- /dev/null
+++ b/roles/product_install/tasks/jira-core_version_latest.yml
@@ -0,0 +1 @@
+product_version_latest.yml
\ No newline at end of file
diff --git a/roles/product_install/tasks/jira-software_version_latest.yml b/roles/product_install/tasks/jira-software_version_latest.yml
deleted file mode 100644
index 5c2fa82..0000000
--- a/roles/product_install/tasks/jira-software_version_latest.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Fetch the latest version from URL
-  ansible.builtin.set_fact:
-    atl_product_version_json: "{{ lookup('url', '{{ atl_mpac_api_base_url }}/parent-software/jira/versions?state=ACTIVE&limit=1') }}"
-
-- name: Set the local var to retrieved version
-  ansible.builtin.set_fact:
-    atl_latest_version: "{{ atl_product_version_json.versions[0].versionNumber }}"
diff --git a/roles/product_install/tasks/jira-software_version_latest.yml b/roles/product_install/tasks/jira-software_version_latest.yml
new file mode 120000
index 0000000..d80ce2f
--- /dev/null
+++ b/roles/product_install/tasks/jira-software_version_latest.yml
@@ -0,0 +1 @@
+product_version_latest.yml
\ No newline at end of file
diff --git a/roles/product_install/tasks/product_version_latest.yml b/roles/product_install/tasks/product_version_latest.yml
index 03ac7cf..7f44076 100644
--- a/roles/product_install/tasks/product_version_latest.yml
+++ b/roles/product_install/tasks/product_version_latest.yml
@@ -6,8 +6,8 @@
 
 - name: Fetch the latest version from URL
   ansible.builtin.set_fact:
-    atl_product_version_json: "{{ lookup('url', '{{ atl_product_latest_version_url }}') }}"
+    atl_product_version_json: "{{ lookup('url', '{{ atl_mpac_product_latest_version_url }}') }}"
 
 - name: Set the local var to retrieved version
   ansible.builtin.set_fact:
-    atl_latest_version: "{{ atl_product_version_json._embedded.versions[0].name }}"
+    atl_latest_version: "{{ atl_product_version_json.versions[0].versionNumber }}"