Skip to content

Commit 71d2437

Browse files
pre-commit
1 parent cd9dc9d commit 71d2437

File tree

7 files changed

+36
-35
lines changed

7 files changed

+36
-35
lines changed

modules/docker-build/README.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,28 +88,28 @@ No modules.
8888

8989
## Inputs
9090

91-
| Name | Description | Type | Default | Required |
92-
|---------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|----------------|:--------:|
93-
| <a name="input_build_args"></a> [build\_args](#input\_build\_args) | A map of Docker build arguments. | `map(string)` | `{}` | no |
94-
| <a name="input_cache_from"></a> [cache\_from](#input\_cache\_from) | List of images to use as cache when building the image. | `list(string)` | `[]` | no |
95-
| <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 |
96-
| <a name="input_create_sam_metadata"></a> [create\_sam\_metadata](#input\_create\_sam\_metadata) | Controls whether the SAM metadata null resource should be created | `bool` | `false` | no |
97-
| <a name="input_docker_file_path"></a> [docker\_file\_path](#input\_docker\_file\_path) | Path to Dockerfile in source package | `string` | `"Dockerfile"` | no |
98-
| <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 |
99-
| <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 |
100-
| <a name="input_ecr_repo"></a> [ecr\_repo](#input\_ecr\_repo) | Name of ECR repository to use or to create | `string` | `null` | no |
101-
| <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 |
102-
| <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 |
103-
| <a name="input_force_remove"></a> [force\_remove](#input\_force\_remove) | Whether to remove image forcibly when the resource is destroyed. | `bool` | `false` | no |
104-
| <a name="input_image_tag"></a> [image\_tag](#input\_image\_tag) | Image tag to use. If not specified current timestamp in format 'YYYYMMDDhhmmss' will be used. This can lead to unnecessary rebuilds. | `string` | `null` | no |
105-
| <a name="input_image_tag_mutability"></a> [image\_tag\_mutability](#input\_image\_tag\_mutability) | The tag mutability setting for the repository. Must be one of: `MUTABLE` or `IMMUTABLE` | `string` | `"MUTABLE"` | no |
106-
| <a name="input_keep_locally"></a> [keep\_locally](#input\_keep\_locally) | Whether to delete the Docker image locally on destroy operation. | `bool` | `false` | no |
107-
| <a name="input_keep_remotely"></a> [keep\_remotely](#input\_keep\_remotely) | Whether to keep Docker image in the remote registry on destroy operation. | `bool` | `false` | no |
108-
| <a name="input_platform"></a> [platform](#input\_platform) | The target architecture platform to build the image for. | `string` | `null` | no |
109-
| <a name="input_scan_on_push"></a> [scan\_on\_push](#input\_scan\_on\_push) | Indicates whether images are scanned after being pushed to the repository | `bool` | `false` | no |
110-
| <a name="input_source_path"></a> [source\_path](#input\_source\_path) | Path to folder containing application code | `string` | `null` | no |
111-
| <a name="input_triggers"></a> [triggers](#input\_triggers) | A map of arbitrary strings that, when changed, will force the docker\_image resource to be replaced. This can be used to rebuild an image when contents of source code folders change | `map(string)` | `{}` | no |
112-
| <a name="input_use_image_tag"></a> [use\_image\_tag](#input\_use\_image\_tag) | Controls whether to use image tag in ECR repository URI or not. Disable this to deploy latest image using ID (sha256:...) | `bool` | `true` | no |
91+
| Name | Description | Type | Default | Required |
92+
|------|-------------|------|---------|:--------:|
93+
| <a name="input_build_args"></a> [build\_args](#input\_build\_args) | A map of Docker build arguments. | `map(string)` | `{}` | no |
94+
| <a name="input_cache_from"></a> [cache\_from](#input\_cache\_from) | List of images to consider as cache sources when building the image. | `list(string)` | `[]` | no |
95+
| <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 |
96+
| <a name="input_create_sam_metadata"></a> [create\_sam\_metadata](#input\_create\_sam\_metadata) | Controls whether the SAM metadata null resource should be created | `bool` | `false` | no |
97+
| <a name="input_docker_file_path"></a> [docker\_file\_path](#input\_docker\_file\_path) | Path to Dockerfile in source package | `string` | `"Dockerfile"` | no |
98+
| <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 |
99+
| <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 |
100+
| <a name="input_ecr_repo"></a> [ecr\_repo](#input\_ecr\_repo) | Name of ECR repository to use or to create | `string` | `null` | no |
101+
| <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 |
102+
| <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 |
103+
| <a name="input_force_remove"></a> [force\_remove](#input\_force\_remove) | Whether to remove image forcibly when the resource is destroyed. | `bool` | `false` | no |
104+
| <a name="input_image_tag"></a> [image\_tag](#input\_image\_tag) | Image tag to use. If not specified current timestamp in format 'YYYYMMDDhhmmss' will be used. This can lead to unnecessary rebuilds. | `string` | `null` | no |
105+
| <a name="input_image_tag_mutability"></a> [image\_tag\_mutability](#input\_image\_tag\_mutability) | The tag mutability setting for the repository. Must be one of: `MUTABLE` or `IMMUTABLE` | `string` | `"MUTABLE"` | no |
106+
| <a name="input_keep_locally"></a> [keep\_locally](#input\_keep\_locally) | Whether to delete the Docker image locally on destroy operation. | `bool` | `false` | no |
107+
| <a name="input_keep_remotely"></a> [keep\_remotely](#input\_keep\_remotely) | Whether to keep Docker image in the remote registry on destroy operation. | `bool` | `false` | no |
108+
| <a name="input_platform"></a> [platform](#input\_platform) | The target architecture platform to build the image for. | `string` | `null` | no |
109+
| <a name="input_scan_on_push"></a> [scan\_on\_push](#input\_scan\_on\_push) | Indicates whether images are scanned after being pushed to the repository | `bool` | `false` | no |
110+
| <a name="input_source_path"></a> [source\_path](#input\_source\_path) | Path to folder containing application code | `string` | `null` | no |
111+
| <a name="input_triggers"></a> [triggers](#input\_triggers) | A map of arbitrary strings that, when changed, will force the docker\_image resource to be replaced. This can be used to rebuild an image when contents of source code folders change | `map(string)` | `{}` | no |
112+
| <a name="input_use_image_tag"></a> [use\_image\_tag](#input\_use\_image\_tag) | Controls whether to use image tag in ECR repository URI or not. Disable this to deploy latest image using ID (sha256:...) | `bool` | `true` | no |
113113

114114
## Outputs
115115

modules/docker-build/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ variable "triggers" {
114114
}
115115

116116
variable "cache_from" {
117-
description = "List of images to consider as cache sources when building the image"
117+
description = "List of images to consider as cache sources when building the image."
118118
type = list(string)
119119
default = []
120120
}

wrappers/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality.
1212

1313
```hcl
1414
terraform {
15-
source = "tfr:///terraform-aws-modules/lambda/aws//wrappers"
15+
source = "tfr:///terraform-aws-modules/lambda-fork/aws//wrappers"
1616
# Alternative source:
17-
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda.git//wrappers?ref=master"
17+
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda-fork.git//wrappers?ref=master"
1818
}
1919
2020
inputs = {
@@ -42,7 +42,7 @@ inputs = {
4242

4343
```hcl
4444
module "wrapper" {
45-
source = "terraform-aws-modules/lambda/aws//wrappers"
45+
source = "terraform-aws-modules/lambda-fork/aws//wrappers"
4646
4747
defaults = { # Default values
4848
create = true

wrappers/alias/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality.
1212

1313
```hcl
1414
terraform {
15-
source = "tfr:///terraform-aws-modules/lambda/aws//wrappers/alias"
15+
source = "tfr:///terraform-aws-modules/lambda-fork/aws//wrappers/alias"
1616
# Alternative source:
17-
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda.git//wrappers/alias?ref=master"
17+
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda-fork.git//wrappers/alias?ref=master"
1818
}
1919
2020
inputs = {
@@ -42,7 +42,7 @@ inputs = {
4242

4343
```hcl
4444
module "wrapper" {
45-
source = "terraform-aws-modules/lambda/aws//wrappers/alias"
45+
source = "terraform-aws-modules/lambda-fork/aws//wrappers/alias"
4646
4747
defaults = { # Default values
4848
create = true

wrappers/deploy/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality.
1212

1313
```hcl
1414
terraform {
15-
source = "tfr:///terraform-aws-modules/lambda/aws//wrappers/deploy"
15+
source = "tfr:///terraform-aws-modules/lambda-fork/aws//wrappers/deploy"
1616
# Alternative source:
17-
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda.git//wrappers/deploy?ref=master"
17+
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda-fork.git//wrappers/deploy?ref=master"
1818
}
1919
2020
inputs = {
@@ -42,7 +42,7 @@ inputs = {
4242

4343
```hcl
4444
module "wrapper" {
45-
source = "terraform-aws-modules/lambda/aws//wrappers/deploy"
45+
source = "terraform-aws-modules/lambda-fork/aws//wrappers/deploy"
4646
4747
defaults = { # Default values
4848
create = true

wrappers/docker-build/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This wrapper does not implement any extra functionality.
1212

1313
```hcl
1414
terraform {
15-
source = "tfr:///terraform-aws-modules/lambda/aws//wrappers/docker-build"
15+
source = "tfr:///terraform-aws-modules/lambda-fork/aws//wrappers/docker-build"
1616
# Alternative source:
17-
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda.git//wrappers/docker-build?ref=master"
17+
# source = "git::[email protected]:terraform-aws-modules/terraform-aws-lambda-fork.git//wrappers/docker-build?ref=master"
1818
}
1919
2020
inputs = {
@@ -42,7 +42,7 @@ inputs = {
4242

4343
```hcl
4444
module "wrapper" {
45-
source = "terraform-aws-modules/lambda/aws//wrappers/docker-build"
45+
source = "terraform-aws-modules/lambda-fork/aws//wrappers/docker-build"
4646
4747
defaults = { # Default values
4848
create = true

wrappers/docker-build/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module "wrapper" {
44
for_each = var.items
55

66
build_args = try(each.value.build_args, var.defaults.build_args, {})
7+
cache_from = try(each.value.cache_from, var.defaults.cache_from, [])
78
create_ecr_repo = try(each.value.create_ecr_repo, var.defaults.create_ecr_repo, false)
89
create_sam_metadata = try(each.value.create_sam_metadata, var.defaults.create_sam_metadata, false)
910
docker_file_path = try(each.value.docker_file_path, var.defaults.docker_file_path, "Dockerfile")

0 commit comments

Comments
 (0)