feat!: Updated AWS provider to v4, added ECR repo force_delete argument in docker-build module (#337)

Author: 1Mill

modules/docker-build/README.md

@@ -53,14 +53,14 @@ module "docker_image" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.35 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.22 |
 | <a name="requirement_docker"></a> [docker](#requirement\_docker) | >= 2.12 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.35 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.22 |
 | <a name="provider_docker"></a> [docker](#provider\_docker) | >= 2.12 |
 
 ## Modules
@@ -85,6 +85,7 @@ No modules.
 | <a name="input_create_ecr_repo"></a> [create\_ecr\_repo](#input\_create\_ecr\_repo) | Controls whether ECR repository for Lambda image should be created | `bool` | `false` | no |
 | <a name="input_docker_file_path"></a> [docker\_file\_path](#input\_docker\_file\_path) | Path to Dockerfile in source package | `string` | `"Dockerfile"` | no |
 | <a name="input_ecr_address"></a> [ecr\_address](#input\_ecr\_address) | Address of ECR repository for cross-account container image pulling (optional). Option `create_ecr_repo` must be `false` | `string` | `null` | no |
+| <a name="input_ecr_force_delete"></a> [ecr\_force\_delete](#input\_ecr\_force\_delete) | If true, will delete the repository even if it contains images. | `bool` | `true` | no |
 | <a name="input_ecr_repo"></a> [ecr\_repo](#input\_ecr\_repo) | Name of ECR repository to use or to create | `string` | `null` | no |
 | <a name="input_ecr_repo_lifecycle_policy"></a> [ecr\_repo\_lifecycle\_policy](#input\_ecr\_repo\_lifecycle\_policy) | A JSON formatted ECR lifecycle policy to automate the cleaning up of unused images. | `string` | `null` | no |
 | <a name="input_ecr_repo_tags"></a> [ecr\_repo\_tags](#input\_ecr\_repo\_tags) | A map of tags to assign to ECR repository | `map(string)` | `{}` | no |

modules/docker-build/main.tf

@@ -24,6 +24,7 @@ resource "docker_registry_image" "this" {
 resource "aws_ecr_repository" "this" {
   count = var.create_ecr_repo ? 1 : 0
 
+  force_delete         = var.ecr_force_delete
   name                 = var.ecr_repo
   image_tag_mutability = var.image_tag_mutability
 

modules/docker-build/variables.tf

@@ -47,6 +47,12 @@ variable "scan_on_push" {
   default     = false
 }
 
+variable "ecr_force_delete" {
+  description = "If true, will delete the repository even if it contains images."
+  default     = true
+  type        = bool
+}
+
 variable "ecr_repo_tags" {
   description = "A map of tags to assign to ECR repository"
   type        = map(string)

modules/docker-build/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.35"
+      version = ">= 4.22"
     }
     docker = {
       source  = "kreuzwerker/docker"