Skip to content

Aurora aws backup - #2283

Draft
cadmiumcat wants to merge 4 commits into
mainfrom
aurora-aws-backup
Draft

cadmiumcat wants to merge 4 commits into
mainfrom
aurora-aws-backup

Conversation

@cadmiumcat

Copy link
Copy Markdown
Contributor

What problem does this pull request solve?

Trello card:

Things to consider when reviewing

  • Ensure that you consider the wider context.
  • Does it work when run on your machine?
  • Is it clear what the code is doing?
  • Do the commit messages explain why the changes were made?
  • Are there all the unit tests needed?
  • Has all relevant documentation been updated?

Reminders

If you've made changes to the deployer role (files in modules/deployer-access):

  • Remember to run make <environment> forms/account apply on the relevant environments (dev, staging and/or prod)
  • Check the #govuk-forms-deployment-notifications Slack channel to ensure the apply-forms-terraform-<environment> pipelines have run successfully

We'll need these to be able to "select" them for backing up, assuming we'll select them "by resource" https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/backup_selection
Still need to decide on frequency/lifecycle
We're currently trying this out in integration because it's easy (it doesn't require admin approval). But we may want to store backups somewhere else
We need a KMS key to copy the backups over to another account
https://repost.aws/knowledge-center/backup-troubleshoot-cross-account-copy
@github-actions

Copy link
Copy Markdown

Pre-Commit report

This pull request had errors when running pre-commit.

View workflow run →

fix end of files.........................................................Failed
- hook id: end-of-file-fixer
- exit code: 1
- files were modified by this hook

Reproduce locally with: pre-commit run --all-files.

To run pre-commit as part of git workflow, use pre-commit install.

Full diff of automatic changes
diff --git a/infra/deployments/forms/backup/backup.tf b/infra/deployments/forms/backup/backup.tf
index b969c970..17ec81ee 100644
--- a/infra/deployments/forms/backup/backup.tf
+++ b/infra/deployments/forms/backup/backup.tf
@@ -153,4 +153,3 @@ resource "aws_iam_role_policy_attachment" "backup_service_role" {
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSBackupServiceRolePolicyForBackup"
   role       = aws_iam_role.backup_assume_role.name
 }
-
diff --git a/infra/deployments/forms/rds/outputs.tf b/infra/deployments/forms/rds/outputs.tf
index a4c08a16..0d7007a7 100644
--- a/infra/deployments/forms/rds/outputs.tf
+++ b/infra/deployments/forms/rds/outputs.tf
@@ -4,4 +4,4 @@ output "forms_admin_aurora_cluster_arn" {
 
 output "forms_runner_aurora_cluster_arn" {
   value = module.forms_runner_rds.aurora_cluster_arn
-}
\ No newline at end of file
+}
diff --git a/infra/deployments/integration/account/backup.tf b/infra/deployments/integration/account/backup.tf
index 1aea9860..8685590a 100644
--- a/infra/deployments/integration/account/backup.tf
+++ b/infra/deployments/integration/account/backup.tf
@@ -29,4 +29,4 @@ data "aws_iam_policy_document" "allow_backup_copy" {
 
     resources = [aws_backup_vault.copy.arn]
   }
-}
\ No newline at end of file
+}
diff --git a/infra/deployments/integration/account/outputs.tf b/infra/deployments/integration/account/outputs.tf
index 273fb768..9b5de9eb 100644
--- a/infra/deployments/integration/account/outputs.tf
+++ b/infra/deployments/integration/account/outputs.tf
@@ -24,4 +24,4 @@ output "github_oidc_provider_arn" {
 
 output "destination_vault_arn" {
   value = aws_backup_vault.copy.arn
-}
\ No newline at end of file
+}
diff --git a/infra/modules/rds/outputs.tf b/infra/modules/rds/outputs.tf
index e45595f1..80a12d05 100644
--- a/infra/modules/rds/outputs.tf
+++ b/infra/modules/rds/outputs.tf
@@ -1,3 +1,3 @@
 output "aurora_cluster_arn" {
   value = aws_rds_cluster.cluster_aurora_v2.arn
-}
\ No newline at end of file
+}

This comment will be updated when code changes.

This branch has not been deployed

No deployments
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.

1 participant