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

Move SHM firewall to SRE #1872

Merged

Conversation

jemrobinson
Copy link
Member

@jemrobinson jemrobinson commented May 9, 2024

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).
  • You have marked this pull request as a draft and added '[WIP]' to the title if needed (if you're not yet ready to merge).

🚦 Depends on

Must be merged after #1883

⤴️ Summary

Replace the SHM Standard firewall with an SRE Basic firewall

  • Cost for SHM-level firewall (3 days): £56.74 => est per month: £575
Screenshot 2024-05-13 at 16 42 10
  • Cost for SRE-level firewall (3 days) £17.96 => £182
Screenshot 2024-05-13 at 16 42 14

=> SRE Basic firewall costs ~30% as much as the SHM Standard firewall

🌂 Related issues

Closes #1871

🔬 Tests

Tested on a fresh SRE deployment

@jemrobinson jemrobinson requested a review from a team as a code owner May 9, 2024 14:52
@jemrobinson jemrobinson marked this pull request as draft May 9, 2024 14:52
@jemrobinson jemrobinson force-pushed the 1871-sre-firewall branch 2 times, most recently from 98e2ddb to 21e48b4 Compare May 9, 2024 21:01
Copy link

github-actions bot commented May 9, 2024

Coverage report

Click to see where and how coverage changed

FileStatementsMissingCoverageCoverage
(new stmts)
Lines missing
  data_safe_haven/commands
  sre.py
  data_safe_haven/external/interface
  azure_ipv4_range.py
  data_safe_haven/infrastructure/common
  ip_ranges.py
  transformations.py 12-17
  data_safe_haven/infrastructure/components/composite
  local_dns_record.py 68
  data_safe_haven/infrastructure/programs
  declarative_shm.py
  declarative_sre.py 172
  data_safe_haven/infrastructure/programs/shm
  networking.py
  data_safe_haven/infrastructure/programs/sre
  firewall.py 35-56, 72-265
  networking.py 54-55, 151-152, 1368-1369, 1741, 1761-1766
  data_safe_haven/types
  enums.py
  tests/infrastructure/common
  test_ip_ranges.py
Project Total  

This report was generated by python-coverage-comment-action

@jemrobinson jemrobinson force-pushed the 1871-sre-firewall branch 2 times, most recently from 1507a98 to a6584b1 Compare May 10, 2024 20:17
@jemrobinson jemrobinson changed the title WIP: Move SHM firewall to SRE Move SHM firewall to SRE May 13, 2024
@jemrobinson jemrobinson marked this pull request as ready for review May 13, 2024 16:01
@jemrobinson jemrobinson requested a review from a team May 13, 2024 16:01
Copy link
Member

@JimMadge JimMadge left a comment

Choose a reason for hiding this comment

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

Looks good.

Just a few suggestions for where we can add tests and some questions.

@jemrobinson jemrobinson merged commit f56d0a6 into alan-turing-institute:develop May 16, 2024
11 checks passed
@JimMadge JimMadge mentioned this pull request May 17, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move SHM firewall to SRE
2 participants