Skip to content

Commit f4f5492

Browse files
committed
clean up makefiles
1 parent cf2aebf commit f4f5492

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

Makefile

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ $(GOLANGCI_LINT):
1616
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_DIR) v1.60.1
1717
pwd ..
1818

19-
lint: $(GOLANGCI_LINT)
20-
@echo "==> Checking source code against linters..."
21-
$(GOLANGCI_LINT) run -v ./...
22-
2319
test: ## Execute all unit tests with verbose output."
2420
@echo "==> Running unit tests..."
2521
go test -v ./...
@@ -28,31 +24,11 @@ testacc: ## Run acceptance tests against local aap-dev instance (https://localho
2824
@echo "==> Running acceptance tests..."
2925
TF_ACC=1 AAP_HOST="http://localhost:9080" go test -count=1 -v ./...
3026

31-
gofmt: ## Format Go source code in 'internal/provider' using gofmt."
32-
@echo "==> Format code using gofmt..."
33-
gofmt -s -w internal/provider
34-
3527
generatedocs: ## Format example Terraform configurations and generate plugin documentation."
3628
@echo "==> Formatting examples and generating docs..."
3729
terraform fmt -recursive ./examples/
3830
go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate
3931

40-
# help:
41-
# @echo "Usage: make <target>"
42-
# @echo ""
43-
# @echo "Targets:"
44-
45-
# @echo " test Execute all unit tests with verbose output."
46-
# @echo " testacc Run acceptance tests against local AAP instance (https://localhost:8043)."
47-
# @echo " Requires environment variables: AAP_USERNAME and AAP_PASSWORD."
48-
# @echo " testacc-aapdev Run acceptance tests against dev AAP instance (http://localhost:9080)."
49-
# @echo " Requires environment variables: AAP_USERNAME and AAP_PASSWORD."
50-
# @echo " gofmt Format Go source code in 'internal/provider' using gofmt."
51-
# @echo " generatedocs Format example Terraform configurations and generate plugin documentation."
52-
# @echo ""
53-
# @echo "Default target is 'build'."
54-
# @echo ""
55-
5632
.PHONY: help
5733
help: ## Show this help message
5834
@grep -hE '^[a-zA-Z0-9._-]+:.*?##' $(MAKEFILE_LIST) | \

makefiles/golangci.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,9 @@ lint: lint-tools ## Run static analysis via golangci-lint
2020
@echo "==> Checking source code against linters..."
2121
$(GOLANGCI_LINT) run -v ./...
2222

23+
gofmt: ## Format Go source code in 'internal/provider' using gofmt."
24+
@echo "==> Format code using gofmt..."
25+
gofmt -s -w internal/provider
26+
2327
GOLANGCI_LINT_MK_INCLUDED := 1
2428
endif

0 commit comments

Comments
 (0)