formatron 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549a567b83515e35a2ea69ed7c8b3ab8cc820382
-  data.tar.gz: dcd7078bac7e6e134de753a65129a261afa672d2
+  metadata.gz: 932f38c884b67c73450aa6842772390de1db150f
+  data.tar.gz: 7e70e25c5de6024938501fc0935c33c392546bc0
 SHA512:
-  metadata.gz: e820a4d7134921c97fb114146134e1ecb0c13765ac0f21e1d028a546414a12ccd3693722ff0df140282b49dc6ba6e716692aac9b431d08ae000f1abe8d729b59
-  data.tar.gz: 30addbe444dde872d6f4b54ca32806f39e95891010c9a00fd213d3e5b70a86355b234c58fbedc4cfc392c7c0f1856006d87584fecba4561ecc8b0c5a7d3936fb
+  metadata.gz: 9c1d72b86843a572767eadc0607cc3a8b8275d392b3ad73902186313c04809446dde1ba7bd13c2ea74b2f8b3a371014a2b95c1956a5e98da8b5fb099a7dca76e
+  data.tar.gz: 69abb715018d08008170e6192499695561dc8532c00dd5f2aed3283e989538aed49bd3d43d5fbaaa6f71087c20292fd6080d25f7b9185451d242424a3fb1c29d

data/formatron.gemspec

@@ -38,7 +38,6 @@ EOH
   spec.add_development_dependency 'pry-remote', '~> 0.1'
   spec.add_development_dependency 'pry-nav', '~> 0.2'
   spec.add_development_dependency 'coveralls', '~> 0.8'
-  spec.add_development_dependency 'codacy-coverage', '~> 0.3'
   spec.add_development_dependency 'rubocop', '0.33'
   spec.add_development_dependency 'guard-livereload', '~> 2.4'
   spec.add_development_dependency 'guard-rake', '~> 1.0'
@@ -50,5 +49,7 @@ EOH
   spec.add_runtime_dependency 'deep_merge', '~> 1.0'
   spec.add_runtime_dependency 'berkshelf', '~> 4.0'
   spec.add_runtime_dependency 'chef', '~> 12.5'
+  spec.add_runtime_dependency 'knife-windows', '~> 1.3'
   spec.add_runtime_dependency 'net-ssh', '~> 2.9'
+  spec.add_runtime_dependency 'winrm', '~> 1.7'
 end

data/lib/formatron.rb

@@ -17,12 +17,14 @@ require 'formatron/external'
 # rubocop:disable Metrics/ClassLength
 class Formatron
   FORMATRONFILE = 'Formatronfile'
+  WORKING_DIRECTORY = '.formatron'
 
   attr_reader :protected
   alias_method :protected?, :protected
 
   # rubocop:disable Metrics/MethodLength
   def initialize(credentials:, directory:, target:)
+    @working_directory = File.join directory, WORKING_DIRECTORY, target
     @target = target
     @aws = AWS.new credentials: credentials
     @config = Config.target(
@@ -59,9 +61,17 @@ class Formatron
     external_global = external_formatron.global
     global = @formatron.global || external_global
     external_ec2 = external_global.ec2
+    external_windows = external_global.windows
     ec2 = global.ec2 || external_ec2
     key_pair = ec2.key_pair || external_ec2.key_pair
     @ec2_key = ec2.private_key || external_ec2.private_key
+    windows = global.windows || external_windows
+    @administrator_name =
+      windows.administrator_name ||
+      external_windows.administrator_name
+    @administrator_password =
+      windows.administrator_password ||
+      external_windows.administrator_password
     @protected = global.protect || external_global.protect
     @kms_key = global.kms_key || external_global.kms_key
     @databag_secret = global.databag_secret || external_global.databag_secret
@@ -73,6 +83,8 @@ class Formatron
       formatron: @formatron,
       hosted_zone_name: @hosted_zone_name,
       key_pair: key_pair,
+      administrator_name: @administrator_name,
+      administrator_password: @administrator_password,
       kms_key: @kms_key,
       hosted_zone_id: hosted_zone_id,
       target: @target,
@@ -91,11 +103,14 @@ class Formatron
     @chef_clients = {}
     @vpcs.each do |key, vpc|
       @chef_clients[key] = ChefClients.new(
+        directory: @working_directory,
         aws: @aws,
         bucket: @bucket,
         name: @name,
         target: @target,
         ec2_key: @ec2_key,
+        administrator_name: @administrator_name,
+        administrator_password: @administrator_password,
         hosted_zone_name: @hosted_zone_name,
         vpc: vpc,
         external: @external_vpcs[key],
@@ -160,29 +175,31 @@ class Formatron
     chef_clients.init
     instances.values.each do |instance|
       guid = instance.guid
+      os = instance.os
       next unless guid_filter.nil? || guid_filter.eql?(guid)
       dsl_chef = instance.chef
-      next if dsl_chef.nil?
+      next if dsl_chef.cookbook.nil?
       chef = chef_clients.get dsl_chef.server
       cookbook = dsl_chef.cookbook
       bastion = dsl_chef.bastion
       sub_domain = instance.sub_domain
-      _provision_instance chef, cookbook, sub_domain, guid, bastion
+      _provision_instance chef, cookbook, sub_domain, guid, bastion, os
     end
-  ensure
-    chef_clients.unlink
   end
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
-  def _provision_instance(chef, cookbook, sub_domain, guid, bastion)
+  # rubocop:disable Metrics/ParameterLists
+  def _provision_instance(chef, cookbook, sub_domain, guid, bastion, os)
     chef.provision(
+      os: os,
       sub_domain: sub_domain,
       guid: guid,
       cookbook: cookbook,
       bastion: bastion
     )
   end
+  # rubocop:enable Metrics/ParameterLists
 
   def destroy
     _destroy_chef_instances
@@ -319,21 +336,17 @@ class Formatron
     end
   end
 
-  # rubocop:disable Metrics/MethodLength
   def _destroy_chef_vpc_instances(key, instances)
     chef_clients = @chef_clients[key]
     chef_clients.init
     instances.values.each do |instance|
       dsl_chef = instance.chef
-      next if dsl_chef.nil?
+      next if dsl_chef.cookbook.nil?
       chef = chef_clients.get dsl_chef.server
       guid = instance.guid
       _destroy_chef_instance chef, guid
     end
-  ensure
-    chef_clients.unlink
   end
-  # rubocop:enable Metrics/MethodLength
 
   def _destroy_chef_instance(chef, guid)
     chef.destroy(

data/lib/formatron/aws.rb

@@ -9,31 +9,44 @@ class Formatron
 
     REGIONS = {
       'us-east-1' => {
-        ami: 'ami-ff02509a'
-      },
-      'us-west-2' => {
-        ami: 'ami-8ee605bd'
+        'ubuntu' => 'ami-fce3c696',
+        'windows' => 'ami-3586ac5f'
       },
       'us-west-1' => {
-        ami: 'ami-198a495d'
+        'ubuntu' => 'ami-06116566',
+        'windows' => 'ami-95fd8bf5'
+      },
+      'us-west-2' => {
+        'ubuntu' => 'ami-9abea4fb',
+        'windows' => 'ami-df8767bf'
       },
       'eu-west-1' => {
-        ami: 'ami-37360a40'
+        'ubuntu' => 'ami-f95ef58a',
+        'windows' => 'ami-8519a9f6'
       },
       'eu-central-1' => {
-        ami: 'ami-46272b5b'
+        'ubuntu' => 'ami-87564feb',
+        'windows' => 'ami-5dd2c931'
+      },
+      'ap-northeast-1' => {
+        'ubuntu' => 'ami-a21529cc',
+        'windows' => 'ami-14b8bc7a'
+      },
+      'ap-northeast-2' => {
+        'ubuntu' => 'ami-09dc1267',
+        'windows' => 'ami-d31dd3bd'
       },
       'ap-southeast-1' => {
-        ami: 'ami-42170410'
+        'ubuntu' => 'ami-25c00c46',
+        'windows' => 'ami-9801cffb'
       },
       'ap-southeast-2' => {
-        ami: 'ami-6d6c2657'
-      },
-      'ap-northeast-1' => {
-        ami: 'ami-402e4c40'
+        'ubuntu' => 'ami-6c14310f',
+        'windows' => 'ami-db0a2db8'
       },
       'sa-east-1' => {
-        ami: 'ami-1f4bda02'
+        'ubuntu' => 'ami-0fb83963',
+        'windows' => 'ami-828e0dee'
       }
     }
 

data/lib/formatron/chef.rb

@@ -4,6 +4,7 @@ require_relative 'chef/keys'
 require_relative 'chef/berkshelf'
 require_relative 'chef/knife'
 require_relative 'chef/ssh'
+require_relative 'chef/winrm'
 
 class Formatron
   # manage the instance provisioning with Chef
@@ -11,12 +12,16 @@ class Formatron
   class Chef
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable Metrics/AbcSize
     def initialize(
+      directory:,
       aws:,
       bucket:,
       name:,
       target:,
       ec2_key:,
+      administrator_name:,
+      administrator_password:,
       username:,
       organization:,
       ssl_verify:,
@@ -28,6 +33,7 @@ class Formatron
       configuration:,
       databag_secret:
     )
+      @working_directory = File.join directory, guid
       @aws = aws
       @name = name
       @target = target
@@ -38,6 +44,7 @@ class Formatron
       @bastions = bastions
       chef_server_url = _chef_server_url
       @keys = Keys.new(
+        directory: @working_directory,
         aws: @aws,
         bucket: bucket,
         name: server_stack,
@@ -46,7 +53,10 @@ class Formatron
         ec2_key: ec2_key
       )
       @knife = Knife.new(
+        directory: @working_directory,
         keys: @keys,
+        administrator_name: administrator_name,
+        administrator_password: administrator_password,
         chef_server_url: chef_server_url,
         username: username,
         organization: organization,
@@ -55,6 +65,7 @@ class Formatron
         configuration: configuration
       )
       @berkshelf = Berkshelf.new(
+        directory: @working_directory,
         keys: @keys,
         chef_server_url: chef_server_url,
         username: username,
@@ -63,7 +74,12 @@ class Formatron
       @ssh = SSH.new(
         keys: @keys
       )
+      @winrm = WinRM.new(
+        administrator_name: administrator_name,
+        administrator_password: administrator_password
+      )
     end
+    # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/ParameterLists
     # rubocop:enable Metrics/MethodLength
 
@@ -73,6 +89,7 @@ class Formatron
         name: @server_stack,
         target: @target
       )
+      FileUtils.mkdir_p @working_directory
       @keys.init
       @knife.init
       @berkshelf.init
@@ -81,6 +98,7 @@ class Formatron
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/AbcSize
     def provision(
+      os:,
       sub_domain:,
       guid:,
       cookbook:,
@@ -113,6 +131,7 @@ class Formatron
       @berkshelf.upload environment: guid, cookbook: cookbook
       if @knife.node_exists? guid: guid
         _reprovision_node(
+          os: os,
           bastion_hostname: bastion_hostname,
           guid: guid,
           cookbook_name: cookbook_name,
@@ -120,6 +139,7 @@ class Formatron
         )
       else
         _bootstrap_node(
+          os: os,
           bastion_hostname: bastion_hostname,
           guid: guid,
           cookbook_name: cookbook_name,
@@ -132,19 +152,22 @@ class Formatron
 
     # rubocop:disable Metrics/MethodLength
     def _reprovision_node(
+      os:,
       bastion_hostname:,
       guid:,
       cookbook_name:,
       hostname:
     )
-      if @ssh.bootstrapped?(
+      if _bootstrapped?(
+        os: os,
         bastion_hostname: bastion_hostname,
         hostname: hostname
       )
         Formatron::LOG.info do
           "Run chef-client on existing node #{guid}"
         end
-        @ssh.run_chef_client(
+        _run_chef_client(
+          os: os,
           bastion_hostname: bastion_hostname,
           hostname: hostname
         )
@@ -162,6 +185,7 @@ class Formatron
         end
         @knife.delete_client client: guid
         _bootstrap_node(
+          os: os,
           bastion_hostname: bastion_hostname,
           guid: guid,
           cookbook_name: cookbook_name,
@@ -171,8 +195,31 @@ class Formatron
     end
     # rubocop:enable Metrics/MethodLength
 
+    def _bootstrapped?(os:, bastion_hostname:, hostname:)
+      if os.eql? 'windows'
+        @winrm.bootstrapped? hostname: hostname
+      else
+        @ssh.bootstrapped?(
+          bastion_hostname: bastion_hostname,
+          hostname: hostname
+        )
+      end
+    end
+
+    def _run_chef_client(os:, bastion_hostname:, hostname:)
+      if os.eql? 'windows'
+        @winrm.run_chef_client hostname: hostname
+      else
+        @ssh.run_chef_client(
+          bastion_hostname: bastion_hostname,
+          hostname: hostname
+        )
+      end
+    end
+
     # rubocop:disable Metrics/MethodLength
     def _bootstrap_node(
+      os:,
       bastion_hostname:,
       guid:,
       cookbook_name:,
@@ -182,6 +229,7 @@ class Formatron
         "Bootstrap node #{guid}"
       end
       @knife.bootstrap(
+        os: os,
         bastion_hostname: bastion_hostname,
         guid: guid,
         cookbook: cookbook_name,
@@ -214,12 +262,6 @@ class Formatron
     end
     # rubocop:enable Metrics/MethodLength
 
-    def unlink
-      @keys.unlink
-      @knife.unlink
-      @berkshelf.unlink
-    end
-
     def _chef_server_url
       "https://#{@chef_sub_domain}.#{@hosted_zone_name}" \
       "/organizations/#{@organization}"
@@ -233,7 +275,9 @@ class Formatron
       :_chef_server_url,
       :_hostname,
       :_bootstrap_node,
-      :_reprovision_node
+      :_reprovision_node,
+      :_bootstrapped?,
+      :_run_chef_client
     )
   end
   # rubocop:enable Metrics/ClassLength

data/lib/formatron/chef/berkshelf.rb

@@ -17,39 +17,43 @@ class Formatron
           }
         }
       EOH
+      CONFIG_FILE = 'berkshelf.json'
 
-      def initialize(keys:, chef_server_url:, username:, ssl_verify:)
+      # rubocop:disable Metrics/MethodLength
+      def initialize(
+        directory:,
+        keys:,
+        chef_server_url:,
+        username:,
+        ssl_verify:
+      )
+        @config_file = File.join directory, CONFIG_FILE
         @keys = keys
         @chef_server_url = chef_server_url
         @username = username
         @ssl_verify = ssl_verify
       end
+      # rubocop:enable Metrics/MethodLength
 
       def init
-        @config_file = Tempfile.new 'formatron-berkshelf-'
-        @config_file.write CONFIG_FILE_CONTENTS % {
+        File.write(@config_file, CONFIG_FILE_CONTENTS % {
           server_url: @chef_server_url,
           user: @username,
           key_file: @keys.user_key,
           ssl_verify: @ssl_verify
-        }
-        @config_file.close
+        })
       end
 
       def upload(cookbook:, environment:)
         # rubocop:disable Metrics/LineLength
         command = "berks install -b #{File.join(cookbook, 'Berksfile')}"
         fail "failed to download cookbooks for opscode environment: #{environment}" unless Util::Shell.exec command
-        command = "berks upload -c #{@config_file.path} -b #{File.join(cookbook, 'Berksfile')}"
+        command = "berks upload -c #{@config_file} -b #{File.join(cookbook, 'Berksfile')}"
         fail "failed to upload cookbooks for opscode environment: #{environment}" unless Util::Shell.exec command
-        command = "berks apply #{environment} -c #{@config_file.path} -b #{File.join(cookbook, 'Berksfile.lock')}"
+        command = "berks apply #{environment} -c #{@config_file} -b #{File.join(cookbook, 'Berksfile.lock')}"
         fail "failed to apply cookbooks to opscode environment: #{environment}" unless Util::Shell.exec command
         # rubocop:enable Metrics/LineLength
       end
-
-      def unlink
-        @config_file.unlink unless @config_file.nil?
-      end
     end
   end
 end