Made possible to update modules added by url

Ticket: CFE-3847
Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

cfbs/commands.py

@@ -13,6 +13,7 @@
 from cfbs.analyze import analyze_policyset
 from cfbs.args import get_args
 
+from cfbs.cfbs_json import CFBSJson
 from cfbs.utils import (
     cfbs_dir,
     cfbs_filename,
@@ -43,6 +44,7 @@
 from cfbs.cfbs_config import CFBSConfig, CFBSReturnWithoutCommit
 from cfbs.validate import validate_config
 from cfbs.internal_file_management import (
+    clone_url_repo,
     fetch_archive,
     get_download_path,
     local_module_copy,
@@ -757,13 +759,19 @@ def update_module(old_module, new_module, module_updates, update):
                 {item: old_module["name"] for item in extra}
             )
 
-    if not update.version:
-        update.version = new_module["version"]
-    module_updates.msg += "\n - Updated module '%s' from version %s to version %s" % (
-        update.name,
-        old_module["version"],
-        update.version,
-    )
+    if new_module.get("version"):
+        if not update.version:
+            update.version = new_module["version"]
+        module_updates.msg += (
+            "\n - Updated module '%s' from version %s to version %s"
+            % (
+                update.name,
+                old_module["version"],
+                update.version,
+            )
+        )
+    else:
+        module_updates.msg += "\n - Updated module '%s' from url" % (update.name)
 
 
 @cfbs_command("update")
@@ -810,41 +818,57 @@ def update_command(to_update):
             log.warning("Module '%s' not in build. Skipping its update." % update.name)
             continue
 
-        if "version" not in old_module:
-            log.warning(
-                "Module '%s' not updatable. Skipping its update." % old_module["name"]
+        if "url" in old_module:
+            path, commit = clone_url_repo(old_module["url"])
+            remote_config = CFBSJson(
+                path=path, url=old_module["url"], url_commit=commit
             )
-            log.debug("Module '%s' has no version attribute." % old_module["name"])
-            continue
 
-        index_info = index.get_module_object(update.name)
-        if not index_info:
-            log.warning(
-                "Module '%s' not present in the index, cannot update it."
-                % old_module["name"]
-            )
-            continue
+            module_name = old_module["name"]
+            provides = remote_config.get_provides()
 
-        local_ver = [
-            int(version_number)
-            for version_number in re.split(r"[-\.]", old_module["version"])
-        ]
-        index_ver = [
-            int(version_number)
-            for version_number in re.split(r"[-\.]", index_info["version"])
-        ]
-        if local_ver == index_ver:
-            print("Module '%s' already up to date" % old_module["name"])
-            continue
-        elif local_ver > index_ver:
-            log.warning(
-                "The requested version of module '%s' is older than current version (%s < %s)."
-                " Skipping its update."
-                % (old_module["name"], index_info["version"], old_module["version"])
-            )
-            continue
+            if not module_name or module_name not in provides:
+                continue
+
+            new_module = provides[module_name]
+        else:
+
+            if "version" not in old_module:
+                log.warning(
+                    "Module '%s' not updatable. Skipping its update."
+                    % old_module["name"]
+                )
+                log.debug("Module '%s' has no version attribute." % old_module["name"])
+                continue
+
+            index_info = index.get_module_object(update.name)
+            if not index_info:
+                log.warning(
+                    "Module '%s' not present in the index, cannot update it."
+                    % old_module["name"]
+                )
+                continue
+
+            local_ver = [
+                int(version_number)
+                for version_number in re.split(r"[-\.]", old_module["version"])
+            ]
+            index_ver = [
+                int(version_number)
+                for version_number in re.split(r"[-\.]", index_info["version"])
+            ]
+            if local_ver == index_ver:
+                print("Module '%s' already up to date" % old_module["name"])
+                continue
+            elif local_ver > index_ver:
+                log.warning(
+                    "The requested version of module '%s' is older than current version (%s < %s)."
+                    " Skipping its update."
+                    % (old_module["name"], index_info["version"], old_module["version"])
+                )
+                continue
 
-        new_module = index_info
+            new_module = index_info
 
         update_module(old_module, new_module, module_updates, update)