conjur-asset-dsl2 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38fa755bc25e6b7f4c95cbdb8b034f5b9d99c2ed
-  data.tar.gz: d707cc6e8c30befd74f4df0f2d5710eee407c4d7
+  metadata.gz: 8f38c1c218b12a47f1fb2170f0cd57dc5e267e02
+  data.tar.gz: 6b500271f6c523ad283f561575275d80cd26d2df
 SHA512:
-  metadata.gz: 70673d0437b8cf4e3634bfac415e914029b0a2e89d5d398d93cc7df1f7828f72416d7c51b7a0a6c9f60277c4c3c535ad830e433aa9749c5075f0d8959b167b49
-  data.tar.gz: 461351f6752d3281a9257948fd72a9c376524f7eb0365db30e3a0f6b31c2d86b848d05b84d253823dda22428ecea9105088c18f89de75e1a339eaa2a5e758f95
+  metadata.gz: 90da10c662515b1f93c8961a61a493b2a68475c9b8375d2df099363322ed5bc35d3465eb9ff028b39756daaeb32397961d0951630b34002e9baf3565b1fa10f6
+  data.tar.gz: fd56bb4cdd2ff5f269abbb95f6716d5709df7e93f3fd0a3e655f207759f041470e786f82a5d3b7718ac35665377c88ff167cd23081fb42bc84fd35a6402d6dc3

data/CHANGELOG

@@ -1,4 +1,8 @@
-# 0.3.1
+# 0.4.0
+
+ * Support `--context` flag to save API keys to a file.
+
+# 0.3.2
 
  * Fix issue where webservices were being treated as core assets by the executor.
 
@@ -7,4 +11,4 @@
  * Fix bug in executor for permissions
 
 # 0.3.0
- * Initial stable version
+ * Initial stable version

data/conjur-asset-dsl2.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "cucumber"
   spec.add_development_dependency "ci_reporter_rspec"
   spec.add_development_dependency "aruba"
+  spec.add_development_dependency 'io-grab'
 end

data/lib/conjur-asset-dsl2-version.rb

@@ -1,7 +1,7 @@
 module Conjur
   module Asset
     module DSL2
-      VERSION = "0.3.2"
+      VERSION = "0.4.2"
     end
   end
 end

data/lib/conjur/command/dsl2.rb

@@ -70,6 +70,24 @@ class Conjur::Command::DSL2 < Conjur::DSLCommand
     end
     Conjur::DSL2::HTTPExecutor.new(api).execute actions
   end
+
+
+  def self.save_context_to_file context, path
+
+    existing = if File.file?(path)
+      JSON.load(File.read(path))
+    else
+      {}
+    end
+
+    File.write(path, existing.merge(context).to_json)
+  rescue => ex
+    # It would suck to lose all your API keys by fat-fingering the filename -- write it to the stdout if
+    # anything goes wrong.
+    $stderr.puts "Error saving context to #{path}: #{ex}.  Context will be written to the stdout"
+    $stderr.puts ex.backtrace.join("\n\t") if ENV['DEBUG']
+    puts context.to_json
+  end
   
   desc "Load a DSL2 policy"
   command :policy2 do |policy|
@@ -129,14 +147,20 @@ command. Therefore, a policy can be loaded in three steps, if desired:
       c.flag [:namespace]
 
       c.desc "Syntax (ruby or YAML, will be auto-detected from file extension)"
-      c.flag [:"syntax"]
+      c.flag [:syntax]
       
       c.desc "Print the actions that would be performed"
       c.switch [:"dry-run"]
 
       c.desc "Output format of --dry-run mode (text, yaml)"
       c.default_value "yaml"
-      c.flag [:"format"]
+      c.flag [:format]
+
+      c.desc "File to store API keys for created roles (defaults to stdout)"
+      c.flag [:context]
+
+      c.desc "Don't save the context anywhere (including the stdout)"
+      c.switch [:'no-context']
 
       c.action do |global_options,options,args|
         Conjur.log = "stderr"
@@ -153,7 +177,13 @@ command. Therefore, a policy can be loaded in three steps, if desired:
             puts plan.actions.to_yaml
           end
         else
-          execute api, plan.actions
+          context = execute api, plan.actions
+
+          if options[:context]
+            save_context_to_file context, options[:context]
+          else
+            puts context.to_json unless options[:'no-context']
+          end
         end
       end
     end
@@ -169,7 +199,13 @@ command. Therefore, a policy can be loaded in three steps, if desired:
         filename = args.pop
         script = script_from_filename filename
         actions = Conjur::DSL2::YAML::Loader.load(script, filename)
-        execute api, actions, options
+        context = execute api, actions, options
+
+        if options[:context]
+          save_context_to_file context, options[:context]
+        else
+          puts context.to_json unless options[:'no-context']
+        end
       end
     end
   end

data/lib/conjur/dsl2/executor.rb

@@ -36,8 +36,10 @@ module Conjur
     end
         
     class HTTPExecutor
+      # @param [Conjur::API] api
       def initialize api
         @api = api
+        @context = {}
       end
       
       def execute actions
@@ -50,6 +52,8 @@ module Conjur
             invoke step
           end
         end
+
+        @context
       end
       
       protected
@@ -92,7 +96,19 @@ module Conjur
           $stderr.puts "#{request.method.upcase} #{request.path} #{request.body} failed with error #{response.code}:"
           # $stderr.puts "Request failed with error #{response.code}:"
           $stderr.puts response.body
+        else
+          update_context_from_response response
+        end
+      end
+
+      def update_context_from_response response
+        return if response.body.nil? or response.body.empty?
+        response_json = JSON.parse response.body
+        unless response_json['api_key'].nil?
+          @context[response_json['roleid']] = response_json['api_key']
         end
+      rescue JSON::ParserError
+        # empty
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-dsl2
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: io-grab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - kgilpin@conjur.net