fhcap-cli 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586e4b4984cbf2ee4847cfa59ca3a69bb7784345
-  data.tar.gz: bb3fc51822d6289862e760de8251eea9abbb2689
+  metadata.gz: 78c7eb91b57300a3bde0b17a9e658c95daf0ae28
+  data.tar.gz: e53cae790a8184c7b0f3d39bc9b8b9f0196bd938
 SHA512:
-  metadata.gz: ab9358a1d95772e4bc80f9b256da13a476c0b2075eb3b11dd90377d64645229a0808761d811f6562b68275b844cc231d74f4c476a162ff779c31ecdb62434742
-  data.tar.gz: c7410c8d9b6ec940b8b130ffefbd1f7504961fe1f53ba7a5d6fdff1bd05d80aa29ccabdb6633a5a3e8aa10e1610f29bd9b2a1136d1bfa969392fdf6f604a031a
+  metadata.gz: 3642959bb379209b96a820250ea2aaf16d142d894ac195cb3ec9261cd79a25a791cb57b3b809d92335ad0e43ae45c55f9a8a959cf4ed98d48e01778f8768b229
+  data.tar.gz: e4343b8c5346771acb9386a1d192fe36ba5659c8126381e412e3af8429614ac7019398b9fd7951d1c7ab3b01c23a6f5271eccf3488f11afb249b5760737533d8

data/CHANGELOG.md

@@ -1,8 +1,25 @@
 
 ## Unreleased
 
-## 0.4.12
+## 0.4.13
+
+* [RHMAP-15127] - Add meta only option to cluster info task
+* [RHMAP-15112] - Update artifact update task to auto detect the 'component-versions' cookbook and use that if it exists and nothing is explicitly specified.
+* [RHMAP-13830] - Replacing OSE Multi cluster template with OSCP 5 node and 7 node templates. The 7 node template includes dedicated infra nodes.
+* [RHMAP-14881] - Set default version of openshift to 3.4 in openshift environment templates.
+* [RHMAP-14896] - Adding json format option for cluster info task
+* [RHMAP-14813] - Add more informative message to component config update command.
+* [RHMAP-14831] - Updating Openshift DNS record creation queries to use role due to known issue with Chef Zero: https://github.com/chef/chef-zero/issues/54
+* [RHMAP-14198] - Force the deletion of ebs volumes attached for the root device of AWS kitchen instances.
+* [RHMAP-14664] - Add cluster update environment attributes method.
+* [RHMAP-14351] - Add --provider-config option to provider add command.
+* [RHMAP-14323] - Use config.config_file attribute to ensure we are reading/updating the correct file when we using a config other than the default via the FHCAP_CFG_FILE env var.
+* [RHMAP-15050] - Use meh2 buildfarm by default
 
+## 0.4.12
+* [RHMAP-14418] - Adding support VPN to aws common template.
+* [RHMAP-14122] - Add ability to set chef attribute overrides within organisation files
+* [RHMAP-14203] - Modify FHCAP AWS Openshift templates to use larger instance types.
 * [RHMAP-14106] - Add cookbook option to component update tasks. Allows updating the version of a component that isn't contained in a cookbook of the same name.
 * [RHMAP-13583] - Adding support for NFS server in Openshift Multi Node templates
 * [RHMAP-13133] - Add options to component update task that allow any stage to be skipped (artifact/config/cookbook update)

data/lib/cookbooks/provision/recipes/cluster_bootstrap_instances.rb

@@ -28,10 +28,11 @@ with_cluster_instances(node) do |cluster_instances|
           chef_environment chef_environment
           machine_options cfg[:machine_options]
           run_list cfg[:instance_config][:run_list]
+          attributes cfg[:instance_config][:chef_attributes]
         end
       end
     end
     max_simultaneous node['max_simultaneous']
     action :setup
   end
-end
+end

data/lib/fhcap/cluster.rb

@@ -130,7 +130,8 @@ module Fhcap
 
       method_option 'name', :type => :string, :required => true, :desc => "Cluster name"
       method_option 'launch', :type => :boolean, :default => false,  :desc => "Launch all urls in the browser"
-      method_option 'only', :type => :string, :desc => "", :enum => %w{ips urls passwords}
+      method_option 'only', :type => :string, :desc => "", :enum => %w{ips urls passwords meta}
+      method_option 'format', :type => :string, :desc => "Format to output data in", :enum => %w{json}
 
       def info
         require "fhcap/tasks/cluster/info"
@@ -187,6 +188,20 @@ module Fhcap
         Tasks::Cluster::BootstrapServer.new(task_options(options.dup)).run
       end
 
+
+      desc "update_environment_attributes", "[ADVANCED USAGE] Update environment attributes"
+
+      shared_options :verbose
+
+      method_option 'name', :type => :string, :required => true, :desc => 'Cluster name'
+      method_option :attributes, :type => :hash, :required => true, :desc => 'Chef Attributes'
+      method_option :type, :type => :string, :required => true, :default => 'default', :desc => 'Chef Attributes', :enum => %w{default override}
+
+      def update_environment_attributes
+        require 'fhcap/tasks/cluster/update_environment_attributes'
+        Tasks::Cluster::UpdateEnvironmentAttributes.new(task_options(options.dup)).run
+      end
+
     end
   end
-end
+end

data/lib/fhcap/component.rb

@@ -22,10 +22,10 @@ module Fhcap
 
         artifact_cookbook = options[:cookbook] || component
         #1. Update artifact version
-        Fhcap::CLI::Component.new.invoke(:update_artifact, [component, version, build], {cookbook: artifact_cookbook, interactive: options[:interactive]}) if options['update-artifact']
+        Fhcap::CLI::Component.new.invoke(:update_artifact, [component, version, build], {cookbook: options[:cookbook], interactive: options[:interactive]}) if options['update-artifact']
 
         #2. Update config
-        Fhcap::CLI::Component.new.invoke(:update_config, [artifact_cookbook], {force: options[:force]}) if options['update-config']
+        Fhcap::CLI::Component.new.invoke(:update_config, [component], {force: options[:force]}) if options['update-config']
 
         #3. Update cookbook
         Fhcap::CLI::Cookbook.new.invoke(:update, [], {cookbooks: [artifact_cookbook], level: options['level']}) if options['update-cookbook']

data/lib/fhcap/config.rb

@@ -64,7 +64,7 @@ module Fhcap
     end
 
     def fhcap_cookbook_archive_url
-      'https://s3-eu-west-1.amazonaws.com/fhcap/fhcap-cookbooks-0fa68747b476f7ee555a94483877969a30133e76.tgz'
+      'https://s3-eu-west-1.amazonaws.com/fhcap/fhcap-cookbooks/fhcap-cookbooks-39c5f7b38bb69ccf9fbd367b39a777b83f15d1de.tgz'
     end
 
     # Generates the immutable fhcap configuration and reasonable defaults.

data/lib/fhcap/provider.rb

@@ -10,10 +10,11 @@ module Fhcap
       add_shared_option :name, :type => :string, :required => true, :desc => "Provider Name"
       add_shared_option :type, :type => :string, :required => true, :desc => "Provider Type", :enum => %w{aws openstack dnsmadeeasy}
       add_shared_option :credentials, :type => :hash, :desc => "Provider specific credentials"
+      add_shared_option :'provider-config', :type => :hash, :desc => "Provider specific config"
 
       desc "add", "Add a provider"
 
-      shared_options :verbose, :name, :type, :credentials, :interactive
+      shared_options :verbose, :name, :type, :credentials, :interactive, :'provider-config'
 
       def add
         require "fhcap/tasks/provider/add"

data/lib/fhcap/repos_helper.rb

@@ -175,7 +175,7 @@ module Fhcap
 
     def modified?(path, since='origin/master')
       stat = Dir.chdir(path) do
-        `git diff #{since}...HEAD -- #{path}`
+        `git diff #{since} -- #{path}`
       end
       !stat.empty?
     end
@@ -187,6 +187,12 @@ module Fhcap
       !stat.empty?
     end
 
+    def git_diff(file, options='--shortstat')
+      Dir.chdir(File.dirname(file)) do
+        `git diff #{options} #{file}`
+      end
+    end
+
     private
 
     def cookbook_loader(paths=repo_cookbook_paths)

data/lib/fhcap/tasks/chef/cookbook/update_artifact.rb

@@ -11,12 +11,13 @@ module Fhcap
           def initialize(options)
             super
             @name = options[:component]
-            @cookbook = options[:cookbook] || @name
+            @cookbook = options[:cookbook]
             @version = options[:version]
             @build = options[:build]
           end
 
           def run
+            @cookbook = version_cookbook(options)
             thor.say "Chef::Cookbook::UpdateArtifact name = #{name}, cookbook = #{cookbook}, version = #{version}, build = #{build}", :yellow
             c = cookbook_loader.cookbooks_by_name[cookbook]
             unless c
@@ -36,6 +37,17 @@ module Fhcap
 
           end
 
+          private
+
+          def version_cookbook(options)
+            options[:cookbook] || component_versions_cookbook || options[:component]
+          end
+
+          def component_versions_cookbook
+            c = cookbook_loader.cookbooks_by_name['component-versions']
+            c ? c.name : nil
+          end
+
         end
       end
     end

data/lib/fhcap/tasks/chef/cookbook/update_config.rb

@@ -64,6 +64,11 @@ module Fhcap
                 cfg.from_attributes_file(name, conf_attr_file)
                 cfg.from_file(file, force, overrides)
                 thor.create_file(conf_attr_file, cfg.attribute_file_content(name, sort), {force: force})
+                if is_dirty?(conf_attr_file)
+                  thor.say "Updated #{name} config: #{git_diff(conf_attr_file)}"
+                else
+                  thor.say "No config changes for #{name}"
+                end
               else
                 thor.say "Missing local file '#{file}', skipping config update"
               end

data/lib/fhcap/tasks/chef/environments/update_attributes.rb

@@ -0,0 +1,47 @@
+require 'fhcap/tasks/chef/chef_task_base'
+require 'deep_merge'
+
+module Fhcap
+  module Tasks
+    module Chef
+      module Environments
+        class UpdateAttributes < ChefTaskBase
+
+          attr_reader :environment, :attributes, :type
+
+          def initialize(options)
+            super
+            @environment = options[:environment]
+            @attributes = options[:attributes]
+            @type = options[:type] || 'default'
+          end
+
+          def run
+            thor.say "Chef::Environments::UpdateAttributes: environment = #{environment}", :yellow
+            if environment.empty?
+              exit_with_error("You must specify an environment")
+            else
+              environment_filepath = find_environment(environment)
+              if environment_filepath
+                environment_data = JSON.parse(IO.read(environment_filepath))
+
+                env_attributes = environment_data["#{type}_attributes"]
+
+                attributes.each do |key,value|
+                  keys = key.to_s.split('.')
+                  h = keys.reverse.inject(value) { |a, n| { n => a } }
+                  env_attributes.deep_merge!(h)
+                end
+
+                thor.create_file(environment_filepath, JSON.pretty_generate(environment_data) + "\n", :force => true)
+              else
+                thor.say "Unknown environment #{environment}", :red
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/chef/server/info.rb

@@ -6,7 +6,7 @@ module Fhcap
       module Server
         class Info < ChefServerTask
 
-          attr_reader :environments, :node_names, :roles, :urls
+          attr_reader :environments, :node_names, :roles, :urls, :cluster_data
 
           def initialize(options)
             super
@@ -14,6 +14,7 @@ module Fhcap
             @node_names = options[:nodes]
             @roles = options[:roles]
             @urls = {}
+            @cluster_data = {}
           end
 
           def run
@@ -30,15 +31,20 @@ module Fhcap
 
           def ip_addresses(env)
             thor.say "[#{env}] IP Addresses", :green
+            cluster_data[env] = {} unless cluster_data[env]
             search_cmd = "search 'chef_environment:#{env}'"
             search_options = '-a cloud.public_ips'
+            cluster_data[env][:nodes] = []
             nodes_for(search_cmd, search_options) do |node|
+              cluster_data[env][:nodes] << node
               thor.say_status "[#{env}] #{node['name']}:", node['cloud.public_ips'].join(','), :cyan
             end
           end
 
           def management_dashboards(env)
             thor.say "[#{env}] Monitoring Dashboards", :green
+            cluster_data[env] = {} unless cluster_data[env]
+            cluster_data[env][:urls] = []
             urls[env] = {} unless urls[env]
             search_cmd = "search 'chef_environment:#{env} AND roles:management_server'"
             search_options = '-a cloud.public_ips -a munin.web_server_port -a nagios.http_port'
@@ -65,6 +71,10 @@ module Fhcap
               thor.say_status "[#{env}] OpenShift Console:", "#{urls[env][:ose_master]}", :cyan
             end
 
+            urls[env].each do |service, url|
+              cluster_data[env][:urls] << {service => url}
+            end
+
           end
 
           def nodes_for(search_cmd, search_options)
@@ -88,4 +98,4 @@ module Fhcap
       end
     end
   end
-end
+end

data/lib/fhcap/tasks/cluster/create_dns_records.rb

@@ -78,9 +78,10 @@ module Fhcap
 
         def create_records_openshift
           #This is a very basic openshift DNS setup and does not take into account a HA setup or LBs
+          #Setting query to use role (rather than roles) due to known issue with Chef Zero: https://github.com/chef/chef-zero/issues/54
           cluster_config[:environments].each do |env_name, env_cfg|
-            create_records_for_query(env_name, env_cfg, "roles:ose_master_server", [""])
-            create_records_for_query(env_name, env_cfg, "roles:ose_node_server", ["*"]) unless env_cfg[:load_balancers]
+            create_records_for_query(env_name, env_cfg, "role:ose_master_server", [""])
+            create_records_for_query(env_name, env_cfg, "role:ose_node_server", ["*"]) unless env_cfg[:load_balancers]
           end
         end
 
@@ -105,7 +106,7 @@ module Fhcap
                 Dns::CreateRecord.new(@options.dup.merge(dns_record_cfg)).run
               end
             else
-              thor.say "Found query node '#{query_node['name']}', but was unable to retrieve it's IP!!}"
+              thor.say "Found query node '#{query_node['name']}', but was unable to retrieve it's IP!!"
             end
           else
             thor.say "Unable to locate node for query '#{query}' in cluster!!"

data/lib/fhcap/tasks/cluster/create_environment.rb

@@ -160,8 +160,8 @@ module Fhcap
               'mbaas'
             when /ose-single/
               'ose-single'
-            when /ose-multi-node/
-              'ose-multi-node'
+            when /oscp/
+              'oscp'
             when /single/
               'single'
             when /farm/

data/lib/fhcap/tasks/cluster/generate.rb

@@ -113,7 +113,8 @@ module Fhcap
 
         def generate_machine_options
           cluster_config[:machine_options] = cluster_config[:machine_options] || {}
-          cluster_config[:machine_options][:ssh_username] = cluster_config[:provider_config][:ssh_username] || 'ubuntu'
+          default_provider_conf = provider_config(@cluster_config[:provider_id])
+          cluster_config[:machine_options][:ssh_username] = cluster_config[:provider_config][:ssh_username] || default_provider_conf[:ssh_username]
           cluster_config[:machine_options][:convergence_options] = cluster_config[:machine_options][:convergence_options] || {}
           cluster_config[:machine_options][:convergence_options][:chef_version] = "12.6.0"
           cluster_config[:machine_options][:convergence_options][:ssl_verify_mode] = "verify_none"

data/lib/fhcap/tasks/cluster/info.rb

@@ -7,11 +7,12 @@ module Fhcap
     module Cluster
       class Info < ClusterTaskBase
 
-        attr_reader :launch, :cluster_pwds_file, :cluster_passwords
+        attr_reader :launch, :cluster_pwds_file, :cluster_passwords, :format
 
         def initialize(options)
           super
           @launch = options[:launch]
+          @format = options[:format]
           unless @cluster_passwords
             @cluster_passwords = {}
             cluster_environments.each do |env|
@@ -25,14 +26,33 @@ module Fhcap
         end
 
         def run
-          thor.say "Cluster::Info: name = #{@name}", :yellow
-          info_task = Chef::Server::Info.new(@options.dup.merge({:environments => cluster_environments}.merge(chef_task_options)))
-          info_task.run
-          cluster_environments.each do |env|
-            passwords(env) unless options[:only] && options[:only] != 'passwords'
+          suppress_stdout(print_json?) do
+            thor.say "Cluster::Info: name = #{@name}", :yellow
+            @cluster_data = {
+                meta: {
+                    name: @name,
+                    template: cluster_config[:template],
+                    driver: cluster_config[:driver],
+                    domain: cluster_config[:domain],
+                    repo: cluster_config[:repo],
+                    chef_server: cluster_config[:chef_server],
+                    provider_id: cluster_config[:provider_id],
+                    file: cluster_file
+                }
+            }
+
+            unless options[:only] && ([options[:only]] & %w{ips urls passwords}).empty?
+              info_task = Chef::Server::Info.new(@options.dup.merge({:environments => cluster_environments}.merge(chef_task_options)))
+              info_task.run
+              @cluster_data[:environments] = info_task.cluster_data
+              cluster_environments.each do |env|
+                passwords(env, @cluster_data)
+              end unless options[:only] && options[:only] != 'passwords'
+            end
+
           end
 
-          if launch
+          if launch && !print_json?
             info_task.urls.each do |env, urls|
               urls.each do |service, url|
                 service = service.to_s
@@ -50,18 +70,25 @@ module Fhcap
             end
           end
 
+          thor.say JSON.pretty_generate(@cluster_data) if print_json?
         end
 
         private
 
-        def passwords(env)
+        def passwords(env, cluster_data)
           thor.say "[#{env}] Passwords", :green
+          cluster_data[:environments][env][:passwords] = []
           cluster_passwords[env.to_sym].each do |user, pwd|
+            cluster_data[:environments][env][:passwords] << {user => pwd}
             thor.say_status "[#{env}] #{user}:", "#{pwd}", :cyan
           end
         end
 
+        def print_json?
+          @format == 'json'
+        end
+
       end
     end
   end
-end
+end

data/lib/fhcap/tasks/cluster/update_environment_attributes.rb

@@ -0,0 +1,19 @@
+require 'fhcap/tasks/cluster/cluster_task_base'
+require 'fhcap/tasks/chef/environments/update_attributes'
+
+module Fhcap
+  module Tasks
+    module Cluster
+      class UpdateEnvironmentAttributes < ClusterTaskBase
+
+        def run
+          thor.say "Cluster::UpdateEnvironmentAttributes: name = #{name}", :yellow
+          cluster_environments.each() do |environment|
+            Chef::Environments::UpdateAttributes.new(@options.dup.merge({:environment => environment})).run
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/knife/add.rb

@@ -45,7 +45,7 @@ module Fhcap
 
           config[:knife][name.to_sym] = @knife_config
 
-          thor.create_file(config.default_config_file, JSON.pretty_generate(config.data), :force => true)
+          thor.create_file(config.config_file, JSON.pretty_generate(config.data), :force => true)
           config.reload
           create_knife_config
         end

data/lib/fhcap/tasks/knife/remove.rb

@@ -16,7 +16,7 @@ module Fhcap
           thor.say "Knife::Remove: name = #{name}", :yellow
           if thor.yes? "Remove knife #{name}? (y/n)"
             config[:knife].delete(name.to_sym)
-            thor.create_file(config.default_config_file, JSON.pretty_generate(config.data), :force => true)
+            thor.create_file(config.config_file, JSON.pretty_generate(config.data), :force => true)
             config.reload
             if thor.yes?("Remove local knife config? (y/n)")
               remove_knife_config

data/lib/fhcap/tasks/provider/add.rb

@@ -14,6 +14,7 @@ module Fhcap
 
         def initialize(options)
           super
+          @options_provider_config = options[:'provider-config'] || {}
           @name = options[:name]
           @type = options[:type]
           @credentials = options[:credentials] || {}
@@ -34,6 +35,7 @@ module Fhcap
           config[:providers][type.to_sym][name.to_sym] = {} unless config[:providers][type.to_sym][name.to_sym]
 
           @provider_config = config[:providers][type.to_sym][name.to_sym]
+          @provider_config.merge!(@options_provider_config)
           @provider_config[:provides] = [] unless @provider_config[:provides]
           @provider_config[:credentials] = {} unless @provider_config[:credentials]
           @provider_config[:credentials].merge!(credentials)
@@ -47,7 +49,7 @@ module Fhcap
 
           send(:"#{type}_config", @provider_config)
 
-          thor.create_file(config.default_config_file, JSON.pretty_generate(config.data), :force => true)
+          thor.create_file(config.config_file, JSON.pretty_generate(config.data), :force => true)
           config.reload
         end
 

data/lib/fhcap/tasks/provider/remove.rb

@@ -17,7 +17,7 @@ module Fhcap
           thor.say "Provider::Remove: name = #{name}", :yellow
           if thor.yes? "Remove provider #{name}? (y/n)"
             config[:providers][type.to_sym].delete(name.to_sym)
-            thor.create_file(config.default_config_file, JSON.pretty_generate(config.data), :force => true)
+            thor.create_file(config.config_file, JSON.pretty_generate(config.data), :force => true)
             config.reload
           end
         end

data/lib/fhcap/tasks/repo/add.rb

@@ -34,7 +34,7 @@ module Fhcap
           end
 
           config[:repos][name.to_sym] = repo_config
-          thor.create_file(config.default_config_file, JSON.pretty_generate(config.data), :force => true)
+          thor.create_file(config.config_file, JSON.pretty_generate(config.data), :force => true)
           config.reload
           Checkout.new(@options.dup.merge({:repo => name, :'git-ref' => 'master'})).run
           Tasks::Setup.new(@options).run unless @skip_setup

data/lib/fhcap/tasks/repo/checkout.rb

@@ -139,8 +139,9 @@ module Fhcap
               open(filename, 'wb') do |file|
                 file << open(url).read
               end
-              cmd = "tar xf #{filename} -C #{repo_dir}"
+              cmd = "tar xf #{filename} --warning=no-timestamp -C #{repo_dir}"
               run_inside_repo_dir(repo_dir, cmd)
+              run_inside_repo_dir(repo_dir, "rm -f #{filename}")
             end
           end
         end

data/lib/fhcap/tasks/repo/remove.rb

@@ -22,7 +22,7 @@ module Fhcap
               thor.remove_file repo_dir
             end
             config[:repos].delete(name.to_sym)
-            thor.create_file(config.default_config_file, JSON.pretty_generate(config.data), :force => true)
+            thor.create_file(config.config_file, JSON.pretty_generate(config.data), :force => true)
             config.reload
             Tasks::Setup.new(@options).run unless @skip_setup
           end

data/lib/fhcap/tasks/setup.rb

@@ -41,7 +41,7 @@ module Fhcap
       end
 
       def create_fhcap_config
-        thor.create_file(config.default_config_file, JSON.pretty_generate(@fhcap_config))
+        thor.create_file(config.config_file, JSON.pretty_generate(@fhcap_config))
         config.reload
       end
 

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/lib/fhcap.rb

@@ -3,7 +3,7 @@ require "pathname"
 
 module Fhcap
   GEM_DIR = File.expand_path '..', File.dirname(__FILE__)
-  TEMPLATE_NAMES = %w{single core-3node mbaas-3node core-mbaas-6node core-small-9node nginx-test single-blank farm-3node farm-5node farm-single ose-single ose-multi-node}.sort
+  TEMPLATE_NAMES = %w{single core-3node mbaas-3node core-mbaas-6node core-small-9node nginx-test single-blank farm-3node farm-5node farm-single ose-single oscp-5node oscp-7node}.sort
 
   class << self
     def source_root

data/spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb

@@ -29,7 +29,7 @@ describe Fhcap::Tasks::Chef::Cookbook::UpdateArtifact do
 
     describe "#initialize" do
       specify { expect(subject.name).to eq('testname') }
-      specify { expect(subject.cookbook).to eq('testname') }
+      specify { expect(subject.cookbook).to eq(nil) }
       specify { expect(subject.version).to eq('9.9.9') }
       specify { expect(subject.build).to eq('999') }
     end

data/spec/fhcap/tasks/chef/environments/update_attributes_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require "fhcap/tasks/chef/environments/update_attributes"
+
+describe Fhcap::Tasks::Chef::Environments::UpdateAttributes do
+
+  subject {
+    Fhcap::Tasks::Chef::Environments::UpdateAttributes.new(options)
+  }
+
+  let(:thor) do
+    DummyThor.new
+  end
+
+  let(:config) do
+    {}
+  end
+
+  let(:options) do
+    {
+        :config => config,
+        :thor => thor,
+        :environment => 'testenv',
+        :attributes => {:attr1 => 'val1'}
+    }
+  end
+
+  describe "#initialize" do
+    specify { expect(subject.environment).to eq('testenv') }
+    specify { expect(subject.attributes).to eq({:attr1 => 'val1'}) }
+    specify { expect(subject.type).to eq('default') }
+  end
+
+end

data/spec/fhcap/tasks/cluster/update_environment_attributes_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require "fhcap/tasks/cluster/update_environment_attributes"
+
+describe Fhcap::Tasks::Cluster::UpdateEnvironmentAttributes do
+
+  subject {
+    Fhcap::Tasks::Cluster::UpdateEnvironmentAttributes.new(options)
+  }
+
+  let(:thor) do
+    DummyThor.new
+  end
+
+  let(:config) do
+    DummyConfig.new
+  end
+
+  let(:options) do
+    {
+        :config => config,
+        :thor => thor,
+        :name => 'testcluster',
+        :attributes => {},
+        :type => 'default',
+        :'cluster-config' => {
+            :id => 'testcluster',
+            :repo => 'testrepo',
+            :template => 'template',
+            :domain => 'testdomain',
+            :chef_server => 'test',
+            :provider_id => 'test'
+        }
+    }
+  end
+
+  describe "#initialize" do
+    specify { expect(subject.name).to eq(options[:name]) }
+  end
+
+end