Fixes #12865: Vault plugin : Add a variable_from_vault generic method. #65

victorqrt · 2018-07-12T12:55:12Z

https://www.rudder-project.org/redmine/issues/12865

amousset · 2018-07-12T13:04:04Z

vault/packaging/postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+cp -a /opt/rudder/share/plugins/vault/usr/share/ncf/tree /usr/share/ncf/


@ncharles do you think we should put it with CFEgine stubs for dsc methods instead?

yes, because if we put it in /usr/share/ncf, it'll be erased at ncf upgrade

amousset · 2018-07-12T13:16:48Z

vault/share/plugins/vault/usr/share/ncf/tree/20_cfe_basics/vault_lib.cf

+
+    pass2.vault_reachable::
+      "vault.auth_token" string => "${data_output[auth][client_token]}",
+        ifvarclass => isvariable("data_output[auth][client_token]");


We should display an error message if the config is not defined

ncharles · 2018-07-12T13:26:49Z

vault/share/plugins/vault/usr/share/ncf/tree/30_generic_methods/variable_from_vault.cf

+# @description Gets a key-value dictionnary from Vault given the secret path
+#
+# @documentation
+# Vault


you'll need to improve a bit the documentation

victorqrt · 2018-07-13T09:01:45Z

Commit modified

ncharles

This is great ! I made some really minor remarks, otherwise this is a great addition to Rudder

ncharles · 2018-07-13T09:30:09Z

vault/packaging/postinst

+cp -a /opt/rudder/share/plugins/vault/* /var/rudder/configuration-repository/ncf/
+cd /var/rudder/configuration-repository/ncf/
+rm sample_vault.json
+git add . && git commit -m "Vault plugin installation"


You should probably mention somewhere in the output that there is a sample_vault.json

ncharles · 2018-07-13T09:30:29Z

vault/share/plugins/vault/20_cfe_basics/vault_lib.cf

+#
+#####################################################################################
+
+bundle agent vault_fetch_config()


could you document here the format of the vault.json file ?

ncharles · 2018-07-13T09:31:21Z

vault/share/plugins/vault/30_generic_methods/variable_from_vault.cf

+# @documentation To use the generated variable, you must use the form `${variable_prefix.variable_name}` with each name replaced with the parameters of this method.
+#
+# Access to the vault has to be configured on each agent in /var/rudder/plugin-resources/vault.json. A sample config file is provided in /opt/rudder/share/plugins/vault/sample_vault.json
+#


can you specify the success & error case ? that fetching a key is a repair, failing is an error?

ncharles · 2018-07-13T09:32:07Z

vault/share/plugins/vault/30_generic_methods/variable_from_vault.cf

+
+    pass3.variable_defined::
+      "success" usebundle => _classes_repaired("${old_class_prefix}");
+      "success" usebundle => _classes_repaired("${class_prefix}");


for the sanity of the person doing maintenance in the futur, could you change the promiser to "repair" ?

victorqrt · 2018-07-13T12:42:42Z

Commit modified

ncharles · 2018-07-13T12:49:36Z

vault/share/plugins/vault/20_cfe_basics/vault_lib.cf

+#####################################################################################
+
+# Fetches the configuration to be used for this run.
+# The config is located at "config_path". It is a JSON file containing two fields : a server_addr and an auth dictionary. 


can you paste the sample, so that it'll be easier for users ?

victorqrt · 2018-07-13T12:54:02Z

Commit modified

Normation-Quality-Assistant · 2018-07-18T16:02:35Z

This PR breaks qa-test

-- stdout -- 
Your branch is behind 'NRM/branches/rudder/4.3' by 4 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Updating 31e02fa..57aefb8
Fast-forward
[...]
-- stderr --
From github.com:VictorQrt/rudder-plugins
 * [new branch]      ust_12865/vault_plugin_add_a_variable_from_vault_generic_method -> ust_12865/vault_plugin_add_a_variable_from_vault_generic_method_pr
From github.com:Normation/rudder-plugins
   31e02fa..57aefb8  branches/rudder/4.3 -> NRM/branches/rudder/4.3
   a2edb83..9a5356d  master              -> NRM/master
Switched to branch 'branches/rudder/4.3'
Switched to a new branch '4.3_test'
No config file found, using default configuration

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/rudder-plugins/pull/65 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA

peckpeck

Don't merge this

peckpeck

Ready now

peckpeck · 2018-07-26T14:17:41Z

OK, merging this PR

Normation-Quality-Assistant · 2018-07-26T14:18:09Z

OK, merging this PR

victorqrt force-pushed the ust_12865/vault_plugin_add_a_variable_from_vault_generic_method branch from be14573 to 6d53dcd Compare July 12, 2018 12:56

amousset reviewed Jul 12, 2018

View reviewed changes

ncharles reviewed Jul 12, 2018

View reviewed changes

victorqrt force-pushed the ust_12865/vault_plugin_add_a_variable_from_vault_generic_method branch from 6d53dcd to 0fc63ae Compare July 13, 2018 09:01

ncharles reviewed Jul 13, 2018

View reviewed changes

victorqrt force-pushed the ust_12865/vault_plugin_add_a_variable_from_vault_generic_method branch from 0fc63ae to f7a08c0 Compare July 13, 2018 12:42

ncharles reviewed Jul 13, 2018

View reviewed changes

victorqrt force-pushed the ust_12865/vault_plugin_add_a_variable_from_vault_generic_method branch from f7a08c0 to f81db13 Compare July 13, 2018 12:54

ncharles approved these changes Jul 13, 2018

View reviewed changes

Fixes #12865: Vault plugin : Add a variable_from_vault generic method.

2f0eaa2

victorqrt force-pushed the ust_12865/vault_plugin_add_a_variable_from_vault_generic_method branch from f81db13 to 2f0eaa2 Compare July 16, 2018 13:31

Normation-Quality-Assistant added the qa: Can't merge label Jul 18, 2018

peckpeck requested changes Jul 19, 2018

View reviewed changes

peckpeck removed the qa: Can't merge label Jul 19, 2018

peckpeck approved these changes Jul 26, 2018

View reviewed changes

peckpeck merged commit 2f0eaa2 into Normation:branches/rudder/4.3 Jul 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #12865: Vault plugin : Add a variable_from_vault generic method. #65

Fixes #12865: Vault plugin : Add a variable_from_vault generic method. #65

victorqrt commented Jul 12, 2018

amousset Jul 12, 2018

ncharles Jul 12, 2018

amousset Jul 12, 2018

ncharles Jul 12, 2018

ncharles Jul 12, 2018

victorqrt commented Jul 13, 2018

ncharles left a comment

ncharles Jul 13, 2018

ncharles Jul 13, 2018

ncharles Jul 13, 2018

ncharles Jul 13, 2018

victorqrt commented Jul 13, 2018

ncharles Jul 13, 2018

victorqrt commented Jul 13, 2018

Normation-Quality-Assistant commented Jul 18, 2018

peckpeck left a comment

peckpeck left a comment

peckpeck commented Jul 26, 2018

Normation-Quality-Assistant commented Jul 26, 2018

		@@ -0,0 +1,3 @@
		#!/bin/sh
		cp -a /opt/rudder/share/plugins/vault/usr/share/ncf/tree /usr/share/ncf/

Fixes #12865: Vault plugin : Add a variable_from_vault generic method. #65

Fixes #12865: Vault plugin : Add a variable_from_vault generic method. #65

Conversation

victorqrt commented Jul 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victorqrt commented Jul 13, 2018

ncharles left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victorqrt commented Jul 13, 2018

Choose a reason for hiding this comment

victorqrt commented Jul 13, 2018

Normation-Quality-Assistant commented Jul 18, 2018

peckpeck left a comment

Choose a reason for hiding this comment

peckpeck left a comment

Choose a reason for hiding this comment

peckpeck commented Jul 26, 2018

Normation-Quality-Assistant commented Jul 26, 2018