Regen mocks with latest pegomock and update scripts (runatlantis#1524)

* Update go-generate to run as a script

It was taking forever to run via the previous Makefile command. I don't
exactly know why. Perhaps because it was passing all the packages in as
multiple arguments?

Either way, this change allows it to actually run through in about 20
minutes.

* Regenerate all mocks using latest pegomock

Pegomock version v2.9.0

* Format mocks outside of regular mocks directory.

These mocks are outside of the regular directory due to an import cycle
causing us to have to have these not under a /mocks directory so they
need to be formatted since they're not excluded.

* Add back make test target

Author: lkysow

.circleci/config.yml

@@ -5,6 +5,7 @@ jobs:
     - image: runatlantis/testing-env:20296f9638a4eca04733f60b39e1d3025b9d708a
     steps:
     - checkout
+    - run: make test-all
     - run: make check-fmt
     - run: make check-lint
   e2e:

Makefile

@@ -23,14 +23,14 @@ build-service: ## Build the main Go service
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o atlantis .
 
 go-generate: ## Run go generate in all packages
-	go generate $(PKG)
+	./scripts/go-generate.sh
 
 regen-mocks: ## Delete all mocks and matchers and then run go generate to regen them.
 	find . -type f | grep mocks/mock_ | xargs rm
 	find . -type f | grep mocks/matchers | xargs rm
 	@# not using $(PKG) here because that includes directories that have now
 	@# been made empty, causing go generate to fail.
-	go list ./... | grep -v e2e | grep -v static | xargs go generate
+	./scripts/go-generate.sh
 
 test: ## Run tests
 	@go test -short $(PKG)

scripts/go-generate.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eou pipefail
+
+pkgs=$(go list ./... | grep -v mocks | grep -v matchers | grep -v e2e | grep -v static)
+for pkg in $pkgs; do
+	echo "go generate $pkg"
+	go generate $pkg
+done