Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Roberdvs authored Jun 11, 2024
2 parents ef8f4f2 + a936b4e commit b0ebfde
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 25 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Check for terraform version mismatch
run: |
Expand All @@ -24,19 +24,19 @@ jobs:
fi
- name: Run a Terraform init
uses: docker://hashicorp/terraform:1.1.5
uses: docker://hashicorp/terraform:1.8.5
with:
entrypoint: terraform
args: init

- name: Run a Terraform validate
uses: docker://hashicorp/terraform:1.1.5
uses: docker://hashicorp/terraform:1.8.5
with:
entrypoint: terraform
args: validate

- name: Run a Terraform format check
uses: docker://hashicorp/terraform:1.1.5
uses: docker://hashicorp/terraform:1.8.5
with:
entrypoint: terraform
args: fmt -check=true -diff=true
Expand All @@ -46,12 +46,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Generate Terraform docs
uses: terraform-docs/gh-actions@v0.11.0
uses: terraform-docs/gh-actions@v1.2.0
with:
working-dir: .
config-file: .terraform-docs.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tfsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
- name: Clone repo
uses: actions/checkout@master
- name: tfsec
uses: aquasecurity/tfsec-pr-commenter-action@v1.0.2
uses: aquasecurity/tfsec-pr-commenter-action@v1.3.1
with:
github_token: ${{ github.token }}
2 changes: 1 addition & 1 deletion .terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.5
1.8.5
45 changes: 31 additions & 14 deletions .terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,13 @@ module "aws_organizations_and_sso" {
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.5 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.0.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.53.0 |

## Resources

Expand Down
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
]
}
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
terraform {
required_version = ">= 1.1.5"
required_providers {
aws = ">= 4.0"
aws = ">= 5.0"
}
}

0 comments on commit b0ebfde

Please sign in to comment.