Skip to content

⚠️ 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

Draft
wants to merge 12 commits into
base: develop
Choose a base branch
from

Conversation

cisagovbot
Copy link

Lineage Pull Request: CONFLICT

Achtung!!!

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

  1. Take ownership of this pull request by removing any other assignees.

  2. Clone the repository locally, and reapply the merge:

    git clone [email protected]:cisagov/pshtt.git pshtt
    cd pshtt
    git remote add skeleton https://github.com/cisagov/skeleton-python-library.git
    git remote set-url --push skeleton no_push
    git switch develop
    git switch --create lineage/skeleton --track origin/develop
    git pull skeleton HEAD
    git status
  3. Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.

  4. After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:

    git add .github/workflows/build.yml .pre-commit-config.yaml src/example/example.py src/pshtt/_version.py 
    git commit
    git push --force --set-upstream origin lineage/skeleton

    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.

  5. Wait for all the automated tests to pass.

  6. Confirm each item in the "Pre-approval checklist" below.

  7. Remove any of the checklist items that do not apply.

  8. Ensure every remaining checkbox has been checked.

  9. 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!

  • ✌️ The conflicts in this pull request have been resolved.
  • All future TODOs are captured in issues, which are referenced in code comments.
  • All relevant type-of-change labels have been added.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.
  • Bump major, minor, patch, pre-release, and/or build versions as appropriate via the bump_version script if this repository is versioned and the changes in this PR warrant a version bump.
  • Create a pre-release (necessary if and only if the pre-release version was bumped).

✅ Pre-merge checklist

Remove any of the following that do not apply. These boxes should remain unchecked until the pull request has been approved.

  • Finalize version.

✅ Post-merge checklist

Remove any of the following that do not apply.

  • Create a release (necessary if and only if the version was bumped).

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

jsf9k and others added 12 commits May 7, 2025 14:10
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]>
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
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jun 14, 2025
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

This expression logs
sensitive data (secret)
as clear text.

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]".

Suggested changeset 1
src/example/example.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/src/example/example.py b/src/example/example.py
--- a/src/example/example.py
+++ b/src/example/example.py
@@ -100,3 +100,3 @@
     )
-    logging.info('Secret="%s"', secret_message)
+    logging.info('Secret="[REDACTED]"')
 
EOF
@@ -100,3 +100,3 @@
)
logging.info('Secret="%s"', secret_message)
logging.info('Secret="[REDACTED]"')

Copilot is powered by AI and may make mistakes. Always verify output.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants