Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug wth get_options and slash in name

This commit is contained in:
Ilya Makarov 2020-03-11 14:16:29 +03:00
parent d3cb0b517a
commit 729ed3843d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lemur/plugins/lemur_vault_dest/plugin.py
View File

@ -58,7 +58,7 @@ class VaultSourcePlugin(SourcePlugin):
"helpMessage": "Authentication method to use", "helpMessage": "Authentication method to use",
}, },
{ {
"name": "tokenFile/VaultRole", "name": "tokenFileOrVaultRole",
"type": "str", "type": "str",
"required": True, "required": True,
"validation": "^([a-zA-Z0-9/._-]+/?)+$", "validation": "^([a-zA-Z0-9/._-]+/?)+$",
@ -94,7 +94,7 @@ class VaultSourcePlugin(SourcePlugin):
body = "" body = ""
url = self.get_option("vaultUrl", options) url = self.get_option("vaultUrl", options)
auth_method = self.get_option("authenticationMethod", options) auth_method = self.get_option("authenticationMethod", options)
auth_key = self.get_option("tokenFile/vaultRole", options) auth_key = self.get_option("tokenFileOrVaultRole", options)
mount = self.get_option("vaultMount", options) mount = self.get_option("vaultMount", options)
path = self.get_option("vaultPath", options) path = self.get_option("vaultPath", options)
obj_name = self.get_option("objectName", options) obj_name = self.get_option("objectName", options)
@ -185,7 +185,7 @@ class VaultDestinationPlugin(DestinationPlugin):
"helpMessage": "Authentication method to use", "helpMessage": "Authentication method to use",
}, },
{ {
"name": "tokenFile/VaultRole", "name": "tokenFileOrVaultRole",
"type": "str", "type": "str",
"required": True, "required": True,
"validation": "^([a-zA-Z0-9/._-]+/?)+$", "validation": "^([a-zA-Z0-9/._-]+/?)+$",
@ -252,7 +252,7 @@ class VaultDestinationPlugin(DestinationPlugin):
url = self.get_option("vaultUrl", options) url = self.get_option("vaultUrl", options)
auth_method = self.get_option("authenticationMethod", options) auth_method = self.get_option("authenticationMethod", options)
auth_key = self.get_option("tokenFile/vaultRole", options) auth_key = self.get_option("tokenFileOrVaultRole", options)
mount = self.get_option("vaultMount", options) mount = self.get_option("vaultMount", options)
path = self.get_option("vaultPath", options) path = self.get_option("vaultPath", options)
bundle = self.get_option("bundleChain", options) bundle = self.get_option("bundleChain", options)