Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,16 @@ lint: multiarch-builder ## Lint code
clean: ## remove built binaries and packages
@sh -c "rm -rf bin dist"

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

.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
.PHONY: run bin format lint proto-lint proto-generate clean help keychain-linux-unit-tests keychain-unit-tests pass pass-cross engine engine-cross
2 changes: 1 addition & 1 deletion cmd/engine/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.25.0
// retrieved using `go get`.
replace github.com/docker/secrets-engine/engine => ../../engine

replace github.com/docker/secrets-engine/pass => ../../pass
replace github.com/docker/secrets-engine/pass => ./../../plugins/pass

replace github.com/docker/secrets-engine/plugins/credentialhelper => ../../plugins/credentialhelper/

Expand Down
2 changes: 1 addition & 1 deletion cmd/pass/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.25.0
// retrieved using `go get`.
replace github.com/docker/secrets-engine/engine => ../../engine

replace github.com/docker/secrets-engine/pass => ../../pass
replace github.com/docker/secrets-engine/pass => ./../../plugins/pass

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

Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use (
./cmd/pass
./engine
./injector
./pass
./plugin
./plugins/credentialhelper
./plugins/pass
./store
./x
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions pass/go.mod → plugins/pass/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module github.com/docker/secrets-engine/pass

go 1.25.0

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

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

require (
github.com/docker/secrets-engine/plugin v0.0.19
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ github.com/docker/go-units
## explicit; go 1.25
# github.com/docker/secrets-engine/engine v0.0.28 => ./engine
## explicit; go 1.25.0
# github.com/docker/secrets-engine/pass v0.0.15 => ./pass
# github.com/docker/secrets-engine/pass v0.0.15 => ./plugins/pass
## explicit; go 1.25.0
# github.com/docker/secrets-engine/plugin v0.0.19 => ./plugin
## explicit; go 1.25
Expand Down
Loading