Merge 7a1e99b into backport/catalog-v2/feature-flag/randomly-decent-gnat

hashicorp · Jun 12, 2023 · 77fd376 · 77fd376
2 parents 54f7681 + 7a1e99b
commit 77fd376
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -337,7 +337,7 @@ fmt: $(foreach mod,$(GO_MODULES),fmt/$(mod))
 .PHONY: fmt/%
 fmt/%:
 	@echo "--> Running go fmt ($*)"
-	@cd $* && go fmt ./...
+	@cd $* && gofmt -s -l -w .
 
 .PHONY: lint
 lint: $(foreach mod,$(GO_MODULES),lint/$(mod)) lint-container-test-deps

diff --git a/agent/consul/options.go b/agent/consul/options.go
@@ -38,7 +38,7 @@ type Deps struct {
 
 	// HCP contains the dependencies required when integrating with the HashiCorp Cloud Platform
 	HCP hcp.Deps
-	
+
 	Experiments []string
 
 	EnterpriseDeps