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.

Sign up for GitHub

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

Jump to bottom

Refactor: Avoid duplicative salt states #1161

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Refactor: Avoid duplicative salt states #1161

merged 1 commit into from
Sep 23, 2024

Conversation

rocodes
Copy link
Contributor

@rocodes rocodes commented Aug 14, 2024 •
edited by legoktm
Loading

Status

Ready for review

Description of Changes

Refactor:

  • Combine sd-base-files and sd-workstation-files salt states, calling them sd-base-template-packages.sls for readability since they install packages. There was duplicate content in these files, probably leftover from the good old template-buildin' days.
  • Remove duplicative salt states (installing grsec and config package) from the large and small template, since that's handled in the base template.

Testing

  • CI (including dom0 tests) passes
  • Visual review

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing pilot instances
  2. New installs

Checklist

If you have made changes to the provisioning logic

  • All tests (make test) pass in dom0

If you have added or removed files

  • I have updated MANIFEST.in and rpm-build/SPECS/securedrop-workstation-dom0-config.spec

If documentation is required

  • I have opened a PR in the docs repo for these changes, or will do so later
  • I would appreciate help with the documentation

@rocodes
Rename sd-base-template-files to sd-base-template-packages.sls since …
3b61aea 
…it handles packages only.

Combine sd-base-template-packages with sd-workstation-template-files.sls into one sls file, removing duplicated states.

Use this file as requisite for the small and large templates to avoid
duplicate package-installation logic in templates.
@rocodes rocodes force-pushed the no-duplicate-template-states branch 2 times, most recently from 1ac9eb5 to 3b61aea Compare August 14, 2024 13:43
legoktm
legoktm approved these changes Sep 23, 2024
View reviewed changes
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, ty!

@legoktm legoktm added this pull request to the merge queue Sep 23, 2024
Merged via the queue into main with commit 7778e98 Sep 23, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@legoktm legoktm legoktm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
SecureDrop dev cycle
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rocodes @legoktm