Skip to content

Commit

Permalink
go mod tidy and add terraform fmt to linting (#49)
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallford authored Aug 5, 2024
1 parent da6f380 commit 37e4b30
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Terraform
uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false
- name: Lint
run: make lint

Expand Down
1 change: 1 addition & 0 deletions .terraform-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.9.3
7 changes: 5 additions & 2 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ VENV := .venv
VENV_STAMP := $(VENV)/stamp
ACTIVATE := . $(VENV)/bin/activate

lint: lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible
lint: lint/terraform lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible

lint/terraform:
terraform fmt -recursive -check

lint/editorconfig:
$(EDITORCONFIG_CHECKER)
Expand Down Expand Up @@ -65,4 +68,4 @@ $(VENV_STAMP): requirements.txt
$(ACTIVATE); pip install -qr requirements.txt
touch $(VENV_STAMP)

.PHONY: lint lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible install test test/pkg test/acc docs deps bin/ansible-navigator
.PHONY: lint lint/terraform lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible install test test/pkg test/acc docs deps bin/ansible-navigator
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1
github.com/hashicorp/terraform-plugin-framework-validators v0.13.0
github.com/hashicorp/terraform-plugin-go v0.23.0
github.com/hashicorp/terraform-plugin-log v0.9.0
github.com/hashicorp/terraform-plugin-testing v1.9.0
golang.org/x/crypto v0.25.0
gopkg.in/yaml.v3 v3.0.1
Expand Down Expand Up @@ -48,7 +49,6 @@ require (
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.21.0 // indirect
github.com/hashicorp/terraform-json v0.22.1 // indirect
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
Expand Down

0 comments on commit 37e4b30

Please sign in to comment.