-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
More makefile fixes #79
Conversation
e8cd0e6
to
5c361df
Compare
I was thinking of adding something like: GIT_DIRTY := $(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true) ... and add it to the version string, but the git commit hash is already behind a ~tommy |
Makefile
Outdated
|
||
enable: | ||
vault secrets enable -path=${PLUGIN_PATH} -plugin-version=${NEXT_VERSION} ${PLUGIN_FILE} | ||
vault secrets enable -path=$(PLUGIN_PATH) -plugin-version=$(NEXT_VERSION) $(PLUGIN_NAME) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should remain PLUGIN_PATH
.
The Vault help doc clearly use 'path' for vault secrets enable/disable
command.
Usage: vault secrets disable [options] PATH
Whereas it uses 'name' (synonymous with file name here) for vault plugin ...
commands.
Usage: vault plugin register [options] TYPE NAME
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"enable" should use the registered plugin name
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just so happened that both PLUGIN_PATH
and PLUGIN_NAME
have same value ('artifactory'). I'm ok with using PLUGIN_NAME
. May be rename PLUGIN_PATH
to PLUGIN_FILE_PATH
to reduce confusion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or maybe PLUGIN_VAULT_PATH ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you have a better idea for this, I am open to it. I did have a case where I was trying to test on a "real" vault server (not the dev one) and I wanted to use something like test-artifactory
... so I had already started this change for $(PLUGIN_PATH)
, but I agree that it is confusing, so PLUGIN_VAULT_PATH or VAULT_PLUGIN_PATH or ????
I'll review/approve this PR once you are ready and toggle this from 'Draft' 😄 |
Rebased to cut the number of "fix" commits down, this should be ready to go. |
I noticed that
make upgrade
was not working. I also noticed that the plugin name was "artifactory-secrets-plugin" instead of "artifactory" so I tried to work on that.:=
, especially ones that use shell commands to evaluate$(VAR_NAME)
(rather than curly braces which can sometimes be mistaken for shell variables)