Skip to content
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 #80

Merged
merged 32 commits into from
Aug 16, 2024
Merged

Commits on May 21, 2024

  1. Modify the ansible-core pin to ensure a good version is used

    We can do this because new versions of ansible-core (2.16.7 and
    2.17.0) have been released that do not suffer from the bug discussed
    in ansible/ansible#82702.  This bug broke any symlinked files in vars,
    tasks, etc. for any Ansible role installed via ansible-galaxy.
    
    All versions later than ansible-core 2.16.7 and 2.17.0 should function
    as expected.
    jsf9k committed May 21, 2024
    Configuration menu
    Copy the full SHA
    297ce13 View commit details
    Browse the repository at this point in the history
  2. Pin ansible-core when running the ansible-lint linter

    New versions of ansible-core (2.16.7 and 2.17.0) have been released
    that do not suffer from the bug discussed in ansible/ansible#82702.
    This bug broke any symlinked files in vars, tasks, etc. for any
    Ansible role installed via ansible-galaxy.
    
    All versions later than ansible-core 2.16.7 and 2.17.0 should function
    as expected.
    
    Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
    jsf9k and mcdonnnj committed May 21, 2024
    Configuration menu
    Copy the full SHA
    07e2b60 View commit details
    Browse the repository at this point in the history
  3. Remove unnecessary line

    The line is not only unnecessary, it was commented out to boot!
    jsf9k committed May 21, 2024
    Configuration menu
    Copy the full SHA
    c74e5db View commit details
    Browse the repository at this point in the history
  4. Explain why ansible may need to be added as a dependency for ansible-…

    …lint
    
    On its own ansible-lint does not pull in ansible, only ansible-core.
    Therefore, if an Ansible module lives in ansible instead of
    ansible-core, the linter will complain that the module is unknown.  In
    these cases it is necessary to add the ansible package itself as an
    additional dependency, with the same pinning as is done in
    requirements-test.txt of cisagov/skeleton-ansible-role.
    jsf9k committed May 21, 2024
    Configuration menu
    Copy the full SHA
    2e53e0d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Update pre-commit hook versions

    This is done automatically with the `pre-commit autoupdate` command.
    The pre-commit/mirrors-prettier was manually held back because the
    latest tags are for alpha releases of the next major version.
    mcdonnnj committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    f51fe62 View commit details
    Browse the repository at this point in the history
  2. Manually update the prettier hook

    Use the latest v3 release available from NPM.
    mcdonnnj committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    8e55b8e View commit details
    Browse the repository at this point in the history
  3. Correct commented-out ansible pin

    The pin now agrees with what is in cisagov/skeleton-ansible-role.
    
    Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
    jsf9k and mcdonnnj authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c617bb9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    de92c3c View commit details
    Browse the repository at this point in the history
  5. Merge pull request #182 from cisagov/improvement/pin-packages-for-ans…

    …ible-lint
    
    Pin packages for `ansible-lint`
    mcdonnnj authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    7ddea47 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bc369af View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Merge pull request #338 from cisagov/improvement/remove-ansible-core-pin

    Update version pin on `ansible-core` Python package
    jsf9k authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b66d137 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #343 from cisagov/lineage/skeleton

    Lineage pull request for: skeleton
    jsf9k authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    6334bf2 View commit details
    Browse the repository at this point in the history
  3. Alphabetize filters by name

    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    6041172 View commit details
    Browse the repository at this point in the history
  4. Add a filter for the AMI's architecture

    This is more flexible than filtering the architecture just based on
    the name, particularly since the name filter does not support
    full-fledged regexes.
    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    89c7e1e View commit details
    Browse the repository at this point in the history
  5. Add an architecture filter in the Packer config

    This should make the search more efficient.
    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d58b660 View commit details
    Browse the repository at this point in the history
  6. Add an ARM64 source to the Packer configuration

    This will allow us to build both x86-64 and ARM64 versions of our AMI.
    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    aaeb8bd View commit details
    Browse the repository at this point in the history
  7. Build both the x86-64 and ARM64 versions of the AMI

    In order that the builds should complete as soon as possible, the
    different architectures are built in parallel.
    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    2452ca5 View commit details
    Browse the repository at this point in the history
  8. Update the AMI filter to include both the x86-64 and ARM64 AMIs

    We want to be able to offer both wherever possible.
    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    8dec775 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    793b46d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    95dc9a3 View commit details
    Browse the repository at this point in the history
  11. Reorder data blocks to match order of source blocks

    Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
    jsf9k and mcdonnnj committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    f6dbbb8 View commit details
    Browse the repository at this point in the history
  12. Create separate resources for ARM64 and x86-64 AMIs and launch permis…

    …sions
    
    Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
    jsf9k and mcdonnnj committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9332c38 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    18765c6 View commit details
    Browse the repository at this point in the history
  14. Add comments to moved blocks to explain the intent

    Also reference issue cisagov/skeleton-packer#369 to consider removing
    the moved blocks when they are no longer necessary.
    jsf9k committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    51944d0 View commit details
    Browse the repository at this point in the history
  15. Fix typos (missing spaces)

    Co-authored-by: David Redmin <david.redmin@gwe.cisa.dhs.gov>
    jsf9k and dav3r committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    88528fe View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    f161416 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #355 from cisagov/improvement/specify-architecture…

    …s-as-separate-filter
    
    Build both ARM64 and x86-64 AMIs
    jsf9k authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d44181d View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Configuration menu
    Copy the full SHA
    cc75030 View commit details
    Browse the repository at this point in the history
  2. Remove support for ARM64

    Nessus does not support ARM64 on Debian.
    jsf9k committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    3cb7c40 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    31a3571 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d677433 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0bd9cfc View commit details
    Browse the repository at this point in the history