conjur-asset-dsl2 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57aa36f4305e541f313b8a833623d6100929ae50
-  data.tar.gz: dcabd391389d702f971b3a12aee54afadf53c914
+  metadata.gz: 6a097eda9faf788b6594bc01a62527a3e5abbdd0
+  data.tar.gz: 5eeb8404b7aa9c0608c4696640075dc93e8169ea
 SHA512:
-  metadata.gz: 62e2362f4202eaa0d48b0db4c597515531c592b63abcc8118bd88c1b8ce5ee9e4354e895ca1cf43dbea79e4a823d1d8c250c1fa5b724fca284a501fdbad695fb
-  data.tar.gz: 08a1ec598a5d4f23e1bb27dd939f5eaddeff097bcf0d9aebaf1ca8fabf6949134827daaf656d5a27c3d384b07dc7f5bf6b9e6a579a65f264109744f0e9dddb70
+  metadata.gz: fd0f36d920a9483b9e5ec4652a3361f1a424260243c4bc01a14995eb0897227eaacb5953e12a8ff2b8b8da885fbd1bb7c2f366481e2f01feed30bb7f0ba85f4e
+  data.tar.gz: 2afea097e8e27bd16801a654f59eb02b5997b185e5e933503f04af98153ceae54010bc39a461b8dfd32b2cb2492b1a48c098b9f860f98942cd35172977dd9683

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.1
+
+* Properly format the Host Factory layers as they are submitted to the server.
+* Properly report role or resource missing errors.
+* Host Factory role defaults to its owner.
+
 # 0.6.0
 
 * Implement the !deny statement.

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

@@ -1,7 +1,7 @@
 module Conjur
   module Asset
     module DSL2
-      VERSION = "0.6.0"
+      VERSION = "0.6.1"
     end
   end
 end

data/lib/conjur/dsl2/executor.rb

@@ -66,7 +66,7 @@ module Conjur
       
       def create path, parameters
         request = Net::HTTP::Post.new [ @base_path, path ].join('/')
-        request.set_form_data parameters
+        request.set_form_data to_params(parameters)
         send_request request
       end
 
@@ -74,7 +74,7 @@ module Conjur
       
       def update path, parameters
         request = Net::HTTP::Put.new [ @base_path, path ].join('/')
-        request.set_form_data parameters
+        request.set_form_data to_params(parameters)
         send_request request
       end
       
@@ -82,7 +82,7 @@ module Conjur
       
       def delete path, parameters
         uri = URI.parse([ @base_path, path ].join('/'))
-        uri.query = [uri.query, parameters.map{|k,v| [ k, URI.escape(v) ].join('=')}.join("&")].compact.join('&') 
+        uri.query = [uri.query, parameters.to_query].compact.join('&') 
         request = Net::HTTP::Delete.new [ uri.path, '?', uri.query ].join
           
         send_request request
@@ -113,6 +113,18 @@ module Conjur
       rescue JSON::ParserError
         # empty
       end
+      
+      # Convert parameter keys to rails []-style keys
+      def to_params params
+        params.inject({}) do |memo,entry|
+          key, value = entry
+          if value.is_a?(Array)
+            key = "#{key}[]"
+          end
+          memo[key] = value
+          memo
+        end
+      end
     end
   end
 end

data/lib/conjur/dsl2/planner/facts.rb

@@ -45,11 +45,11 @@ module Conjur
         end
         
         def validate_role_exists! role
-          error("Role not found: #{role}") unless planner.role_exists?(role)
+          planner.error("Role not found: #{role}") unless planner.role_exists?(role)
         end
         
         def validate_resource_exists! resource
-          error("Resource not found: #{resource}") unless planner.resource_exists?(resource)
+          planner.error("Resource not found: #{resource}") unless planner.resource_exists?(resource)
         end
         
         protected

data/lib/conjur/dsl2/types/records.rb

@@ -195,6 +195,16 @@ module Conjur
         
         attribute :role, kind: :role, dsl_accessor: true, singular: true
         attribute :layer, kind: :layer, dsl_accessor: true
+        
+        alias role_accessor role
+        
+        def role *args
+          if args.empty?
+            role_accessor || self.owner
+          else
+            role_accessor(*args)
+          end
+        end
       end
       
       class ManagedRole < Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-dsl2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml