Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ on:

env:
TERRAFORM_DOCS_VERSION: v0.16.0
TFSEC_VERSION: v1.28.1
TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/.terraform.d/plugin-cache
TFLINT_VERSION: v0.45.0

jobs:
Expand All @@ -33,9 +31,6 @@ jobs:
matrix:
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
steps:
- name: Remove default Terraform
run: rm -rf $(which terraform)

- name: Checkout
uses: actions/checkout@v3

Expand All @@ -49,18 +44,6 @@ jobs:
src:
- '${{ matrix.directory }}/*.tf'

- name: Config Terraform plugin cache
if: steps.changes.outputs.src == 'true'
run: mkdir --parents ${{ env.TERRAFORM_DOCS_VERSION }}

- name: Cache Terraform
uses: actions/cache@v3
if: steps.changes.outputs.src == 'true'
with:
path: ${{ env.TERRAFORM_DOCS_VERSION }}
key: ${{ runner.os }}-terraform-${{ hashFiles('**/.terraform.lock.hcl') }}
restore-keys: ${{ runner.os }}-terraform-

- name: Terraform min/max versions
uses: clowdhaus/[email protected]
if: steps.changes.outputs.src == 'true'
Expand Down Expand Up @@ -91,9 +74,6 @@ jobs:
runs-on: ubuntu-latest
needs: collectInputs
steps:
- name: Remove default Terraform
run: rm -rf $(which terraform)

- name: Checkout
uses: actions/checkout@v3

Expand All @@ -104,22 +84,6 @@ jobs:
src:
- '**/*.tf'

- name: Config Terraform plugin cache
if: steps.changes.outputs.src == 'true'
run: mkdir --parents ${{ env.TERRAFORM_DOCS_VERSION }}

- name: Cache Terraform
uses: actions/cache@v3
if: steps.changes.outputs.src == 'true'
with:
path: ${{ env.TF_PLUGIN_CACHE_DIR }}
key: ${{ runner.os }}-terraform-${{ hashFiles('**/.terraform.lock.hcl') }}
restore-keys: ${{ runner.os }}-terraform-

- name: Install tfsec
if: steps.changes.outputs.src == 'true'
run: curl -sSLo ./tfsec https://github.com/aquasecurity/tfsec/releases/download/${{ env.TFSEC_VERSION }}/tfsec-$(uname)-amd64 && chmod +x tfsec && sudo mv tfsec /usr/bin/

- name: Terraform min/max versions
id: minMax
uses: clowdhaus/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion examples/backend-service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resource "aws_service_discovery_service" "this" {
}

module "ecs_service_definition" {
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service"
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service?ref=73acc1d"

deployment_controller = "ECS"

Expand Down
2 changes: 1 addition & 1 deletion examples/backstage/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ resource "aws_service_discovery_service" "this" {
}

module "ecs_service_definition" {
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service"
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service?ref=73acc1d"

name = local.name
desired_count = 3
Expand Down
2 changes: 1 addition & 1 deletion examples/core-infra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ terraform destroy

| Name | Source | Version |
|------|--------|---------|
| <a name="module_ecs"></a> [ecs](#module\_ecs) | github.com/clowdhaus/terraform-aws-ecs | n/a |
| <a name="module_ecs"></a> [ecs](#module\_ecs) | github.com/clowdhaus/terraform-aws-ecs | 73acc1d |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |

## Resources
Expand Down
2 changes: 1 addition & 1 deletion examples/core-infra/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ locals {
################################################################################

module "ecs" {
source = "github.com/clowdhaus/terraform-aws-ecs"
source = "github.com/clowdhaus/terraform-aws-ecs?ref=73acc1d"
# version = "~> 4.0"

cluster_name = local.name
Expand Down
4 changes: 2 additions & 2 deletions examples/graviton/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ resource "aws_service_discovery_service" "arm64" {
}

module "ecs_service_definition_amd64" {
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service"
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service?ref=73acc1d"

name = local.name
desired_count = 3
Expand Down Expand Up @@ -238,7 +238,7 @@ module "ecs_service_definition_amd64" {
}

module "ecs_service_definition_arm64" {
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service"
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service?ref=73acc1d"
name = "${local.name}-arm64"
desired_count = 3
cluster = data.aws_ecs_cluster.core_infra.cluster_name
Expand Down
2 changes: 1 addition & 1 deletion examples/lb-service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ resource "aws_service_discovery_service" "this" {
}

module "ecs_service_definition" {
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service"
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service?ref=73acc1d"

name = local.name
desired_count = 3
Expand Down
2 changes: 1 addition & 1 deletion examples/prometheus/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resource "aws_service_discovery_service" "this" {
}

module "ecs_service_definition" {
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service"
source = "github.com/clowdhaus/terraform-aws-ecs//modules/service?ref=73acc1d"

name = local.name
desired_count = 1
Expand Down