conjur-asset-host-factory 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c2d66c6541a8eca47e87920a0a70a0d457c570
-  data.tar.gz: 750acd291ddef8c6b792368a6c5531f0f9616ad2
+  metadata.gz: cd29397edddda0f79be357cdbe3b49c6868e9e5c
+  data.tar.gz: 592e45e7862422b2bc162ec797c5d45f756aeacd
 SHA512:
-  metadata.gz: 35f6c10d408630bcc2e81210091c5926e84db14cf45f5317327a944948da28714b9cdf4405ab6f1b47e70a67ca1145ad1d0ecb0003c33c3a6d88bb5ba79be807
-  data.tar.gz: bdd0d00d9b258c4c91ffbebd60697e1445e1ae791cdf2803117f43f575d714d5c347315fc070a3116809881d803a0b39e512d2b04ce886a310603f0282e48ea1
+  metadata.gz: 4a282dd21436c06d180575e127643e8a05735ab6667dbdc3151d90fa8ecf8f32319b9da0c4800e5a890ce0f1628ab43f4ad6602bd8b9afdc0c3b9ba4cda27a11
+  data.tar.gz: 386db30d18c70b7b81c82c7b8055e0ea7d20812ad320362f94323c0207560868e60be01dcfdb72842c9df67af839ef2a3ae7c0a5a07e616783751104201c05d9

data/lib/conjur-asset-host-factory-version.rb

@@ -21,7 +21,7 @@
 module Conjur
   module Asset
     module HostFactory
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/conjur/api/host_factories.rb

@@ -22,14 +22,27 @@ require 'conjur/host_factory'
 
 module Conjur
   class API
+    class << self
+      # Creates a host and returns the response Hash.
+      def host_factory_create_host token, id, options = {}
+        token = token.token if token.is_a?(HostFactoryToken)
+        http_options = {
+          headers: { authorization: %Q(Token token="#{token}") }
+        }
+        response = RestClient::Resource.new(Conjur::API.host_factory_asset_host, http_options)["hosts"].post(options.merge(id: id)).body
+        JSON.parse(response)
+      end
+    end
+    
     # Options:
     # +layers+ list of host factory layers
-    # +roleid+ host factory role
+    # +roleid+ host factory role id
+    # +role+ host factory role. If this is provided, it is converted to roleid.
     def create_host_factory(id, options = {})
       if options[:layers]
         options[:layers] = options[:layers].map do |layer|
           if layer.is_a?(Conjur::Layer)
-            layer.resourceid
+            layer.id
           elsif layer.is_a?(String)
             layer
           else
@@ -37,6 +50,9 @@ module Conjur
           end
         end
       end
+      if role = options.delete(:role)
+        options[:roleid] = role.roleid
+      end
       log do |logger|
         logger << "Creating host_factory #{id}"
         unless options.blank?
@@ -53,21 +69,25 @@ module Conjur
       Conjur::HostFactory.new(Conjur::API.host_factory_asset_host, credentials)[fully_escape(id)]
     end
 
+    def revoke_host_factory_token token
+      token = token.token if token.is_a?(Conjur::HostFactoryToken)
+      RestClient::Resource.new(Conjur::API.host_factory_asset_host, credentials)["tokens/#{token}"].delete
+    end
+    
+    def show_host_factory_token token
+      token = token.token if token.is_a?(Conjur::HostFactoryToken)
+      attrs = JSON.parse(RestClient::Resource.new(Conjur::API.host_factory_asset_host, credentials)["tokens/#{token}"].get.body)
+      Conjur::HostFactoryToken.new(Conjur::API.host_factory_asset_host, credentials)["tokens"][attrs['token']].tap do |token|
+        token.attributes = attrs
+      end
+    end
+    
+    # Creates a Host and returns a Host object.
     def host_factory_create_host token, id, options = {}
-      token = token.token if token.is_a?(HostFactoryToken)
-      http_options = {
-        headers: { authorization: %Q(Token token="#{token}") }
-      }
-      response = RestClient::Resource.new(Conjur::API.host_factory_asset_host, http_options)["hosts"].post(options.merge(id: id)).body
-      attributes = JSON.parse(response)
+      attributes = self.class.host_factory_create_host token, id, options
       Conjur::Host.new(Conjur::API.core_asset_host, credentials)["hosts"][fully_escape attributes['id']].tap do |host|
         host.attributes = attributes
       end
     end
-    
-    def revoke_host_factory_token token
-      token = token.token if token.is_a?(Conjur::HostFactoryToken)
-      RestClient::Resource.new(Conjur::API.host_factory_asset_host, credentials)["tokens/#{token}"].delete
-    end
   end
 end

data/lib/conjur/command/host_factories.rb

@@ -132,6 +132,16 @@ By default, this command creates one token. Optionally, it can be used to create
           puts "Token revoked"
         end
       end
+      
+      tokens.desc "Show a token"
+      tokens.arg_name "token"
+      tokens.command :show do |c|
+        c.action do |global_options,options,args|
+          token = require_arg(args, 'token')
+          
+          display api.show_host_factory_token(token), options
+        end
+      end
     end
 
     hf.desc "Operations on hosts"
@@ -143,7 +153,7 @@ By default, this command creates one token. Optionally, it can be used to create
           token = require_arg(args, 'token')
           id = require_arg(args, 'host-id')
           
-          host = api.host_factory_create_host token, id, options
+          host = Conjur::API.host_factory_create_host token, id, options
           display host
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-host-factory
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api