From c50fb603db05a2208021ae3f86e92db8afe13dd8 Mon Sep 17 00:00:00 2001
From: henryrecker-pingidentity
 <58565376+henryrecker-pingidentity@users.noreply.github.com>
Date: Mon, 5 May 2025 14:02:10 -0500
Subject: [PATCH] Use go tool command go tool invocations

---
 .github/workflows/code-analysis-lint-test.yaml | 2 +-
 Makefile                                       | 4 ++--
 go.mod                                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code-analysis-lint-test.yaml b/.github/workflows/code-analysis-lint-test.yaml
index e5e41bdc..cee6e38f 100644
--- a/.github/workflows/code-analysis-lint-test.yaml
+++ b/.github/workflows/code-analysis-lint-test.yaml
@@ -117,7 +117,7 @@ jobs:
         with:
           go-version-file: "go.mod"
           cache: true
-      - run: go install github.com/pavius/impi/cmd/impi && make importfmtlint
+      - run: make importfmtlint
   test:
     name: go test
     needs: [build]
diff --git a/Makefile b/Makefile
index 86b70d7e..f86afaff 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ devcheck: devchecknotest spincontainer test removetestcontainer
 
 importfmtlint:
 	@echo -n "Running 'impi' to format import ordering..."
-	@if impi --local . --scheme stdThirdPartyLocal ./...; then \
+	@if go tool impi --local . --scheme stdThirdPartyLocal ./...; then \
 		echo " SUCCESS"; \
 	else \
 		echo " FAILED"; \
@@ -111,7 +111,7 @@ importfmtlint:
 golangcilint:
 	@echo -n "Running 'golangci-lint' to check for code quality issues... "
 	@# Clear the cache for every run, so that the linter outputs the same results as the GH Actions workflow
-	@golangci-lint cache clean && golangci-lint run --timeout 5m ./...
+	@go tool golangci-lint cache clean && go tool golangci-lint run --timeout 5m ./...
 
 starttestcontainer: --checkpfcontainerenvvars --checkdocker --dockerrunpf --waitforpfhealthy
 
diff --git a/go.mod b/go.mod
index 93cd0743..6f4fc2e3 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.24.1
 
 tool (
 	github.com/golangci/golangci-lint/cmd/golangci-lint
-	github.com/pavius/impi
+	github.com/pavius/impi/cmd/impi
 )
 
 require (