Skip to content

Commit ada107c

Browse files
authored
Merge pull request #3 from UseAlloy/INFR-4719
feat: INFR-4719 add image_uri to lifecycle ignore_changes
2 parents 29cd9ba + 4b142ef commit ada107c

File tree

45 files changed

+84
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+84
-76
lines changed

.github/workflows/pre-commit.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- master
88

99
env:
10-
TERRAFORM_DOCS_VERSION: v0.19.0
11-
TFLINT_VERSION: v0.53.0
10+
TERRAFORM_DOCS_VERSION: v0.20.0
11+
TFLINT_VERSION: v0.59.1
1212

1313
jobs:
1414
collectInputs:
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Get root directories
2424
id: dirs
25-
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.13.0
2626

2727
preCommitMinVersions:
2828
name: Min TF pre-commit
@@ -45,14 +45,14 @@ jobs:
4545

4646
- name: Terraform min/max versions
4747
id: minMax
48-
uses: clowdhaus/terraform-min-max@v1.3.1
48+
uses: clowdhaus/terraform-min-max@v2.1.0
4949
with:
5050
directory: ${{ matrix.directory }}
5151

5252
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5353
# Run only validate pre-commit check on min version supported
5454
if: ${{ matrix.directory != '.' }}
55-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.13.0
5656
with:
5757
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5858
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -61,7 +61,7 @@ jobs:
6161
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
6262
# Run only validate pre-commit check on min version supported
6363
if: ${{ matrix.directory == '.' }}
64-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.13.0
6565
with:
6666
terraform-version: ${{ steps.minMax.outputs.minVersion }}
6767
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -88,10 +88,10 @@ jobs:
8888

8989
- name: Terraform min/max versions
9090
id: minMax
91-
uses: clowdhaus/terraform-min-max@v1.3.1
91+
uses: clowdhaus/terraform-min-max@v2.1.0
9292

9393
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
94-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.13.0
9595
with:
9696
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
9797
tflint-version: ${{ env.TFLINT_VERSION }}

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ repos:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each
77
- id: terraform_docs
8+
exclude: |
9+
(?x)^(
10+
examples/.*
11+
)$
812
args:
913
- "--args=--lockfile=false"
1014
- id: terraform_tflint
@@ -23,6 +27,10 @@ repos:
2327
- "--args=--only=terraform_standard_module_structure"
2428
- "--args=--only=terraform_workspace_remote"
2529
- id: terraform_validate
30+
exclude: |
31+
(?x)^(
32+
examples/.*
33+
)$
2634
- repo: https://github.com/pre-commit/pre-commit-hooks
2735
rev: v5.0.0
2836
hooks:

README.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ source_path = [
434434
]
435435
```
436436

437-
*Few notes:*
437+
_Few notes:_
438438

439439
- If you specify a source path as a string that references a folder and the runtime begins with `python` or `nodejs`, the build process will automatically build python and nodejs dependencies if `requirements.txt` or `package.json` file will be found in the source folder. If you want to customize this behavior, please use the object notation as explained below.
440440
- All arguments except `path` are optional.
@@ -560,29 +560,35 @@ module "lambda_function_existing_package_from_remote_url" {
560560
```
561561

562562
## <a name="sam_cli_integration"></a> How to use AWS SAM CLI to test Lambda Function?
563+
563564
[AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-command-reference.html) is an open source tool that help the developers to initiate, build, test, and deploy serverless
564565
applications. SAM CLI tool [supports Terraform applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-terraform-support.html).
565566

566567
SAM CLI provides two ways of testing: local testing and testing on-cloud (Accelerate).
567568

568569
### Local Testing
570+
569571
Using SAM CLI, you can invoke the lambda functions defined in the terraform application locally using the [sam local invoke](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-local-invoke.html)
570572
command, providing the function terraform address, or function name, and to set the `hook-name` to `terraform` to tell SAM CLI that the underlying project is a terraform application.
571573

572574
You can execute the `sam local invoke` command from your terraform application root directory as following:
575+
573576
```
574577
sam local invoke --hook-name terraform module.hello_world_function.aws_lambda_function.this[0]
575578
```
579+
576580
You can also pass an event to your lambda function, or overwrite its environment variables. Check [here](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-using-invoke.html) for more information.
577581

578582
You can also invoke your lambda function in debugging mode, and step-through your lambda function source code locally in your preferred editor. Check [here](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-using-debugging.html) for more information.
579583

580584
### Testing on-cloud (Accelerate)
585+
581586
You can use AWS SAM CLI to quickly test your application on your AWS development account. Using SAM Accelerate, you will be able to develop your lambda functions locally,
582587
and once you save your updates, SAM CLI will update your development account with the updated Lambda functions. So, you can test it on cloud, and if there is any bug,
583588
you can quickly update the code, and SAM CLI will take care of pushing it to the cloud. Check [here](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/accelerate.html) for more information about SAM Accelerate.
584589

585590
You can execute the `sam sync` command from your terraform application root directory as following:
591+
586592
```
587593
sam sync --hook-name terraform --watch
588594
```
@@ -660,13 +666,12 @@ Q4: What does this error mean - `"We currently do not support adding policies fo
660666

661667
- [1Mill/serverless-tf-examples](https://github.com/1Mill/serverless-tf-examples/tree/main/src)
662668

663-
664669
<!-- BEGIN_TF_DOCS -->
665670
## Requirements
666671

667672
| Name | Version |
668673
|------|---------|
669-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
674+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
670675
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.79 |
671676

672677
## Providers
@@ -870,6 +875,7 @@ tox -e py
870875
```
871876

872877
You can also pass additional positional arguments to pytest which is used to run test, e.g. to make it verbose:
878+
873879
```
874880
tox -e py -- -vvv
875881
```
@@ -886,6 +892,6 @@ Apache 2 Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraf
886892

887893
## Additional information for users from Russia and Belarus
888894

889-
* Russia has [illegally annexed Crimea in 2014](https://en.wikipedia.org/wiki/Annexation_of_Crimea_by_the_Russian_Federation) and [brought the war in Donbas](https://en.wikipedia.org/wiki/War_in_Donbas) followed by [full-scale invasion of Ukraine in 2022](https://en.wikipedia.org/wiki/2022_Russian_invasion_of_Ukraine).
890-
* Russia has brought sorrow and devastations to millions of Ukrainians, killed hundreds of innocent people, damaged thousands of buildings, and forced several million people to flee.
891-
* [Putin khuylo!](https://en.wikipedia.org/wiki/Putin_khuylo!)
895+
- Russia has [illegally annexed Crimea in 2014](https://en.wikipedia.org/wiki/Annexation_of_Crimea_by_the_Russian_Federation) and [brought the war in Donbas](https://en.wikipedia.org/wiki/War_in_Donbas) followed by [full-scale invasion of Ukraine in 2022](https://en.wikipedia.org/wiki/2022_Russian_invasion_of_Ukraine).
896+
- Russia has brought sorrow and devastations to millions of Ukrainians, killed hundreds of innocent people, damaged thousands of buildings, and forced several million people to flee.
897+
- [Putin khuylo!](https://en.wikipedia.org/wiki/Putin_khuylo!)

examples/alias/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ $ terraform apply
1515
Note that this example may create resources which cost money. Run `terraform destroy` when you don't need these resources.
1616

1717
<!-- BEGIN_TF_DOCS -->
18+
1819
## Requirements
1920

20-
| Name | Version |
21-
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.79 |
24-
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
21+
| Name | Version |
22+
| ------------------------------------------------------------------------ | ------- |
23+
| <a name="requirement_terraform"></a> [terraform](#requirement_terraform) | >= 1.3 |
24+
| <a name="requirement_aws"></a> [aws](#requirement_aws) | >= 5.79 |
25+
| <a name="requirement_random"></a> [random](#requirement_random) | >= 2.0 |
2526

2627
## Providers
2728

@@ -42,4 +43,5 @@ No inputs.
4243
## Outputs
4344

4445
No outputs.
46+
4547
<!-- END_TF_DOCS -->

examples/alias/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.0"
2+
required_version = ">= 1.3"
33

44
required_providers {
55
aws = {

examples/async/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
2323
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.79 |
2424
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
2525

examples/async/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.0"
2+
required_version = ">= 1.3"
33

44
required_providers {
55
aws = {

examples/build-package/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des
2121

2222
| Name | Version |
2323
|------|---------|
24-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
24+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
2525
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.79 |
2626
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
2727

examples/build-package/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.0"
2+
required_version = ">= 1.3"
33

44
required_providers {
55
aws = {

examples/code-signing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des
1919

2020
| Name | Version |
2121
|------|---------|
22-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
22+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
2323
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.79 |
2424
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
2525

0 commit comments

Comments
 (0)