Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions checkov/terraform/module_loading/loaders/registry_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ def _find_module_path(self, module_params: ModuleParams) -> str:

def _find_best_version(self, module_params: ModuleParams) -> str:
versions_by_size = RegistryLoader.modules_versions_cache.get(module_params.tf_modules_versions_endpoint, []) # type:ignore[arg-type] # argument can be None
if not versions_by_size:
return "latest"
if module_params.version == "latest":
module_params.version = versions_by_size[0]
elif module_params.version is None:
Expand Down Expand Up @@ -169,9 +171,13 @@ def _cache_available_versions(self, module_params: ModuleParams) -> bool:
prepared_request = session.prepare_request(request)
response = session.send(prepared_request, timeout=DEFAULT_TIMEOUT)
response.raise_for_status()
available_versions = [
v.get("version") for v in response.json().get("modules", [{}])[0].get("versions", {})
]
data = response.json()
modules = data.get("modules") or []
if not isinstance(modules, list) or not modules:
RegistryLoader.modules_versions_cache[module_params.tf_modules_versions_endpoint] = []
return False
versions = modules[0].get("versions") or []
available_versions = [v.get("version") for v in versions if isinstance(v, dict) and v.get("version")]
RegistryLoader.modules_versions_cache[module_params.tf_modules_versions_endpoint] = order_versions_in_descending_order(
available_versions)
return True
Expand Down Expand Up @@ -242,7 +248,7 @@ def _get_archive_extension(module_download_url: str) -> str | None:
query_params = query_params_str.split("&")
for query_param in query_params:
if query_param.startswith("archive="):
return query_params_str.split("=")[1]
return query_param.split("=", 1)[1]
return None


Expand Down
20 changes: 14 additions & 6 deletions checkov/terraform/module_loading/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,26 @@ def load(
self.module_content_cache[module_address] = ModuleContent(None)
continue
else:
v = module_address.rsplit(':', 1)
if v[0] not in self.module_latest or self.module_latest[v[0]] < v[1]:
self.module_latest[v[0]] = v[1]
if ':' in module_address:
name, ver = module_address.rsplit(':', 1)
else:
name, ver = module_address, source_version or ''
if ver:
if name not in self.module_latest or self.module_latest.get(name, '') < ver:
self.module_latest[name] = ver
self.module_content_cache[module_address] = content
return content

if last_exception is not None:
raise last_exception

v = module_address.rsplit(':', 1)
if v[0] not in self.module_latest or self.module_latest[v[0]] < v[1]:
self.module_latest[v[0]] = v[1]
if ':' in module_address:
name, ver = module_address.rsplit(':', 1)
else:
name, ver = module_address, source_version or ''
if ver:
if name not in self.module_latest or self.module_latest.get(name, '') < ver:
self.module_latest[name] = ver
self.module_content_cache[module_address] = content
return content

Expand Down