j-enc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f103fbe09b9ea005115b40859c2b86c9955cc5
-  data.tar.gz: 0ce7e1100496653823345f409e60aaec3b7fe915
+  metadata.gz: 4b119e89fd119c52ca0b22f718178e0eb8243f6f
+  data.tar.gz: 553f320981ed7767e89c4e859370eb58e07b3d35
 SHA512:
-  metadata.gz: 6cd2104e8df103b63a7a6199f9aee3b45081b5731ca66c84023f9a58156f7a6475a3e95d8e2356e4b67a27f027d4e1387cc4dca76e235ed7a35772ef971e18b8
-  data.tar.gz: bb5fab3502a0ecd844d1011c19d72fc6dfca281de9ef93b7053cfb67c313478598ed65a09c886bc436c2804168c7c584c1dc25ff938355c0b12af20aaf3d8fd9
+  metadata.gz: 5acedb1aa0c490b7e5c865f0a25fbc96594b24a8b90a92afad68fad84dac32a87a9ce3cc766d006b00d0f6774edfc4ac036fa4741cccf00023a12b83319017e8
+  data.tar.gz: c715d02dd40797c9a74c70df74e3d765af9460a0ff8daa38f90807aefba3106b939054edcf24a7899586a73d063ba768456f4258e74d24f7a97ea408790c30e0

data/lib/enc/collins_helper/api.rb

@@ -10,6 +10,7 @@ module Enc
 
       class TooManyAssets < Exception; end
       class NoAssets < Exception; end
+      class AssetNotConfigured < Exception; end
       class AssetNotValid < Exception; end
       class CannotConnect < Exception; end
 
@@ -35,6 +36,7 @@ module Enc
         raise TooManyAssets, 'Too many assets' if response.count > 1
         raise NoAssets, 'No assets found' if response.first.nil? or response.first.empty?
         asset = CollinsHelper::Node::NodeAsset.from_json(response.first)
+        raise AssetNotConfigured, 'Asset is missing required tags' if (not asset.is_valid? and asset.uses_enc?)
         raise AssetNotValid, 'Asset is not valid' unless asset.is_valid?
         asset
       end

data/lib/enc/runner.rb

@@ -30,7 +30,6 @@ module Enc
         connection = Enc::CollinsHelper::Connection.new(@config)
         return connection.api.safe_find(:hostname => hostname, :details => true), true
       rescue Enc::CollinsHelper::Api::TooManyAssets,
-        Enc::CollinsHelper::Api::AssetNotValid,
         Enc::CollinsHelper::Api::CannotConnect,
         Collins::AuthenticationError,
         Collins::RequestError
@@ -40,6 +39,11 @@ module Enc
       rescue Enc::CollinsHelper::Api::NoAssets
         logger.info("Did not find any assets with hostname #{hostname}, saving an empty asset to the cache")
         return Enc::CollinsHelper::Node::NodeAsset.new, true
+      rescue Enc::CollinsHelper::Api::AssetNotValid => e
+        logger.error("Asset with hostname #{hostname} is not valid: #{e}, saving an empty asset to the cache")
+        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)
       end
       begin
         return @cache.read(hostname), false

data/lib/enc/version.rb

@@ -1,3 +1,3 @@
 module Enc
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/builder_spec.rb

@@ -23,6 +23,7 @@ describe 'ENC Builder' do
     expect(YAML.load(builder.to_yaml)).to be_an_instance_of(Hash)
     expect(YAML.load(builder.to_yaml)['parameters']['deployment_environment']).to eq(node.get_deployment_environment)
     expect(YAML.load(builder.to_yaml)['parameters']['datacenter']).to eq(node.get_datacenter)
+    expect(YAML.load(builder.to_yaml)['parameters']['roles'].split(',')).to eq(node.get_roles)
     expect(YAML.load(builder.to_yaml)['parameters']['roles']).to eq(node.get_roles.join(','))
     expect(YAML.load(builder.to_yaml)['parameters']['role1']).to eq(node.get_roles_by_index[0])
     expect(YAML.load(builder.to_yaml)['parameters']['role2']).to eq(node.get_roles_by_index[1])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j-enc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jestin Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler