⚠️ CONFLICT! Lineage pull request for: skeleton #70
+139
−131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This lets us avoid hardcoding the bucket name and allows it to be set on a per-environment basis via the -backend-config command line option or other methods. For details, see: https://developer.hashicorp.com/terraform/language/backend#partial-configuration
…emote states Also, make all remote states use the same environment (no more mixed staging and production states).
.tfconfig is the extension we have chosen to use for our backend config files.
…-iam-user-tf-module Also, replace an unused SSM parameter with a dummy value.
We plan to come up with a more comprehensive solution that will allow testing in each environment, but we are not there yet.
Co-authored-by: Shane Frasier <[email protected]>
Co-authored-by: Shane Frasier <[email protected]>
In many repos that inherit from this skeleton we need to specify a bucket name where third-party installers, packages, licenses, etc. are stored. Previously we made this bucket name a role var with a default value equal to the name of the bucket in our production COOL. Now we have multiple COOL environments, and we eventually want to test in all environments to ensure that the third-party buckets in all environments contain the expected objects. Therefore, it no longer makes sense to use a default value for the role variable. Instead we lookup an environment variable in converge.yml and have the GHA workflow set that variable when running Molecule. Co-authored-by: David Redmin <[email protected]>
Support new COOL environment structure
cisagovbot
added
the
upstream update
dv4harr10
approved these changes
Mar 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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-ansible-role-with-test-user.gitRemote branch:
HEADCheck the changes in this pull request to ensure they won't cause issues with
your project.
The
lineage/skeletonbranch 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
statuscommand. Fix any conflicts andpossibly incorrect auto-merges.
After resolving each of the conflicts,
addyour changes to thebranch,
commit, andpushyour 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
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