Skip to content

Commit d79e7f6

Browse files
authored
Merge pull request #414 from docker/refactor/pass
refactor(pass): move into plugins folder
2 parents 051e47a + ba1c70b commit d79e7f6

16 files changed

Lines changed: 12 additions & 14 deletions

File tree

Makefile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,16 @@ lint: multiarch-builder ## Lint code
7171
clean: ## remove built binaries and packages
7272
@sh -c "rm -rf bin dist"
7373

74+
.PHONY: unit-tests
7475
unit-tests:
7576
pids=""; \
7677
err=0; \
77-
go test -trimpath -race -v $(shell go list ./client/...) & pids="$$pids $$!"; \
78-
go test -trimpath -race -v $(shell go list ./cmd/engine/...) & pids="$$pids $$!"; \
79-
go test -trimpath -race -v $(shell go list ./cmd/pass/...) & pids="$$pids $$!"; \
80-
go test -trimpath -race -v $(shell go list ./engine/...) & pids="$$pids $$!"; \
81-
go test -trimpath -race -v $(shell go list ./injector/...) & pids="$$pids $$!"; \
82-
go test -trimpath -race -v $(shell go list ./pass/...) & pids="$$pids $$!"; \
83-
go test -trimpath -race -v $(shell go list ./plugin/...) & pids="$$pids $$!"; \
84-
go test -trimpath -race -v $(shell go list ./plugins/credentialhelper/...) & pids="$$pids $$!"; \
85-
go test -trimpath -race -v $(shell go list ./x/...) & pids="$$pids $$!"; \
78+
for dir in $(shell go list -f '{{.Dir}}' -m); do \
79+
case "$$dir" in \
80+
*/store) continue ;; \
81+
esac; \
82+
go test -trimpath -race -v $$(go list "$$dir/...") & pids="$$pids $$!"; \
83+
done; \
8684
for p in $$pids; do \
8785
wait $$p || err=$$?; \
8886
done; \
@@ -184,4 +182,4 @@ help: ## Show this help
184182
@echo Please specify a build target. The choices are:
185183
@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "$(INFO_COLOR)%-30s$(NO_COLOR) %s\n", $$1, $$2}'
186184

187-
.PHONY: run bin format lint proto-lint proto-generate unit-tests clean help keychain-linux-unit-tests keychain-unit-tests pass pass-cross engine engine-cross
185+
.PHONY: run bin format lint proto-lint proto-generate clean help keychain-linux-unit-tests keychain-unit-tests pass pass-cross engine engine-cross

go.work

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use (
77
./cmd/pass
88
./engine
99
./injector
10-
./pass
1110
./plugin
1211
./plugins/credentialhelper
12+
./plugins/pass
1313
./store
1414
./x
1515
)
File renamed without changes.

pass/go.mod renamed to plugins/pass/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module github.com/docker/secrets-engine/pass
22

33
go 1.25.0
44

5-
replace github.com/docker/secrets-engine/store => ../store
5+
replace github.com/docker/secrets-engine/store => ./../../store
66

7-
replace github.com/docker/secrets-engine/x => ../x
7+
replace github.com/docker/secrets-engine/x => ./../../x
88

99
require (
1010
github.com/docker/secrets-engine/plugin v0.0.19

0 commit comments

Comments
 (0)