factor-connector-chef 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2YxNDgyYzg1YWE0NTYzODc0NjdkYjBjMjE0MDEwODViZGNhODgyOA==
+    M2YwNzhjMWUwNjU5MzllMDMzNmQyZDJhMDkwMjQ0MTVlNGFlMzBhZA==
   data.tar.gz: !binary |-
-    YmFmNWVlZjExNzVlNjM1MjViYmQ5ZmNiNGEzZTIzNjQwODBiZmZkYw==
+    MTQ0ZjgyN2NlMmEwNWY5MTRmOGYwOGE3NWNjN2QyYmY0NTBkODgwMg==
 SHA512:
   metadata.gz: !binary |-
-    MWM5MDlmNDJjNzYzM2FlYTczNjc5N2Y1ZTQzZGNlNTU4ZjUxYjRjZWExMGU1
-    MTdiOTQzNGVhN2ZlNmY2NjBlZGE3ZmI1ZjY0YWZlZTk4MzEyYTE5NTE1NmJm
-    YjY0YTE4YTIzMGRhM2VhNjA2MjViMTgwOTg0Y2ZiMDI2MjJiYzM=
+    ZDJhY2IwYThiNWFiMjQzYWNhMWQ2OWZiMjQ3OWMzZDM3OWEyMDQ4ZDdmNGQx
+    ZjMyNGFlYThlZTk3MjY5MTM5ODVmYjUxYzliZmQ4MDk0ODllMDljZDFmYTA0
+    MmJkMGJhMDE2NzI0YWI1MGUxOTZmNDJkMDI1MGQ4OWY4MmZlZGY=
   data.tar.gz: !binary |-
-    MjAyODc1NDFiNjBmNGZjYWM3YzdjYWNjOWUxZmI2MzZhN2FiNjMxZTVmNzY4
-    NGFhOGFiM2FmODU2NjMxNWUxYzIyNmU5ZjFlYzM4ZTc3MmRhNTdiYjI4MTE3
-    NGY0YjE1ODliZTQ4M2Q3MDhiMDUzZjJiNTQ2OWI0ZThlOWY0MWU=
+    MDZkZWJiMTllNDI1MzJkODBhN2ZlNzEwMTVkMmUxODc4Y2JhMzIxNGIzZGZj
+    NGI1ZWQ0ZTJkNGVjMmEzNWE1NTM5NmIxNTQyMjIyN2MwZDI3YzgwNGU5NzZh
+    ODJlOGM3YWUxZjU5ODQwNzIyMDU4ZDAwN2UwOWE1YzkwNTk5Nzg=

data/lib/factor/connector/chef_clients.rb

@@ -31,6 +31,7 @@ Factor::Connector.service 'chef_clients' do
     }
 
     begin
+      info "Fetching all clients"
       chef = ChefAPI::Connection.new connection_settings
       clients = chef.clients.all
     rescue => ex
@@ -71,6 +72,7 @@ Factor::Connector.service 'chef_clients' do
     }
 
     begin
+      info "Fetching client '#{id}'"
       chef = ChefAPI::Connection.new connection_settings
       content = chef.clients.fetch(id)
     rescue => ex
@@ -159,8 +161,10 @@ Factor::Connector.service 'chef_clients' do
     }
 
     begin
+      info "Fetching client '#{id}'"
       chef = ChefAPI::Connection.new connection_settings
       content = chef.clients.fetch(id)
+      info "Destroying client '#{id}'"
       content.destroy
     rescue => ex
       fail ex.message

data/lib/factor/connector/chef_databags.rb

@@ -32,6 +32,7 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching all data bags"
       chef = ChefAPI::Connection.new connection_settings
       contents = chef.data_bags.all
     rescue => ex
@@ -72,6 +73,7 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching data bag '#{id}'"
       chef     = ChefAPI::Connection.new connection_settings
       data_bag = chef.data_bags.fetch(id) 
       content  = data_bag.to_hash
@@ -115,6 +117,7 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Creating new data bag '#{name}'"
       chef     = ChefAPI::Connection.new connection_settings
       data_bag = chef.data_bags.create(name: name)
       content  = chef.data_bags.fetch(name)
@@ -158,6 +161,7 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Updating data bag name from '#{id}' to '#{name}'"
       chef     = ChefAPI::Connection.new connection_settings
       data_bag = chef.data_bags.update(id, name:name)
       content  = data_bag.to_hash
@@ -200,8 +204,10 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching data bag '#{id}'"
       chef = ChefAPI::Connection.new connection_settings
       content = chef.data_bags.fetch(id)
+      info "Destroying data bag '#{id}'"
       content.destroy
     rescue => ex
       fail ex.message
@@ -241,10 +247,12 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching Data Bag '#{id}'"
       chef           = ChefAPI::Connection.new connection_settings
       data_bag       = chef.data_bags.fetch(id) 
       data_bag_items = 
       contents       = {}
+      info "Fetching all items for Data Bag '#{id}'"
       data_bag.items.all.each do |item|
         contents[item.id.to_s] = item.data
       end
@@ -288,8 +296,10 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching data bag '#{databag_id}'"
       chef           = ChefAPI::Connection.new connection_settings
       data_bag       = chef.data_bags.fetch(databag_id) 
+      info "Fetching items for data bag '#{databag_id}'"
       item = data_bag.items.fetch(id)
       content = item.data
     rescue => ex
@@ -335,10 +345,13 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching data bag '#{databag_id}'"
       chef     = ChefAPI::Connection.new connection_settings
       data_bag = chef.data_bags.fetch(databag_id) 
+      info "Fetching data bag item '#{id}'"
       item     = data_bag.items.fetch(id)
       item.data.deep_merge! data
+      info "Saving data bag item '#{id}'"
       item.save
       content = data_bag.items.fetch(id).data.to_hash
     rescue => ex
@@ -381,9 +394,12 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching Data Bag '#{databag_id}'"
       chef     = ChefAPI::Connection.new connection_settings
       data_bag = chef.data_bags.fetch(databag_id) 
+      info "Fetching Data Bag Item '#{id}'"
       item     = data_bag.items.fetch(id)
+      info "Destroying Data Bag Item '#{id}'"
       item.destroy
     rescue => ex
       fail ex.message
@@ -428,8 +444,10 @@ Factor::Connector.service 'chef_databags' do
     }
 
     begin
+      info "Fetching Data Bag '#{databag_id}'"
       chef     = ChefAPI::Connection.new connection_settings
       data_bag = chef.data_bags.fetch(databag_id)
+      info "Creating new Data Bag Item '#{id}'"
       item     = data_bag.items.create({id:id}.merge(data))
       content  = item.to_hash
     rescue => ex

data/lib/factor/connector/chef_environments.rb

@@ -32,6 +32,7 @@ Factor::Connector.service 'chef_environments' do
     }
 
     begin
+      info "Pulling up all envioronments"
       chef = ChefAPI::Connection.new connection_settings
       contents = chef.environments.all
     rescue => ex
@@ -72,6 +73,7 @@ Factor::Connector.service 'chef_environments' do
     }
 
     begin
+      info "Fetching environment '#{id}'"
       chef = ChefAPI::Connection.new connection_settings
       content = chef.environments.fetch(id)
     rescue => ex
@@ -170,16 +172,32 @@ Factor::Connector.service 'chef_environments' do
     end
 
     begin
-      info "Creating new environment '#{env_params['name']}'"
       chef = ChefAPI::Connection.new connection_settings
-      environment = chef.environments.update(id, env_params) if env_params != {}
+      
+      if env_params != {}
+        info "Updating environment name from '#{id}' to '#{env_params[:name]}'" if env_params[:name]
+        info "Updating environment description" if env_params[:description]
+        chef.environments.update(id, env_params)
+      end
 
       if params['default_attributes'] || params['override_attributes'] || params['cookbook_versions']
         environment = chef.environments.fetch(id)
-        environment.default_attributes.deep_merge!(params['default_attributes']) if params['default_attributes']
-        environment.override_attributes.deep_merge!(params['override_attributes']) if params['override_attributes']
-        environment.cookbook_versions.deep_merge!(params['cookbook_versions']) if params['cookbook_versions']
-        environment.save
+        if params['default_attributes']
+          info "Updating default_attributes"
+          environment.default_attributes.deep_merge!(params['default_attributes'])
+        end
+        if params['override_attributes']
+          info "Updating override_attributes"
+          environment.override_attributes.deep_merge!(params['override_attributes']) 
+        end
+        if params['cookbook_versions']
+          info "Updating cookbook_versions"
+          environment.cookbook_versions.deep_merge!(params['cookbook_versions'])
+        end
+
+        info "Saving changes to attributes"
+        saved = environment.save
+        fail "Couldn't save the environment" unless saved
       end
       content = chef.environments.fetch(id)
     rescue => ex
@@ -220,8 +238,10 @@ Factor::Connector.service 'chef_environments' do
     }
 
     begin
+      info "Fetching environment '#{id}'"
       chef = ChefAPI::Connection.new connection_settings
       content = chef.environments.fetch(id)
+      info "Destroying environment '#{id}'"
       content.destroy
     rescue => ex
       fail ex.message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factor-connector-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh