formatron 0.1.14 → 0.1.15

data/lib/formatron/cloud_formation/template/vpc/subnet/nat.rb

@@ -15,6 +15,8 @@ class Formatron
             def initialize(
               nat:,
               key_pair:,
+              administrator_name:,
+              administrator_password:,
               availability_zone:,
               subnet_guid:,
               hosted_zone_name:,
@@ -34,11 +36,14 @@ class Formatron
               @instance_id = "#{Instance::INSTANCE_PREFIX}#{guid}"
               @route_table_id = "#{ROUTE_TABLE_PREFIX}#{guid}"
               @route_id = "#{ROUTE_PREFIX}#{guid}"
+              _set_os
               _add_setup_script
               _set_source_dest_check
               @instance = Instance.new(
                 instance: nat,
                 key_pair: key_pair,
+                administrator_name: administrator_name,
+                administrator_password: administrator_password,
                 availability_zone: availability_zone,
                 subnet_guid: subnet_guid,
                 hosted_zone_name: hosted_zone_name,
@@ -55,6 +60,12 @@ class Formatron
             # rubocop:enable Metrics/ParameterLists
             # rubocop:enable Metrics/MethodLength
 
+            def _set_os
+              @nat.os(
+                'ubuntu'
+              )
+            end
+
             def _add_setup_script
               @nat.setup do |setup|
                 scripts = setup.script
@@ -82,6 +93,7 @@ class Formatron
             end
 
             private(
+              :_set_os,
               :_set_source_dest_check,
               :_add_setup_script,
               :_add_route_table

data/lib/formatron/dsl/formatron/global.rb

@@ -1,5 +1,6 @@
 require 'formatron/util/dsl'
 require_relative 'global/ec2'
+require_relative 'global/windows'
 
 class Formatron
   class DSL
@@ -18,6 +19,7 @@ class Formatron
         dsl_property :kms_key
         dsl_property :databag_secret
         dsl_block :ec2, 'EC2'
+        dsl_block :windows, 'Windows'
 
         def hosted_zone_id(value = nil)
           unless value.nil?

data/lib/formatron/dsl/formatron/global/windows.rb

@@ -0,0 +1,17 @@
+require 'formatron/util/dsl'
+
+class Formatron
+  class DSL
+    class Formatron
+      class Global
+        # Windows authentication parameters
+        class Windows
+          extend Util::DSL
+          dsl_initialize_block
+          dsl_property :administrator_name
+          dsl_property :administrator_password
+        end
+      end
+    end
+  end
+end

data/lib/formatron/dsl/formatron/vpc/subnet/instance.rb

@@ -21,6 +21,7 @@ class Formatron
             dsl_array :private_alias
             dsl_property :source_dest_check
             dsl_property :instance_type
+            dsl_property :os
             dsl_block :chef, 'Chef'
             dsl_block :policy, 'Policy'
             dsl_block :security_group, 'SecurityGroup'

data/lib/formatron/external/dsl.rb

@@ -35,6 +35,15 @@ class Formatron
               new_ec2['private_key']
             ) unless new_ec2['private_key'].nil?
           end unless new_ec2.nil?
+          new_windows = new_global['windows']
+          global.windows do |windows|
+            windows.administrator_name(
+              new_windows['administrator_name']
+            ) unless new_windows['administrator_name'].nil?
+            windows.administrator_password(
+              new_windows['administrator_password']
+            ) unless new_windows['administrator_password'].nil?
+          end unless new_windows.nil?
         end unless new_global.nil?
         new_vpcs = configuration['vpcs']
         new_vpcs.each do |vpc_key, new_vpc|
@@ -116,6 +125,16 @@ class Formatron
             configuration_ec2['private_key'] =
               ec2.private_key unless ec2.private_key.nil?
           end
+          windows = global.windows
+          unless windows.nil?
+            configuration_windows = configuration_global['windows'] = {}
+            configuration_windows['administrator_name'] =
+              windows.administrator_name unless windows.administrator_name.nil?
+            # rubocop:disable Metrics/LineLength
+            configuration_windows['administrator_password'] =
+              windows.administrator_password unless windows.administrator_password.nil?
+            # rubocop:enable Metrics/LineLength
+          end
         end
         vpcs.each do |vpc_key, vpc|
           vpc_configuration = configuration['vpcs'][vpc_key] = {

data/lib/formatron/util/winrm.rb

@@ -0,0 +1,40 @@
+require 'winrm'
+require 'formatron/logger'
+
+class Formatron
+  module Util
+    # Perform commands on chef nodes over WinRM
+    class WinRM
+      # rubocop:disable Metrics/MethodLength
+      def self.exec(
+        hostname:,
+        administrator_name:,
+        administrator_password:,
+        command:
+      )
+        endpoint = "http://#{hostname}:5985/wsman"
+        winrm = ::WinRM::WinRMWebService.new(
+          endpoint,
+          :negotiate,
+          user: administrator_name,
+          pass: administrator_password
+        )
+        output = winrm.create_executor do |executor|
+          executor.run_powershell_script(command) do |stdout, stderr|
+            stdout.each_line do |line|
+              Formatron::LOG.info { line.chomp }
+            end unless stdout.nil?
+            stderr.each_line do |line|
+              Formatron::LOG.warn { line.chomp }
+            end unless stderr.nil?
+          end
+        end
+        exitcode = output[:exitcode]
+        fail(
+          "`#{command}` exited with code #{exitcode}"
+        ) unless exitcode == 0
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Peter Halliday
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: codacy-coverage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.5'
+- !ruby/object:Gem::Dependency
+  name: knife-windows
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: |
   AWS/Chef deployment tool based around Chef Server and AWS CloudFormation
 email:
@@ -337,6 +351,7 @@ files:
 - lib/formatron/chef/keys.rb
 - lib/formatron/chef/knife.rb
 - lib/formatron/chef/ssh.rb
+- lib/formatron/chef/winrm.rb
 - lib/formatron/chef_clients.rb
 - lib/formatron/cli.rb
 - lib/formatron/cli/completion.rb
@@ -375,6 +390,7 @@ files:
 - lib/formatron/dsl/formatron.rb
 - lib/formatron/dsl/formatron/global.rb
 - lib/formatron/dsl/formatron/global/ec2.rb
+- lib/formatron/dsl/formatron/global/windows.rb
 - lib/formatron/dsl/formatron/vpc.rb
 - lib/formatron/dsl/formatron/vpc/subnet.rb
 - lib/formatron/dsl/formatron/vpc/subnet/acl.rb
@@ -417,6 +433,7 @@ files:
 - lib/formatron/util/shell.rb
 - lib/formatron/util/ssh.rb
 - lib/formatron/util/vpc.rb
+- lib/formatron/util/winrm.rb
 - lib/formatron/version.rb
 - support/cloudformation_describe_stacks_response.rb
 - support/cloudformation_stack_events_responses.rb