UPSTREAM: <carry>: adjust sa and permission test cases per new change from boxcutterruntime

Author: kuiwang02

openshift/tests-extension/Makefile

@@ -42,15 +42,97 @@ TOOLS_BIN_DIR := $(CURDIR)/bin
 
 #SECTION Development
 .PHONY: verify #HELP To verify the code
-verify: tidy fmt vet lint
+verify:
+	@echo "Running verification checks..."
+	@errors=0; \
+	warnings=0; \
+	failed_steps=""; \
+	echo "1/4 Running 'make tidy'..."; \
+	if ! $(MAKE) tidy; then \
+		echo "ERROR: 'make tidy' failed"; \
+		errors=$$((errors+1)); \
+		failed_steps="$$failed_steps tidy"; \
+	else \
+		echo "SUCCESS: 'make tidy' passed"; \
+	fi; \
+	echo ""; \
+	echo "2/4 Running 'fmt'..."; \
+	if [ -n "$$PROW_JOB_ID" ]; then \
+		echo "  (Prow CI environment detected, using fmt-without-fix)"; \
+		if ! $(MAKE) fmt-without-fix; then \
+			echo "ERROR: 'make fmt-without-fix' failed"; \
+			errors=$$((errors+1)); \
+			failed_steps="$$failed_steps fmt"; \
+		else \
+			echo "SUCCESS: 'make fmt-without-fix' passed"; \
+		fi; \
+	else \
+		echo "  (Local environment, using fmt with auto-fix)"; \
+		files_before=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/*' -exec gofmt -l {} \;); \
+		if ! $(MAKE) fmt; then \
+			echo "ERROR: 'make fmt' failed"; \
+			errors=$$((errors+1)); \
+			failed_steps="$$failed_steps fmt"; \
+		elif [ -n "$$files_before" ]; then \
+			echo "WARNING: 'make fmt' auto-fixed files. Don't forget to commit these changes!"; \
+			warnings=1; \
+		else \
+			echo "SUCCESS: 'make fmt' passed"; \
+		fi; \
+	fi; \
+	echo ""; \
+	echo "3/4 Running 'make vet'..."; \
+	if ! $(MAKE) vet; then \
+		echo "ERROR: 'make vet' failed"; \
+		errors=$$((errors+1)); \
+		failed_steps="$$failed_steps vet"; \
+	else \
+		echo "SUCCESS: 'make vet' passed"; \
+	fi; \
+	echo ""; \
+	echo "4/4 Running 'make lint'..."; \
+	if ! $(MAKE) lint; then \
+		echo "ERROR: 'make lint' failed"; \
+		errors=$$((errors+1)); \
+		failed_steps="$$failed_steps lint"; \
+	else \
+		echo "SUCCESS: 'make lint' passed"; \
+	fi; \
+	echo ""; \
+	echo "Verification completed with $$errors error(s)"; \
+	if [ $$errors -gt 0 ]; then \
+		echo "FAILED: The following verification check(s) failed:$$failed_steps"; \
+		exit 1; \
+	elif [ $$warnings -gt 0 ]; then \
+		echo "WARNING: All verification checks passed, but some files were auto-fixed. Don't forget to commit!"; \
+	else \
+		echo "SUCCESS: All verification checks passed"; \
+	fi
 
 .PHONY: tidy #HELP Run go mod tidy.
 tidy:
 	go mod tidy
 
 .PHONY: fmt
 fmt: #HELP Run go fmt against code.
-	go fmt ./...
+	@files=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/*' -exec gofmt -l {} \;); \
+	go fmt ./...; \
+	if [ -n "$$files" ]; then \
+		echo ""; \
+		echo "Files have been formatted. Don't forget to commit these changes!"; \
+	fi
+
+.PHONY: fmt-without-fix
+fmt-without-fix: #HELP Run go fmt against code.
+	@files=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/*' -exec gofmt -l {} \;); \
+	if [ -n "$$files" ]; then \
+		echo "Files that need formatting:"; \
+		echo "$$files"; \
+		echo ""; \
+		echo "To fix formatting, run:"; \
+		echo "  make fmt"; \
+		exit 1; \
+	fi
 
 .PHONY: vet
 vet: #HELP Run go vet against code.