Skip to content

Commit 61227f4

Browse files
workflows - update workflows (#2)
* workflows - update workflows * terraform-docs: automated action * workflows - init terraform * workflows - fix format * workflows - fix tflint version hopefully * workflows - fix tflint aws version hopefully * workflows - fix tflint error * terraform-docs: automated action Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 0bf58d9 commit 61227f4

File tree

10 files changed

+3431
-10037
lines changed

10 files changed

+3431
-10037
lines changed

.github/workflows/lint.yml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@ jobs:
1616
- uses: actions/checkout@v2
1717
name: Checkout source code
1818

19-
- run: cd infrastructure
20-
name: change dir
21-
2219
- uses: actions/cache@v2
2320
name: Cache plugin dir
2421
with:
2522
path: ~/.tflint.d/plugins
26-
key: ${{ matrix.os }}-tflint-${{ hashFiles('.tflint.hcl') }}
23+
key: ${{ matrix.os }}-tflint-${{ hashFiles('.tflint.hcl') }}-v2
2724

2825
- uses: terraform-linters/setup-tflint@v1
2926
name: Setup TFLint
3027
with:
3128
tflint_version: latest
3229
github_token: ${{ secrets.GITHUB_TOKEN }}
3330

31+
- uses: hashicorp/setup-terraform@v1
32+
- name: Terraform Init
33+
id: init
34+
run: terraform init
3435
- name: Show version
3536
run: tflint --version
3637

@@ -39,37 +40,3 @@ jobs:
3940

4041
- name: Run TFLint
4142
run: tflint -f compact --config .tflint.hcl
42-
tflint-frontend:
43-
runs-on: ${{ matrix.os }}
44-
45-
strategy:
46-
matrix:
47-
os: [ubuntu-latest]
48-
49-
steps:
50-
- uses: actions/checkout@v2
51-
name: Checkout source code
52-
53-
- run: cd infrastructure/frontend
54-
name: change dir
55-
56-
- uses: actions/cache@v2
57-
name: Cache plugin dir
58-
with:
59-
path: ~/.tflint.d/plugins
60-
key: ${{ matrix.os }}-tflint-${{ hashFiles('.tflint.hcl') }}
61-
62-
- uses: terraform-linters/setup-tflint@v1
63-
name: Setup TFLint
64-
with:
65-
tflint_version: latest
66-
github_token: ${{ secrets.GITHUB_TOKEN }}
67-
68-
- name: Show version
69-
run: tflint --version
70-
71-
- name: Init TFLint
72-
run: tflint --init
73-
74-
- name: Run TFLint
75-
run: tflint -f compact

.github/workflows/plan.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/security.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
uses: tfsec/tfsec-sarif-action@9a83b5c3524f825c020e356335855741fd02745f
3939
with:
4040
sarif_file: tfsec.sarif
41-
working_directory: ./infrastructure/
4241

4342
- name: Upload SARIF file
4443
uses: github/codeql-action/upload-sarif@v1

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ override.tf.json
2929
# !example_override.tf
3030

3131
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
32-
# example: *tfplan*
32+
*tfplan*
3333

3434
# Ignore CLI configuration files
3535
.terraformrc
3636
terraform.rc
3737
.terraform.lock.hcl
3838
*.zip
3939
builds/*
40+
node_install/*

.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.11.0"
3+
version = "0.13.3"
44
source = "github.com/terraform-linters/tflint-ruleset-aws"
55
}
66

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ This is the terraform users module for my video streaming application
1515
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.1.8 |
1616
| <a name="requirement_archive"></a> [archive](#requirement\_archive) | ~> 2.2 |
1717
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.11 |
18+
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.1 |
1819

1920
## Providers
2021

2122
| Name | Version |
2223
|------|---------|
23-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.11.0 |
24+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.11 |
25+
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.1.1 |
2426

2527
## Modules
2628

@@ -41,6 +43,7 @@ This is the terraform users module for my video streaming application
4143
| [aws_ssm_parameter.users_client_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
4244
| [aws_ssm_parameter.users_client_secret](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
4345
| [aws_ssm_parameter.users_pool_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
46+
| [null_resource.build](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
4447
| [aws_route53_zone.selected](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/route53_zone) | data source |
4548

4649
## Inputs

0 commit comments

Comments
 (0)