Refacto and add modules

backup/backup.tf

@@ -1,16 +1,15 @@
 locals {
-  app_slug   = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
+  app_slug = "${var.instance}${var.component == "" ? "" : "-"}${var.component}"
 }
 
 resource "kubectl_manifest" "backup_schedule" {
-  count = var.backups.enable ? 1 : 0
-  yaml_body  = <<-EOF
+  yaml_body = <<-EOF
     apiVersion: k8up.io/v1
     kind: Schedule
     metadata:
-      name: "${var.app_slug}-backup"
+      name: "${local.app_slug}-backup"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.labels)}
+      labels: ${jsonencode(var.labels)}
     spec:
       backend:
         repoPasswordSecretRef:
@@ -20,11 +19,11 @@ resource "kubectl_manifest" "backup_schedule" {
           accessKeyIDSecretRef:
             key: "${var.backups.key_id_key}"
             name: "${var.backups.secret_name}"
-          bucket: "${var.app_slug}-${var.namespace}"
+          bucket: "${local.app_slug}-${var.namespace}"
           endpoint: "${var.backups.endpoint}/restic"
           secretAccessKeySecretRef:
             key: "${var.backups.secret_key}"
-            name: "${var.backups.secret-name}"
+            name: "${var.backups.secret_name}"
       backup:
         schedule: "${var.backups.schedule.backup}"
         failedJobsHistoryLimit: 2
@@ -33,10 +32,10 @@ resource "kubectl_manifest" "backup_schedule" {
         schedule: "${var.backups.schedule.check}"
       prune:
         retention:
-          keepDaily: ${var.backups.retention.keepDaily}
-          keepMonthly: ${var.backups.retention.keepMonthly}
-          keepWeekly: ${var.backups.retention.keepWeekly}
-          keepYearly: ${var.backups.retention.keepYearly}
+          keepDaily: ${var.backups.retention.keep_daily}
+          keepMonthly: ${var.backups.retention.keep_monthly}
+          keepWeekly: ${var.backups.retention.keep_weekly}
+          keepYearly: ${var.backups.retention.keep_yearly}
         schedule: "${var.backups.schedule.prune}"
   EOF
 }