Skip to content

Commit 4ecc33a

Browse files
committed
Rename inferred_url property to inferred_repo_url for clarity
Signed-off-by: tdruez <[email protected]>
1 parent 863576c commit 4ecc33a

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

component_catalog/admin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ class PackageAdmin(
831831
"version",
832832
"qualifiers",
833833
"subpath",
834-
"inferred_url",
834+
"inferred_repo_url",
835835
)
836836
},
837837
),
@@ -898,7 +898,7 @@ class PackageAdmin(
898898
]
899899
readonly_fields = DataspacedAdmin.readonly_fields + (
900900
"package_url",
901-
"inferred_url",
901+
"inferred_repo_url",
902902
)
903903
form = PackageAdminForm
904904
importer_class = PackageImporter
@@ -1071,7 +1071,7 @@ def components_links(self, obj):
10711071

10721072
@admin.display(description="Inferred URL")
10731073
def inferred_url(self, obj):
1074-
if inferred_url := obj.inferred_url:
1074+
if inferred_url := obj.inferred_repo_url:
10751075
return urlize_target_blank(inferred_url)
10761076
return ""
10771077

component_catalog/management/commands/componentfrompackage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def create_component_from_package(self, package):
101101
# The proper policy will be set from the ``license_expression`` value
102102
component_data.pop("usage_policy", None)
103103

104-
if inferred_url := package.inferred_url:
104+
if inferred_url := package.inferred_repo_url:
105105
component_data["code_view_url"] = inferred_url
106106
component_data["homepage_url"] = inferred_url
107107

component_catalog/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@ def package_url_filename(self):
20352035
return get_valid_filename(cleaned_package_url)
20362036

20372037
@property
2038-
def inferred_url(self):
2038+
def inferred_repo_url(self):
20392039
"""Return the URL deduced from the information available in a Package URL (purl)."""
20402040
return purl2url.get_repo_url(self.package_url)
20412041

component_catalog/tests/test_models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,18 +2563,18 @@ def test_package_model_where_used_property(self):
25632563
)
25642564
self.assertEqual("Product 0\nComponent 1\n", package1.where_used(user=basic_user))
25652565

2566-
def test_package_model_inferred_url_property(self):
2566+
def test_package_model_inferred_repo_url_property(self):
25672567
package1 = Package.objects.create(filename="package", dataspace=self.dataspace)
2568-
self.assertIsNone(package1.inferred_url)
2568+
self.assertIsNone(package1.inferred_repo_url)
25692569

25702570
package1.set_package_url("pkg:pypi/[email protected]")
25712571
package1.save()
2572-
self.assertEqual("https://pypi.org/project/toml/0.10.2/", package1.inferred_url)
2572+
self.assertEqual("https://pypi.org/project/toml/0.10.2/", package1.inferred_repo_url)
25732573

25742574
package1.set_package_url("pkg:github/package-url/[email protected]?version_prefix=v")
25752575
package1.save()
25762576
expected = "https://github.com/package-url/packageurl-python/tree/v0.10.4"
2577-
self.assertEqual(expected, package1.inferred_url)
2577+
self.assertEqual(expected, package1.inferred_repo_url)
25782578

25792579
@mock.patch("dejacode_toolkit.purldb.PurlDB.find_packages")
25802580
def test_package_model_get_purldb_entries(self, mock_find_packages):

component_catalog/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ class PackageDetailsView(
10831083
"package_url",
10841084
"filename",
10851085
"download_url",
1086-
"inferred_url",
1086+
"inferred_repo_url",
10871087
"size",
10881088
"release_date",
10891089
"primary_language",

dje/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ def show_usage_policy(value):
10711071
]
10721072
)
10731073

1074-
if inferred_url := package.inferred_url:
1074+
if inferred_url := package.inferred_repo_url:
10751075
inferred_url_help = (
10761076
"A URL deduced from the information available in a Package URL (purl)."
10771077
)

reporting/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def get_model_data_for_column_template(dataspace=None):
219219
"package_url",
220220
"short_package_url",
221221
"where_used",
222-
"inferred_url",
222+
"inferred_repo_url",
223223
"is_vulnerable",
224224
],
225225
},

0 commit comments

Comments
 (0)