Add pull link to changelog and modify install latest deps function

Author: YoussefKhalidAli

changelogs/fragments/10346-jenkins-plugins-fixes.yml

@@ -1,6 +1,6 @@
 bugfixes:
-  - "jenkins_plugin - install latest compatible version instead of latest (https://github.com/ansible-collections/community.general/issues/854)."
-  - "jenkins_plugin - seperate Jenkins and external URL credentials (https://github.com/ansible-collections/community.general/issues/4419)."
+  - "jenkins_plugin - install latest compatible version instead of latest (https://github.com/ansible-collections/community.general/issues/854, https://github.com/ansible-collections/community.general/pull/10346)."
+  - "jenkins_plugin - separate Jenkins and external URL credentials (https://github.com/ansible-collections/community.general/issues/4419, https://github.com/ansible-collections/community.general/pull/10346)."
 
 minor_changes:
-  - "jenkins_plugin - install dependencies for specific version (https://github.com/ansible-collections/community.general/issue/4995)."
+  - "jenkins_plugin - install dependencies for specific version (https://github.com/ansible-collections/community.general/issue/4995, https://github.com/ansible-collections/community.general/pull/10346)."

plugins/modules/jenkins_plugin.py

@@ -124,8 +124,8 @@
   with_dependencies:
     description:
       - Defines whether to install plugin dependencies.
-      - In earlier versions, this option had no effect when a specific C(version) was set.
-      - Since community.general 11.1.0, dependencies are also installed for versioned plugins.
+      - In earlier versions, this option had no effect when a specific O(version) was set.
+        Since community.general 11.1.0, dependencies are also installed for versioned plugins.
     type: bool
     default: true
 
@@ -519,7 +519,10 @@ def _install_dependencies(self):
                 dep_params = self.params.copy()
                 dep_params['name'] = dep_name
                 dep_params['version'] = dep_version
-                dep_module = self.module
+                dep_module = AnsibleModule(
+                    argument_spec=self.module.argument_spec,
+                    supports_check_mode=self.module.check_mode
+                )
                 dep_module.params = dep_params
                 dep_plugin = JenkinsPlugin(dep_module)
                 if not dep_plugin.install():
@@ -687,27 +690,27 @@ def _get_latest_compatible_plugin_version(self, plugin_name=None):
         cache_path = "{}/ansible_jenkins_plugin_cache.json".format(self.params['jenkins_home'])
 
         try:  # Check if file is saved localy
-            with open(cache_path, "r") as f:
+            if os.path.exists(cache_path):
                 file_mtime = os.path.getmtime(cache_path)
-                now = time.time()
-                if now - file_mtime < 86400:
-                    plugin_data = json.load(f)
-                else:
-                    raise FileNotFoundError("Cache file is outdated.")
-        except Exception:
-            response, info = fetch_url(self.module, "https://updates.jenkins.io/current/plugin-versions.json")   # Get list of plugins and their dependencies
-
-            if info['status'] != 200:
-                self.module.fail_json(msg="Failed to fetch plugin-versions.json", details=info)
+            else:
+                file_mtime = 0
 
-            try:
+            now = time.time()
+            if now - file_mtime >= 86400:
+                response, info = fetch_url(self.module, "https://updates.jenkins.io/current/plugin-versions.json")
+                if info['status'] != 200:
+                    self.module.fail_json(msg="Failed to fetch plugin-versions.json", details=info)
                 plugin_data = json.loads(to_native(response.read()), object_pairs_hook=OrderedDict)
 
                 # Save it to file for next time
                 with open(cache_path, "w") as f:
                     json.dump(plugin_data, f)
-            except Exception as e:
-                self.module.fail_json(msg="Failed to parse plugin-versions.json", details=to_native(e))
+
+            with open(cache_path, "r") as f:
+                plugin_data = json.load(f)
+
+        except Exception as e:
+            self.module.fail_json(msg="Failed to parse plugin-versions.json", details=to_native(e))
 
         plugin_versions = plugin_data.get("plugins", {}).get(name)
         if not plugin_versions: