j-enc 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 528c5da28584f98eb35faa627f3d0b4fe244c95e
-  data.tar.gz: f7646b67efeb8b32dc8e34e5350dce326e3795a5
+  metadata.gz: cedaed2d68d7e0610864d2e4bbc7c6a97e135d87
+  data.tar.gz: 882eeaea7bc9c284b76acf1dbfd41098edf1ad2c
 SHA512:
-  metadata.gz: 5586a4e154142f0a511bf4c1cc581b4ba8794b4c92d0e8f5c066dc02c37ee472e6cca1b2a208804bfdf23e64bde504e109853a181cafa6fbf49397aee1010811
-  data.tar.gz: 01c700871cf2b3f619a0d3c0edfb822d07d41c679ae1eab4cda9e0ed28eb4d1f029a8b7163b66793daebeaa1129519e17551635dd9e3863aee93911f51b35986
+  metadata.gz: 389a32e8e47e2689fa3b2c6cf252111fa82f6a22501e9d4e183456b3bdf1ae3936b1f2344dc9ea7d3e5d68d14e32afd5774b7266bce09f8fb339145764199b4b
+  data.tar.gz: ae6199f28d9f952d5851d63089267cf8bfa84103fcd13b87f9c93db8dcef42afbc3724f2ecd59e71d6c5ae0a3f6cb7f7323a191ea4c1a1a8b2bd1c511d3b6c8c

data/lib/enc/collins_helper/api.rb

@@ -40,6 +40,18 @@ module Enc
         raise AssetNotValid, 'Asset is not valid' unless asset.is_valid?
         asset
       end
+
+      def safe_find_exact(options = {})
+        exact_options = {}
+        options.each do |k,v|
+          if v.is_a?String
+            exact_options[k] = "^#{v}$"
+          else
+            exact_options[k] = v
+          end
+        end
+        safe_find(exact_options)
+      end
     end
   end
-end
+end

data/lib/enc/runner.rb

@@ -28,9 +28,8 @@ module Enc
       # It's important to handle any errors here so we know when to fall back to the cache.
       begin
         connection = Enc::CollinsHelper::Connection.new(@config)
-        return connection.api.safe_find(:hostname => hostname, :details => true), true
-      rescue Enc::CollinsHelper::Api::TooManyAssets,
-        Enc::CollinsHelper::Api::CannotConnect,
+        return connection.api.safe_find_exact(:hostname => hostname, :details => true), true
+      rescue Enc::CollinsHelper::Api::CannotConnect,
         Collins::AuthenticationError,
         Collins::RequestError
         logger.error('Failed to connect to Collins. Attempting to read from cache')
@@ -44,6 +43,8 @@ module Enc
         return Enc::CollinsHelper::Node::NodeAsset.new, true
       rescue Enc::CollinsHelper::Api::AssetNotConfigured => e
         bail("Asset with hostname #{hostname} is configured to use the ENC but does not have all the required tags", e)
+      rescue Enc::CollinsHelper::Api::TooManyAssets => e
+        bail("Too many assets with hostname #{hostname}", e)
       end
       begin
         return @cache.read(hostname), false
@@ -59,4 +60,4 @@ module Enc
     end
   end
 
-end
+end

data/lib/enc/version.rb

@@ -1,3 +1,3 @@
 module Enc
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/api_spec.rb

@@ -4,18 +4,24 @@ require 'collins_client'
 describe 'Collins API' do
   it 'gets an asset' do
     api = FactoryGirl.build(:api)
-    asset = api.safe_find(:hostname => FactoryDefaults::MOCK_ASSET_HOSTNAME,
-                                     :details => true)
+    asset = api.safe_find_exact(:hostname => FactoryDefaults::MOCK_ASSET_HOSTNAME,
+                                :details  => true)
     expect(asset).to be_an_instance_of(Enc::CollinsHelper::Node::NodeAsset)
     expect(asset.get_attribute('HOSTNAME')).to eq(FactoryDefaults::MOCK_ASSET_HOSTNAME)
   end
 
   it 'searches for missing asset' do
     api = FactoryGirl.build(:api)
-    expect{api.safe_find(:hostname => 'missing', :details => true)}.
+    expect{api.safe_find_exact(:hostname => 'missing', :details => true)}.
         to raise_exception(Enc::CollinsHelper::Api::NoAssets, 'No assets found')
   end
 
+  it 'searches for too many assets' do
+    api = FactoryGirl.build(:api)
+    expect{api.safe_find_exact(:hostname => 'toomany', :details => true)}.
+        to raise_exception(Enc::CollinsHelper::Api::TooManyAssets, 'Too many assets')
+  end
+
   it 'seaches asset using invalid collins host' do
     api = FactoryGirl.build(:api_timeout)
     expect{api.safe_find(:hostname => FactoryDefaults::MOCK_ASSET_HOSTNAME, :details => true)}.

data/spec/factories/response.rb

@@ -21,6 +21,28 @@ FactoryGirl.define do
     ) }
   end
 
+  factory :collins_response_multiple_assets, class: Hash do
+    skip_create
+
+    tag FactoryDefaults::MOCK_ASSET_TAG
+    hostname FactoryDefaults::MOCK_ASSET_HOSTNAME
+    datacenter FactoryDefaults::MOCK_ASSET_DATACENTER
+    environment FactoryDefaults::MOCK_ASSET_ENVIRONMENT
+    puppet_environment FactoryDefaults::MOCK_ASSET_ENVIRONMENT
+    puppet_enc true
+
+    initialize_with { ({ 'status' => 'success:ok',
+                          'data'  => { 'Pagination' => { 'PreviousPage' => 0,
+                                                         'CurrentPage'  => 0,
+                                                         'NextPage'     => 0,
+                                                         'TotalResults' => 2},
+                                       'Data'       => [Utils.get_asset_data(tag, hostname, datacenter, environment,
+                                                                 puppet_environment, puppet_enc),
+                                                        Utils.get_asset_data(tag, hostname, datacenter, environment,
+                                                                 puppet_environment, puppet_enc)]}}
+    ) }
+  end
+
   factory :collins_response_headers, class: Hash do
     skip_create
 
@@ -46,4 +68,4 @@ FactoryGirl.define do
       'connection'                => [connection]}
     ) }
   end
-end
+end

data/spec/spec_helper.rb

@@ -9,22 +9,30 @@ RSpec.configure do |config|
   good_response = FactoryGirl.build(:collins_response)
   missing_asset_response = FactoryGirl.build(:collins_response, hostname: 'missing')
   good_response_headers = FactoryGirl.build(:collins_response_headers)
+  too_many_assets_response = FactoryGirl.build(:collins_response_multiple_assets, hostname: 'toomany')
 
   config.before(:each) do
     stub_request(:get, "#{FactoryDefaults::MOCK_COLLINS_USERNAME}:#{FactoryDefaults::MOCK_COLLINS_PASSWORD}@
 #{FactoryDefaults::MOCK_COLLINS_HOST}
-/api/assets?attribute=hostname%3B#{FactoryDefaults::MOCK_ASSET_HOSTNAME}&details=true").
+/api/assets?attribute=hostname%3B%5E#{FactoryDefaults::MOCK_ASSET_HOSTNAME}$&details=true").
         to_return(status: 200,
                   body: good_response.to_json,
                   headers: good_response_headers
     )
     stub_request(:get, "#{FactoryDefaults::MOCK_COLLINS_USERNAME}:#{FactoryDefaults::MOCK_COLLINS_PASSWORD}@
 #{FactoryDefaults::MOCK_COLLINS_HOST}
-/api/assets?attribute=hostname%3Bmissing&details=true").
+/api/assets?attribute=hostname%3B%5Emissing$&details=true").
         to_return(status: 200,
                   body: missing_asset_response.to_json,
                   headers: good_response_headers
     )
+    stub_request(:get, "#{FactoryDefaults::MOCK_COLLINS_USERNAME}:#{FactoryDefaults::MOCK_COLLINS_PASSWORD}@
+#{FactoryDefaults::MOCK_COLLINS_HOST}
+/api/assets?attribute=hostname%3B%5Etoomany$&details=true").
+        to_return(status: 200,
+                  body: too_many_assets_response.to_json,
+                  headers: good_response_headers
+    )
     stub_request(:get, FactoryDefaults::MOCK_COLLINS_URL).
         to_return(status: 200,
                   body: 'response body',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j-enc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jestin Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Puppet ENC using Collins.