-
Notifications
You must be signed in to change notification settings - Fork 82
⚠️ CONFLICT! Lineage pull request for: skeleton #261
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.
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
base: develop
Are you sure you want to change the base?
Conversation
Version 25.4.0 is the first version to support Fedora 42 in the Ansible YAML metadata schema.
…sible-lint Upgrade to the latest version of the `ansible-lint` `pre-commit` hook
Lineage pull request for: skeleton
Update the two testing jobs in the build workflow to test across these additional platforms (we are currently limited to only free offerings): - Linux on ARM64 - macOS on ARM64 - Windows on AMD64
Add a short comment that explains why we use the platforms we do in the `test` and `test-build` jobs in the `build` workflow. Co-authored-by: Copilot <[email protected]>
…latforms Test across more platforms
Instead of creating a sub-package just to act as a file container we instead adjust the resource being accessed. This will prevent namespace cluttering while still providing access to the package data that is needed. This also follows logically with how the filesystem is organized where `data/secret.txt` is a resource of the `example` package.
Breaking the resource path components into separate arguments will provide a cleaner approach to constructing the resource path. Co-authored-by: Copilot <[email protected]>
…ackage_data Adjust how package data is accessed
…/skeleton # Conflicts: # .github/workflows/build.yml # .pre-commit-config.yaml # src/example/example.py # src/pshtt/_version.py
secret_message: str = ( | ||
files(__package__).joinpath("data", "secret.txt").read_text().strip() | ||
) | ||
logging.info('Secret="%s"', secret_message) |
Check failure
Code scanning / CodeQL
Clear-text logging of sensitive information High
sensitive data (secret)
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI 21 days ago
To fix the issue, sensitive data should not be logged directly. Instead, the code should either avoid logging the sensitive data entirely or sanitize it before logging. In this case, the best approach is to redact the sensitive information or replace it with a placeholder message indicating that sensitive data exists without exposing its actual content.
The fix involves modifying the logging statement on line 101 to redact the secret_message
before logging. This can be achieved by replacing the sensitive data with a generic placeholder, such as "[REDACTED]".
-
Copy modified line R101
@@ -100,3 +100,3 @@ | ||
) | ||
logging.info('Secret="%s"', secret_message) | ||
logging.info('Secret="[REDACTED]"') | ||
|
Lineage Pull Request: CONFLICT
Lineage has created this pull request to incorporate new changes found in an upstream repository:
Upstream repository:
https://github.com/cisagov/skeleton-python-library.git
Remote branch:
HEAD
Check the changes in this pull request to ensure they won't cause issues with your project.
The
lineage/skeleton
branch has one or more unresolved merge conflicts that you must resolve before merging this pull request!How to resolve the conflicts
Take ownership of this pull request by removing any other assignees.
Clone the repository locally, and reapply the merge:
Review the changes displayed by the
status
command. Fix any conflicts and possibly incorrect auto-merges.After resolving each of the conflicts,
add
your changes to the branch,commit
, andpush
your changes:Note that you may append to the default merge commit message that git creates for you, but please do not delete the existing content. It provides useful information about the merge that is being performed.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
Mark this draft pull request "Ready for review".
✅ Pre-approval checklist
Remove any of the following that do not apply. If you're unsure about any of these, don't hesitate to ask. We're here to help!
bump_version
script if this repository is versioned and the changes in this PR warrant a version bump.✅ Pre-merge checklist
Remove any of the following that do not apply. These boxes should remain unchecked until the pull request has been approved.
✅ Post-merge checklist
Remove any of the following that do not apply.
Note
You are seeing this because one of this repository's maintainers has configured Lineage to open pull requests.
For more information:
🛠 Lineage configurations for this project are stored in
.github/lineage.yml
📚 Read more about Lineage