Merge pull request #368 from Danil-Grigorev/add-generate-task

[OCPCLOUD-809] Add verify-diff check in generate task and enable in CI

Makefile

@@ -51,9 +51,10 @@ vendor:
 	go mod verify
 
 .PHONY: generate
-generate:
+generate: gogen goimports
+
+gogen:
 	$(DOCKER_CMD) go generate ./pkg/... ./cmd/...
-	hack/goimports.sh .
 
 .PHONY: test
 test: ## Run tests
@@ -103,8 +104,9 @@ fmt: ## Go fmt your code
 	hack/go-fmt.sh .
 
 .PHONY: goimports
-goimports: ## Go fmt your code
+goimports:
 	hack/goimports.sh .
+	hack/verify-diff.sh
 
 .PHONY: vet
 vet: ## Apply go vet to all go files

hack/goimports.sh

@@ -5,7 +5,6 @@ if [ "$IS_CONTAINER" != "" ]; then
   for TARGET in "${@}"; do
     find "${TARGET}" -name '*.go' ! -path '*/vendor/*' ! -path '*/.build/*' -exec goimports -w {} \+
   done
-  git diff --exit-code
 else
   docker run -it --rm \
     --env IS_CONTAINER=TRUE \

hack/verify-diff.sh

@@ -0,0 +1,9 @@
+FILE_DIFF=$(git ls-files -o --exclude-standard)
+
+if [ "$FILE_DIFF" != "" ]; then
+  echo "Found untracked files:"
+  echo $FILE_DIFF
+  exit 1
+fi
+
+git diff --exit-code