Skip to content

Commit 6bb9fba

Browse files
authored
Merge pull request #97 from pbs-common/CAT-25885
CAT-25855 Updated terraform, aws provider and tools versions.
2 parents 57250aa + d75e89e commit 6bb9fba

29 files changed

+217
-166
lines changed

.github/workflows/document.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
types: [opened, synchronize]
1010
branches:
1111
- main
12+
paths:
13+
- '*.tf'
1214
concurrency: document-${{ github.base_ref }}
1315
jobs:
1416
document:

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Release
22
on:
33
push:
44
branches: [ main ]
5+
paths:
6+
- '*.tf'
57
concurrency: release-${{ github.base_ref }}
68
jobs:
79
release:

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.terraform
2-
examples/artifacts/*
3-
!examples/artifacts/.gitignore
42
.DS_Store
53
target
64
CHANGELOG.md

.terraform.lock.hcl

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.tflint.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugin "aws" {
22
enabled = true
3-
version = "0.22.1"
3+
version = "0.42.0"
44
source = "github.com/terraform-linters/tflint-ruleset-aws"
55
}
66

.tool-versions

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
terraform 1.4.5
2-
golang 1.20.3
1+
terraform 1.13.0
2+
golang 1.25.0
33
ripgrep 13.0.0
4-
tflint 0.46.0
5-
github-cli 2.27.0
6-
fd 8.7.0
7-
terraform-docs 0.16.0
4+
tflint 0.59.1
5+
github-cli 2.78.0
6+
fd 10.3.0
7+
terraform-docs 0.20.0

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Use this URL for the source of the module. See the usage examples below for more details.
88

99
```hcl
10-
github.com/pbs/terraform-aws-lambda-cron-module?ref=0.1.44
10+
github.com/pbs/terraform-aws-lambda-cron-module?ref=x.y.z
1111
```
1212

1313
### Alternative Installation Methods
@@ -22,7 +22,7 @@ Integrate this module like so:
2222

2323
```hcl
2424
module "lambda-cron" {
25-
source = "github.com/pbs/terraform-aws-lambda-cron-module?ref=0.1.44"
25+
source = "github.com/pbs/terraform-aws-lambda-cron-module?ref=x.y.z"
2626
2727
# Required Parameters
2828
handler = "main"
@@ -44,7 +44,7 @@ module "lambda-cron" {
4444

4545
If this repo is added as a subtree, then the version of the module should be close to the version shown here:
4646

47-
`0.1.44`
47+
`x.y.z`
4848

4949
Note, however that subtrees can be altered as desired within repositories.
5050

@@ -60,20 +60,20 @@ Below is automatically generated documentation on this Terraform module using [t
6060

6161
| Name | Version |
6262
|------|---------|
63-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
64-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.5.0 |
63+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.13.0 |
64+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0.0 |
6565

6666
## Providers
6767

6868
| Name | Version |
6969
|------|---------|
70-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.35.0 |
70+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.17.0 |
7171

7272
## Modules
7373

7474
| Name | Source | Version |
7575
|------|--------|---------|
76-
| <a name="module_lambda"></a> [lambda](#module\_lambda) | github.com/pbs/terraform-aws-lambda-module | 1.3.40 |
76+
| <a name="module_lambda"></a> [lambda](#module\_lambda) | github.com/pbs/terraform-aws-lambda-module | 2.0.0 |
7777

7878
## Resources
7979

@@ -92,6 +92,7 @@ Below is automatically generated documentation on this Terraform module using [t
9292
| <a name="input_filename"></a> [filename](#input\_filename) | Filename for the artifact to use for the Lambda | `string` | n/a | yes |
9393
| <a name="input_handler"></a> [handler](#input\_handler) | Cloudwatch event pattern | `string` | n/a | yes |
9494
| <a name="input_organization"></a> [organization](#input\_organization) | Organization using this module. Used to prefix tags so that they are easily identified as being from your organization | `string` | n/a | yes |
95+
| <a name="input_owner"></a> [owner](#input\_owner) | Tag used to group resources according to product | `string` | n/a | yes |
9596
| <a name="input_product"></a> [product](#input\_product) | Tag used to group resources according to product | `string` | n/a | yes |
9697
| <a name="input_repo"></a> [repo](#input\_repo) | Tag used to point to the repo using this module | `string` | n/a | yes |
9798
| <a name="input_runtime"></a> [runtime](#input\_runtime) | Runtime for the lambda function | `string` | n/a | yes |
@@ -101,10 +102,9 @@ Below is automatically generated documentation on this Terraform module using [t
101102
| <a name="input_allow_app_config_access"></a> [allow\_app\_config\_access](#input\_allow\_app\_config\_access) | Allow AppConfig access from the Lambda function. Ignored if `policy_json` or `role_arn` are set. | `bool` | `true` | no |
102103
| <a name="input_app_config_extension_account_number"></a> [app\_config\_extension\_account\_number](#input\_app\_config\_extension\_account\_number) | Account number for the AWS-AppConfig-Extension layer | `string` | `"027255383542"` | no |
103104
| <a name="input_app_config_extension_version"></a> [app\_config\_extension\_version](#input\_app\_config\_extension\_version) | Lambda layer version for the AWS-AppConfig-Extension layer | `number` | `null` | no |
104-
| <a name="input_architectures"></a> [architectures](#input\_architectures) | Architectures to target for the Lambda function | `list(string)` | <pre>[<br> "x86_64"<br>]</pre> | no |
105+
| <a name="input_architectures"></a> [architectures](#input\_architectures) | Architectures to target for the Lambda function | `list(string)` | <pre>[<br/> "x86_64"<br/>]</pre> | no |
105106
| <a name="input_cron"></a> [cron](#input\_cron) | (optional) cron controlling schedule of task. Is set to 07:00 GMT (02:00 EST) by default. | `string` | `"00 7 * * ? *"` | no |
106107
| <a name="input_environment_vars"></a> [environment\_vars](#input\_environment\_vars) | Map of environment variables for the Lambda. If null, defaults to setting an SSM\_PATH based on the environment and name of the function. Set to {} if you would like for there to be no environment variables present. This is important if you are creating a Lambda@Edge. | `map(any)` | `null` | no |
107-
| <a name="input_ephemeral_storage_size"></a> [ephemeral\_storage\_size](#input\_ephemeral\_storage\_size) | Size of the ephemeral storage in MB. Ignored if runtime is not supported. | `number` | `512` | no |
108108
| <a name="input_event_rule_description"></a> [event\_rule\_description](#input\_event\_rule\_description) | Value to use for the CloudWatch Event Rule. Will default to name if not defined. | `string` | `null` | no |
109109
| <a name="input_event_rule_name"></a> [event\_rule\_name](#input\_event\_rule\_name) | Name of the CloudWatch Event Rule. Will default to name if not defined. | `string` | `null` | no |
110110
| <a name="input_file_system_config"></a> [file\_system\_config](#input\_file\_system\_config) | File system configuration for the Lambda function | `map(any)` | `null` | no |

cron.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ resource "aws_cloudwatch_event_rule" "event_rule" {
22
name = local.event_rule_name
33
description = local.event_rule_description
44
schedule_expression = "cron(${var.cron})"
5-
is_enabled = var.is_enabled
5+
state = var.is_enabled ? "ENABLED" : "DISABLED"
66

77
tags = local.tags
88
}

examples/arm/.terraform.lock.hcl

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/arm/main.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
module "lambda_cron" {
22
source = "../.."
33

4-
handler = "main"
5-
filename = "../artifacts/arm-handler.zip"
6-
runtime = "go1.x"
4+
handler = "bootstrap"
5+
filename = "../artifacts/handler.zip"
6+
runtime = "provided.al2023"
77

88
architectures = ["arm64"]
99

1010
environment = var.environment
1111
product = var.product
1212
repo = var.repo
13+
owner = var.owner
1314
organization = var.organization
1415
}

0 commit comments

Comments
 (0)