⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

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 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/cyhy_amis.git cyhy_amis
   cd cyhy_amis
   git remote add skeleton https://github.com/cisagov/skeleton-generic.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/dependabot.yml 
   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.
• All new and existing tests pass.

---

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]

If we want to keep this repo in sync with the recent changes in cisagov/skeleton-tf-module then I think:

• terraform should be bumped to version 1.1 in versions.tf. This would require an update to the README.md file as well.
• All Terraform variables should include nullable = false (or nullable = true, if appropriate)

See, e.g., cisagov/cool-userservices-dns#35.

[dav3r]

If we want to keep this repo in sync with the recent changes in cisagov/skeleton-tf-module then I think:

• terraform should be bumped to version 1.1 in versions.tf. This would require an update to the README.md file as well.
• All Terraform variables should include nullable = false (or nullable = true, if appropriate)

See, e.g., cisagov/cool-userservices-dns#35.

@mcdonnnj Do you have any concerns or issues with me making the changes that @jsf9k mentioned above?

[mcdonnnj]

If we want to keep this repo in sync with the recent changes in cisagov/skeleton-tf-module then I think:

* `terraform` should be bumped to version 1.1 in `versions.tf`.  This would require an update to the `README.md` file as well.

* All Terraform variables should include `nullable = false` (or `nullable = true`, if appropriate)

See, e.g., cisagov/cool-userservices-dns#35.

Also @dav3r. Those changes are fine, but I think they should be made separate to this PR.

[dav3r]

If we want to keep this repo in sync with the recent changes in cisagov/skeleton-tf-module then I think:

* `terraform` should be bumped to version 1.1 in `versions.tf`.  This would require an update to the `README.md` file as well.

* All Terraform variables should include `nullable = false` (or `nullable = true`, if appropriate)

See, e.g., cisagov/cool-userservices-dns#35.

Also @dav3r. Those changes are fine, but I think they should be made separate to this PR.

@jsf9k I just chatted with @mcdonnnj about this and I agree with him. Since that nullable change is from skeleton-tf-module and this repo descends from skeleton-generic, it makes sense to put those nullable changes in a separate PR. I can take care of that. That being said, both @mcdonnnj and I think that this PR is now good to go.

[jsf9k]

If we want to keep this repo in sync with the recent changes in cisagov/skeleton-tf-module then I think:

* `terraform` should be bumped to version 1.1 in `versions.tf`.  This would require an update to the `README.md` file as well.

* All Terraform variables should include `nullable = false` (or `nullable = true`, if appropriate)

See, e.g., cisagov/cool-userservices-dns#35.

Also @dav3r. Those changes are fine, but I think they should be made separate to this PR.

@jsf9k I just chatted with @mcdonnnj about this and I agree with him. Since that nullable change is from skeleton-tf-module and this repo descends from skeleton-generic, it makes sense to put those nullable changes in a separate PR. I can take care of that. That being said, both @mcdonnnj and I think that this PR is now good to go.

See #843.