Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions modules/aws-backup-source/backup_framework.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
resource "aws_backup_framework" "main" {
count = var.backup_plan_config.enable ? 1 : 0

# must be underscores instead of dashes
name = replace("${local.resource_name_prefix}-framework", "-", "_")
description = "${var.project_name} Backup Framework"
Expand Down Expand Up @@ -292,3 +294,10 @@ resource "aws_backup_framework" "parameter_store" {
}
}
}

# -----

moved {
from = aws_backup_framework.main
to = aws_backup_framework.main[0]
}
20 changes: 18 additions & 2 deletions modules/aws-backup-source/backup_plan.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
resource "aws_backup_plan" "default" {
count = var.backup_plan_config.enable ? 1 : 0

name = "${local.resource_name_prefix}-plan"

dynamic "rule" {
for_each = var.backup_plan_config.rules
for_each = var.backup_plan_config.enable ? var.backup_plan_config.rules : []
content {
recovery_point_tags = {
backup_rule_name = rule.value.name
Expand Down Expand Up @@ -157,9 +159,11 @@ resource "aws_backup_plan" "parameter_store" {


resource "aws_backup_selection" "default" {
count = var.backup_plan_config.enable ? 1 : 0

iam_role_arn = aws_iam_role.backup.arn
name = "${local.resource_name_prefix}-selection"
plan_id = aws_backup_plan.default.id
plan_id = aws_backup_plan.default[0].id

selection_tag {
key = var.backup_plan_config.selection_tag
Expand Down Expand Up @@ -255,3 +259,15 @@ resource "aws_backup_selection" "parameter_store" {
}
}
}

# -----

moved {
from = aws_backup_plan.default
to = aws_backup_plan.default[0]
}

moved {
from = aws_backup_selection.default
to = aws_backup_selection.default[0]
}
2 changes: 1 addition & 1 deletion modules/aws-backup-source/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ locals {
selection_tag_value_parameter_store_null_checked = (var.backup_plan_config_parameter_store.selection_tag_value == null) ? "True" : var.backup_plan_config_parameter_store.selection_tag_value
selection_tags_parameter_store_null_checked = (var.backup_plan_config_parameter_store.selection_tags == null) ? [{ "key" : var.backup_plan_config_parameter_store.selection_tag, "value" : local.selection_tag_value_parameter_store_null_checked }] : var.backup_plan_config_parameter_store.selection_tags
framework_arn_list = flatten(concat(
[aws_backup_framework.main.arn],
[var.backup_plan_config.enable ? aws_backup_framework.main[0].arn : []],
var.backup_plan_config_ebsvol.enable ? [aws_backup_framework.ebsvol[0].arn] : [],
var.backup_plan_config_dynamodb.enable ? [aws_backup_framework.dynamodb[0].arn] : [],
var.backup_plan_config_aurora.enable ? [aws_backup_framework.aurora[0].arn] : [],
Expand Down
24 changes: 13 additions & 11 deletions modules/aws-backup-source/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,15 @@ variable "backup_copy_vault_account_id" {
variable "backup_plan_config" {
description = "Configuration for backup plans"
type = object({
selection_tag = string
enable = bool
selection_tag = optional(string)
selection_tag_value = optional(string)
selection_tags = optional(list(object({
key = optional(string)
value = optional(string)
})))
compliance_resource_types = list(string)
rules = list(object({
compliance_resource_types = optional(list(string))
rules = optional(list(object({
name = string
schedule = string
completion_window = optional(number)
Expand All @@ -107,9 +108,10 @@ variable "backup_plan_config" {
copy_action = optional(object({
delete_after = optional(number)
}))
}))
})))
})
default = {
enable = true
selection_tag = "BackupLocal"
selection_tag_value = "True"
selection_tags = []
Expand Down Expand Up @@ -165,13 +167,13 @@ variable "backup_plan_config_dynamodb" {
description = "Configuration for backup plans with dynamodb"
type = object({
enable = bool
selection_tag = string
selection_tag = optional(string)
selection_tag_value = optional(string)
selection_tags = optional(list(object({
key = optional(string)
value = optional(string)
})))
compliance_resource_types = list(string)
compliance_resource_types = optional(list(string))
rules = optional(list(object({
name = string
schedule = string
Expand Down Expand Up @@ -242,13 +244,13 @@ variable "backup_plan_config_ebsvol" {
description = "Configuration for backup plans with EBS"
type = object({
enable = bool
selection_tag = string
selection_tag = optional(string)
selection_tag_value = optional(string)
selection_tags = optional(list(object({
key = optional(string)
value = optional(string)
})))
compliance_resource_types = list(string)
compliance_resource_types = optional(list(string))
rules = optional(list(object({
name = string
schedule = string
Expand Down Expand Up @@ -306,8 +308,8 @@ variable "backup_plan_config_aurora" {
description = "Configuration for backup plans with aurora"
type = object({
enable = bool
selection_tag = string
compliance_resource_types = list(string)
selection_tag = optional(string)
compliance_resource_types = optional(list(string))
restore_testing_overrides = optional(string)
rules = optional(list(object({
name = string
Expand Down Expand Up @@ -366,7 +368,7 @@ variable "backup_plan_config_parameter_store" {
description = "Configuration for backup plans with parameter store"
type = object({
enable = bool
selection_tag = string
selection_tag = optional(string)
selection_tag_value = optional(string)
selection_tags = optional(list(object({
key = optional(string)
Expand Down