-
Notifications
You must be signed in to change notification settings - Fork 55
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
⚠️ CONFLICT! Lineage pull request for: skeleton #106
Conversation
Add a directive for hashicorp/setup-packer that was missed when it was added to the `build` workflow. Add a directive for cisagov/setup-env-github-action that is not strictly necessary since we currently just pull from the `develop` branch, but is good to have in case we were to change that in the future.
Add missing dependabot ignore directives
Hi @mcdonnnj Nick, one question: for file setup.py line 25 the usage of exec( ) raises a security concern if its evaluating dynamic content, it may be a code injection vulnerability. Please advise if we can ensure its not definable be an external source. Line 25 reads 'exec(f,read(), pkg_vars) # nosec |
97e2217
to
cfc3360
Compare
Please make an issue to convert this to the same logic used in cisagov/skeleton-python-library. This is outside the scope of this pull request. |
Hi @mcdonnnj Nick, one question: for file setup.py line 25 the usage of exec( ) raises a security concern if its evaluating dynamic content, it may be a code injection vulnerability. Please advise if we can ensure its not definable be an external source. Line 25 reads 'exec(f,read(), pkg_vars) # nosec Please make an issue to convert this to the same logic used in cisagov/skeleton-python-library. This is outside the scope of this pull request. |
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-generic.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 conflictsthat 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 andpossibly incorrect auto-merges.
After resolving each of the conflicts,
add
your changes to thebranch,
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!
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