Merge pull request #343 from mintel/INFRA-36049_add_deletion_protecti…

…on_defaults_dynamodb

add deletion_protection_enabled defaults

charts/terraform-cloud/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.12.0] - 2024-07-29
+### Added
+- Added dynamodb deletion_protection_enabled defaults
+
+### Changed
+- Bump `dynamodb` module version to `1.3.0`
+
 ## [v1.11.0] - 2024-07-03
 ### Changed
 - Bump `redis` module version to `1.2.1`

charts/terraform-cloud/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.11.0
+version: 1.12.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/terraform-cloud/README.md

@@ -1,6 +1,6 @@
 # terraform-cloud
 
-![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 1.12.0](https://img.shields.io/badge/Version-1.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for provisioning resources using Terraform Cloud
 
@@ -57,11 +57,11 @@ A Helm chart for provisioning resources using Terraform Cloud
 | datasync.terraform.module.version | string | `"0.2.1"` | Module version |
 | dynamodb.enabled | bool | `false` | Set to true to create a DynamoDB instance |
 | dynamodb.outputSecret | bool | `true` | Set to true to create an AWS secret manager external secret with outputs |
-| dynamodb.terraform | object | `{"defaultVars":{},"instances":{},"module":{"source":"app.terraform.io/Mintel/dynamodb/aws","version":"1.2.0"}}` | Set ArgoCD syncWave for this resource (default -40) syncWave: -40 |
+| dynamodb.terraform | object | `{"defaultVars":{},"instances":{},"module":{"source":"app.terraform.io/Mintel/dynamodb/aws","version":"1.3.0"}}` | Set ArgoCD syncWave for this resource (default -40) syncWave: -40 |
 | dynamodb.terraform.defaultVars | object | `{}` | Vars to be applied to all instances defined below |
 | dynamodb.terraform.instances | object | `{}` | A map of instance names => variable key/value pairs to be sent to the terraform module. The values in `defaultVars` will be applied to every instance if not explicitly defined here. |
 | dynamodb.terraform.module.source | string | `"app.terraform.io/Mintel/dynamodb/aws"` | Registry path of the Terraform module used to create the resource (https://app.terraform.io/app/Mintel/registry/modules/private/Mintel/dynamodb/aws) |
-| dynamodb.terraform.module.version | string | `"1.2.0"` | Module version |
+| dynamodb.terraform.module.version | string | `"1.3.0"` | Module version |
 | extraIAM.enabled | bool | `false` | Set to true to create an IAM Role or user aside from IRSA for the application |
 | extraIAM.outputSecret | bool | `true` | Set to true to create an AWS secret manager external secret with outputs |
 | extraIAM.terraform | object | `{"defaultVars":{},"instances":{},"module":{"source":"app.terraform.io/Mintel/app-iam/aws","version":"2.5.1"}}` | Set ArgoCD syncWave for this resource (default -20) syncWave: -20 |

charts/terraform-cloud/templates/_helpers.tpl

@@ -138,6 +138,10 @@ app.mintel.com/terraform-allow-destroy: {{ (include "mintel_common.terraform_clo
     {{- if ( eq .Global.clusterEnv "dev") }}
     {{- $_ := set $defaults "point_in_time_recovery_enabled" false }}
     {{- end }}
+    {{/* deletion_protection */}}
+    {{- if ( not ( has .Global.clusterEnv (list "prod" "logs"))) }}
+    {{- $_ := set $defaults "deletion_protection_enabled" false }}
+    {{- end }}
 {{- end }}
 {{/* Opensearch */}}
 {{- if ( eq .ResourceType "opensearch")}}

charts/terraform-cloud/values.yaml

@@ -316,7 +316,7 @@ dynamodb:
       # (https://app.terraform.io/app/Mintel/registry/modules/private/Mintel/dynamodb/aws)
       source: app.terraform.io/Mintel/dynamodb/aws
       # -- Module version
-      version: "1.2.0"
+      version: "1.3.0"
     # -- Vars to be applied to all instances defined below
     defaultVars:
       {}