Merge tag '0.7.0'

Releasing 0.7.0

2 files changed, 6 insertions, 6 deletions

diff --git a/provider_base/lib/macros/nodes.rb b/provider_base/lib/macros/nodes.rb
index 0c6668a0..8b961cbc 100644
--- a/provider_base/lib/macros/nodes.rb
+++ b/provider_base/lib/macros/nodes.rb
@@ -15,10 +15,10 @@ module LeapCli
     end
 
     #
-    # grab an environment appropriate provider
+    # simple alias for global.provider
     #
     def provider
-      global.env(@node.environment).provider
+      global.provider
     end
 
     #
diff --git a/provider_base/lib/macros/secrets.rb b/provider_base/lib/macros/secrets.rb
index 51bf3971..8d1feb55 100644
--- a/provider_base/lib/macros/secrets.rb
+++ b/provider_base/lib/macros/secrets.rb
@@ -13,17 +13,17 @@ module LeapCli
     # +length+ is the character length of the generated password.
     #
     def secret(name, length=32)
-      @manager.secrets.set(name, Util::Secret.generate(length), @node[:environment])
+      manager.secrets.set(name, @node.environment) { Util::Secret.generate(length) }
     end
 
     # inserts a base32 encoded secret
     def base32_secret(name, length=20)
-      @manager.secrets.set(name, Base32.encode(Util::Secret.generate(length)), @node[:environment])
+      manager.secrets.set(name, @node.environment) { Base32.encode(Util::Secret.generate(length)) }
     end
 
     # Picks a random obfsproxy port from given range
     def rand_range(name, range)
-      @manager.secrets.set(name, rand(range), @node[:environment])
+      manager.secrets.set(name, @node.environment) { rand(range) }
     end
 
     #
@@ -32,7 +32,7 @@ module LeapCli
     # +bit_length+ is the bits in the secret, (ie length of resulting hex string will be bit_length/4)
     #
     def hex_secret(name, bit_length=128)
-      @manager.secrets.set(name, Util::Secret.generate_hex(bit_length), @node[:environment])
+      manager.secrets.set(name, @node.environment) { Util::Secret.generate_hex(bit_length) }
     end
 
   end