Skip to content

Fix: re-index wrong usage of the type #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Fix: re-index wrong usage of the type #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions charon/pkgs/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ def re_index(
):
"""Refresh the index.html for the specified folder in the bucket.
"""
bucket_name = bucket[1]
prefix = bucket[2]
bucket_name = bucket.get("bucket")
prefix = bucket.get("prefix")
s3_client = S3Client(aws_profile=aws_profile, dry_run=dry_run)
real_prefix = prefix if prefix.strip() != "/" else ""
s3_folder = os.path.join(real_prefix, path)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cf_reindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_cf_maven_after_reindex(self):
)

re_index(
(TEST_BUCKET, TEST_BUCKET, "ga", "", "maven.repository.redhat.com"),
{"bucket": TEST_BUCKET, "prefix": "ga"},
"org/apache/httpcomponents/httpclient/", "maven"
)

Expand All @@ -67,7 +67,7 @@ def test_cf_npm_after_reindex(self):
)

re_index(
(TEST_BUCKET, TEST_BUCKET, "", "", "npm.registry.redhat.com"),
{"bucket": TEST_BUCKET, "prefix": ""},
"@babel/", "npm"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_maven_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def test_re_index(self):
Body="Just a test content"
)
re_index(
(TEST_BUCKET, TEST_BUCKET, "", "", None),
{"bucket": TEST_BUCKET, "prefix": ""},
commons_client_root, "maven"
)
indedx_obj = test_bucket.Object(COMMONS_CLIENT_INDEX)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_npm_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def test_re_index(self):
Key=test_file_path, Body="test content"
)
re_index(
(TEST_BUCKET, TEST_BUCKET, prefix, "", None),
{"bucket": TEST_BUCKET, "prefix": prefix},
"@babel/", "npm"
)
index_obj = test_bucket.Object(prefixed_namespace_babel_index)
Expand Down Expand Up @@ -253,7 +253,7 @@ def test_re_index(self):
Key=test_file_path, Body="test content"
)
re_index(
(TEST_BUCKET, TEST_BUCKET, prefix, "", None),
{"bucket": TEST_BUCKET, "prefix": prefix},
"/", "npm"
)
index_obj = test_bucket.Object(prefixed_root_index)
Expand Down Expand Up @@ -284,7 +284,7 @@ def test_re_index(self):
Key=test_file_path, Body="test content"
)
re_index(
(TEST_BUCKET, TEST_BUCKET, prefix, "", None),
{"bucket": TEST_BUCKET, "prefix": prefix},
metadata_path, "npm"
)
objs = list(test_bucket.objects.all())
Expand Down