mixlib-install 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085161439c62c8a919ce8fd06074c085188d9335
-  data.tar.gz: 0f728caf3f8d6c8ce78dea5e8b627acb95febc05
+  metadata.gz: 8e92952408c7ab6f65b6613a45e2debc1cecc561
+  data.tar.gz: da6e6ae0fff21cf77a0823883f72788a95dc7434
 SHA512:
-  metadata.gz: ebcdac43be5b9a3b0b335d81b77afd8a442309b6c28f95f7db3a1564e5c810809755dce7f25aeff924cac8e2d575d2c73110006f87a77a77991e4ade20e4645c
-  data.tar.gz: 87e953ca7d176419053774b3f3515c161b786dba36442dcd7b7cdad87fb5e337b11177ae0b208e740d5a3d9980f7672aa09678a181caa7ab85e966a7cb8dad79
+  metadata.gz: 210497a42f51a085c00170ad28d77bff5861fbc0c12588ac091fcd7b5268e494b97b792c08f17c1f3bd4f21784420b12e452c9e0a0861b578c13730867364a79
+  data.tar.gz: 8a7b5fe062d3d3f842bbc5e3e031fcb293ca27df61f961d5671ec66bbc56304c6e024128cd62e4f2b398e811974d0009999c251930ba42b2b6f6ac1dc1f3e46d

data/.travis.yml

@@ -14,10 +14,13 @@ addons:
 
 matrix:
   include:
-  - rvm: 2.2.5
-    env: CHEF_ACCEPTANCE=false
-  - rvm: 2.3.0
-    env: CHEF_ACCEPTANCE=true
+  - rvm: 2.2
+  - rvm: 2.3
+    env: SUITE=ubuntu
+  - rvm: 2.3
+    env: SUITE=windows-server-2012r2
+  - rvm: 2.3
+    env: SUITE=windows-nano
 
 before_script:
   - ci/before-script.sh
@@ -34,5 +37,7 @@ env:
     - secure: "b/O77C/ebnrXw/xSTRMcAuhmUz9QH//jfh3XSQrZF2lRJZJbAbfL3L3SPLqQmPkMDJWCAJrs82umQJkZ0RJtSqX5ZzPUqdf2v5O4CyrfMqhQbsEA9GGUlBNaQmSWUHvOCPQZzI5GWMxgQb9Bhl4+ZekUoTgNZBjvh9uAHWuT1c1fNt5pHDYMXg4wyEnyF8tzLRVD5eTJwkKd+BodM1BUvdOITYv2xl6hlg7ZoJbo+onIVc8sRTnEjGiuprhaVyMSeTNSzxa/3jDxeX+HnJ/2HwpenIBXoSskZZViZHMd1Vy2sDUfYPfDjqwr389b8SInCehe1cCD8ouAr/7614IXxwoWSMjrVgkboB+KteRZyz0qVoqCpdS6NX0YBmu5I8T6jHr3OXVwVbcK03FrFhnS2Hg+oLhKLPKMvIFQ5347DEZ1LBv0ol//ltjk/cZX11yLiF2TrrDzSca3jb7kN/LJZ2AbGQdLJnqEhBm4NznHlPYfibLum0QwNXR/lZ47OJjBQnKc9nlN+iEOKbhby6/SCnW30xWJoMfNIULmW79heaNip16wDV0DBu44mmbKcFA6KMrNFex2+QpZGmNwbWJrwnvaJqVc6FNpRtNdShQ/81vJpn5Z6KKz676EHsM6LcXha1WnNj3eLYipWIg+4OSSmHJgRiuNC4JsgsYCaBfrDw8="
     # secret access key
     - secure: "Ut5ARdSnWiFVAtRZ7U+CPgihi59J/KgsMFXunJjBCYyfwaDxrIsAbjddhP3lu2d/xLtvQ26SodhnMh6VMfgBFljY1s4lgjlZU2xU5RCpXFsEhUzHjryVTEgEWYgWkGrTfvalB9gnrsRxiyOh6ZvlW7QoPED+j75FSGwj6rjGCYf/7oUa3Qlt2Pymma5ijjvemgcIEKngO7Dnh3dpFR/J4S0AZdZG6HtJvYpQ2gdvH5faFjYlKHp8W/PMuOuxq2w8Pcjw009VgOjLoFAFYhFWX3hGd0b+N1xBHJDlqaBk2UCCqaKtYrhAsgQNkFiPMmNdDUtscjKx81A8fBUJOUhUxWBFhL3QM2ymuZziPQcnikpi6EPRHRyv3P6MOSyEB2DPpzFq/tEniTBW6o9QL6dHYOaPm/CBtUJ36gEvrSEJQZyhxUTQdamjWIMOTcq1/uwjp0T28rdth0o4BoGALkNQxjaV9iPHBCNtZgPdLoG9v/5CyGwlRQaY6JSVxBHdRcD9+BfwLT84K+68NPo7xXBBar0B1kBOLExI3EHLTxaspkicM2DINicUZk+SNFdInuiByv9NT7sWWbISnk6EagxPxu8D2p1zcMh6cJ8DfFz0rws+ndGiPwInjoslSV7N8Ndi4j9nTKtv9qAImJlthzPDbHY8ghz0TrXWdtwzPet7j2s="
+    # region
+    - secure: "AJSnI8RyC2NKc91+NFerdZibfCCOZ/nfm0SoSCobYbgqB8R4ii1OqHBFaG+HAA4RnxwOoMm/C+lxRkdK6GcztJSzjOx4bTJE8FfFQ1i+LvLRTuQRL1v9iLfJN0O5iJszq4ecm3jSsFYGpCh1z9OCJEnqaEya9ZNfY7U4wpCy4DG6oIUCxKRtXRUaBOqli+6SqeR/CJxp4ws7lzIu5gSWwuWoqTijO3iR3xLT0EIOkguaTfXD3lTzPhfGvV4LMd/Z/cHqxbVnLEpDCaOwiurHQOGvN9RU3vpOhH0d518QqWw0dQdu3o3cAf6wK+TZNdKo2ooDU9JccqcPS5dPiM+doqqEC55Lxfj2l+BMUeyteZt5YdtELDDe49M7gziGSfqNc8bcWFEu5mPpl0jBd4cvp1EiJNlqNK10HAr/jiI/QGSTX0FK+kpWo56E1uWbgxrLZWAnN7g7sE8y80SLE2AlGlb/MzvpNRoJcGjxltxpznbQJ5Q9EUm3vbzCgOMX0BAgeHciwX6CSTrWIciUmbRrXfZ/9NPLrNph6qQ5I3uJ77CvK3pzpUqEt9L0HJ+Wh6ZBxwFsiddtBFNE0lqV6/FkU9ws1ovF5o9jOTE7mzq4ve6GAtqCnIxmHDq/plw0idbmzuHnsehgLD1ZksYl2WIXsWWOApLIH1U+YzGNyGnLqhk="
     # windows admin password
     - secure: "lxe9NYpwV19g2mBa7aQoJX372hktSSn/g5oU1GDWYpi59YwpbYXP/Al/XXwq1ZfNzN+BlXw3tJPlVaEkfSQBi0AaWLJ6Kw5+a4tkIkwMyMPJQh+pKnADZK2pd+Hhrr7CRtnaT6w4V2sZCIfcdlLnKmez/BMNNdBn1+WAfE+aN224JK43rXxgLe4B9CcXCsUUORh6nJbB5f60D15qYokDu7ILi0RufyfyiJulqxIsXVNKtnUXOJRXZvDOPp9Y+2ur0HmVK7aiWr6JwXtODgrrDzZiWq99eR2ErDJB1AFUVMmudUykf5SWyivhvB4RStYDIIpG8EXrIhRKP+k9o4loqQBRcRBGvEMLdyupi7TzuryzK7j2XzhJFD9Eg+50Y5By87lRfvltuAJaDkRPfwIzSbWsh0Lb7YwUXI9a+bJebsteTPSFjb1YOYvkQCV2CB5pH68QInw8Hu9o2hmUkuoNWqqvVaxDI8z3peympfFlVtvTC9eOI60Tdv+pSCyQhBN0/II8FT/fylwQsOL+i8Hez9NIRdaRkx0JEpY56NloErd4An9zpY/xCAa/6JfzMWn7eD673MRVJW0u/j5IGuRAksuUlGZTQS+qudF4ZgVJaacm6qARULaesuCNbufZYtRB0Hg+GINQrUSfYKBw6BZUk2T9ZQ2zFsnF12k0yl9Qr7I="

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [3.1.0]
+- Add support for Windows Nano 2016 (returns appx packages)
+
 ## [3.0.0]
 - [Breaking API Change] `Options` validation added to ensure that when any platform option is set they are all provided (platform, platform_version, architecture)
 - [Breaking API Change] The `platform_version_compatibility_mode` option will automatically be set to `true` when no platform options are provided

data/acceptance/Gemfile

@@ -4,3 +4,5 @@ gem "mixlib-install", path: "../"
 gem "chef"
 gem "chef-acceptance", github: "chef/chef-acceptance"
 gem "inspec"
+gem "aws-sdk"
+gem "winrm"

data/acceptance/ubuntu_install_command/terraform/application.tf

@@ -60,7 +60,7 @@ resource "aws_instance" "mixlib_install_sh" {
     X-Dept        = "EngServ"
     X-Contact     = "pwright"
     X-Production  = "false"
-    X-Environment = "development"
+    X-Environment = "acceptance"
     X-Application = "mixlib-install"
   }
 

data/acceptance/ubuntu_install_sh/terraform/application.tf

@@ -60,7 +60,7 @@ resource "aws_instance" "mixlib_install_sh" {
     X-Dept        = "EngServ"
     X-Contact     = "pwright"
     X-Production  = "false"
-    X-Environment = "development"
+    X-Environment = "acceptance"
     X-Application = "mixlib-install"
   }
 

data/acceptance/windows-nano/.acceptance/acceptance-cookbook/libraries/chef_extentions.rb

@@ -0,0 +1,74 @@
+class Chef
+  class Recipe
+    def run_tf(command)
+      execute "terraform #{command}" do
+        cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+      end
+    end
+  end
+
+  class Resource
+    def instance_ip
+      @instance_ip ||= tf_state["modules"].first["resources"]["aws_instance.windows_server_nano_ami"]["primary"]["attributes"]["public_ip"]
+    end
+
+    def instance_id
+      @instance_id ||= tf_state["modules"].first["resources"]["aws_instance.windows_server_nano_ami"]["primary"]["id"]
+    end
+
+    def windows_password
+      @windows_password ||= begin
+        require "aws-sdk"
+
+        ec2 = Aws::EC2::Resource.new
+        instance = ec2.instance(instance_id)
+        instance.wait_until_running
+
+        # AWS periodically needs more time to retrieve the windows password. Retry.
+        time = 3 * 60 # try up to 3 minutes
+        interval = 5 # every 5 seconds
+        tries = time / interval
+        begin
+          password = instance.decrypt_windows_password("#{ENV['HOME']}/.ssh/es-infrastructure.pem")
+        rescue RuntimeError => e
+          if e.message =~ /password not available yet/
+            unless (tries -= 1).zero?
+              sleep interval
+              retry
+            end
+          else
+            raise e
+          end
+        end
+
+        password
+      end
+    end
+
+    def run_shell(script, type = :powershell)
+      require "winrm"
+
+      opts = { 
+        endpoint: "http://#{instance_ip}:5985/wsman",
+        user: "Administrator",
+        password: windows_password
+      }
+
+      conn = WinRM::Connection.new(opts)
+
+      conn.shell(type) do |shell|
+        output = shell.run(script) do |stdout, stderr|
+          STDOUT.print stdout
+          STDERR.print stderr
+        end
+        Chef::Log.info "The script exited with exit code #{output.exitcode}"
+      end
+    end
+
+    private
+
+    def tf_state
+      @tfstate ||= JSON.parse(::File.read("#{node['chef-acceptance']['suite-dir']}/terraform/terraform.tfstate"))
+    end
+  end
+end

data/acceptance/windows-nano/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -0,0 +1 @@
+run_tf "destroy -force"

data/acceptance/windows-nano/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -0,0 +1,49 @@
+run_tf "plan"
+
+run_tf "apply"
+
+ruby_block "install via winrm api" do
+  block do
+    # We do this hackery to ensure we load mixlib-install from source
+    install_command = "install -project angry-omnibus-toolchain -channel current -version 1.1.57"
+
+    shellout_command = <<-EOF.gsub /^\s*/, ""
+      bundle exec ruby -e "require 'mixlib/install';\
+      puts Mixlib::Install.install_ps1, '#{install_command}'"
+    EOF
+
+    require "mixlib/shellout"
+
+    print_script = Mixlib::ShellOut.new(
+      shellout_command,
+      cwd: node['chef-acceptance']['suite-dir']
+    )
+    print_script.run_command
+
+    run_shell(print_script.stdout)
+  end
+end
+
+ruby_block "set omnibus paths" do
+  block do
+    toolchain_install_dir = File.join('c:', 'opscode', 'angry-omnibus-toolchain')
+
+    omnibus_env = []
+    omnibus_env << File.join(toolchain_install_dir, 'embedded', 'bin')
+    omnibus_env << File.join(toolchain_install_dir, 'embedded', 'bin', 'mingw64', 'bin')
+    omnibus_env << File.join(toolchain_install_dir, 'embedded', 'bin', 'usr', 'bin')
+    omnibus_env << File.join(toolchain_install_dir, 'embedded', 'git', 'cmd')
+    omnibus_env << File.join(toolchain_install_dir, 'embedded', 'git', 'mingw64', 'libexec', 'git-core')
+
+    # Join paths by semi-colons then replace forwardslashes with backslashes
+    omnibus_path = omnibus_env.join(";").gsub("/", "\\")
+
+    # Permanently set omnibus path to machine PATH
+    script = <<-EOF.gsub /^\s*/, ""
+      $env:path += ';#{omnibus_path}'
+      setx PATH $env:path /M
+    EOF
+
+    run_shell(script)
+  end
+end

data/acceptance/windows-nano/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -0,0 +1,9 @@
+execute "run inspec" do
+  command lazy { "inspec exec verify.rb -t winrm://Administrator@#{instance_ip} --password $WINDOWS_PASSWORD" }
+  cwd "#{node['chef-acceptance']['suite-dir']}/inspec"
+  environment(
+    lazy {
+      { "WINDOWS_PASSWORD" => windows_password }
+    }
+  )
+end

data/acceptance/windows-nano/inspec/verify.rb

@@ -0,0 +1,11 @@
+describe command("git --version") do
+  its("stdout") { should match "git version" }
+end
+
+describe command("ruby --version") do
+  its("stdout") { should match "ruby.*[x64-mingw32]" }
+end
+
+describe command("gcc --version") do
+  its("stdout") { should match "gcc.exe" }
+end

data/acceptance/windows-nano/terraform/application.tf

@@ -0,0 +1,59 @@
+data "aws_ami" "windows_ami" {
+  most_recent = true
+
+  filter {
+    name   = "owner-alias"
+    values = ["amazon"]
+  }
+
+  filter {
+    name   = "name"
+    values = ["Windows_Server-2016-English-Nano-Base-*"]
+  }
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "block-device-mapping.volume-type"
+    values = ["gp2"]
+  }
+
+  filter {
+    name   = "image-type"
+    values = ["machine"]
+  }
+}
+
+resource "aws_instance" "windows_server_nano_ami" {
+  count = 1
+
+  ami           = "${data.aws_ami.windows_ami.id}"
+  instance_type = "${var.aws_instance_type}"
+  key_name      = "es-infrastructure"
+
+  associate_public_ip_address = true
+
+  subnet_id         = "subnet-11ac0174" # Planet Releng Public Subnet
+  source_dest_check = false
+
+  vpc_security_group_ids = [
+    "sg-96274af3",
+  ]
+
+  tags {
+    # ChefOps's AWS standard tags:
+    X-Dept        = "EngServ"
+    X-Contact     = "pwright"
+    X-Production  = "false"
+    X-Environment = "acceptance"
+    X-Application = "mixlib-install"
+  }
+}

data/acceptance/windows-nano/terraform/variables.tf

@@ -0,0 +1,10 @@
+# Region to create infrastructure in
+variable "aws_region" {
+  type    = "string"
+  default = "us-west-2"
+}
+
+variable "aws_instance_type" {
+  type    = "string"
+  default = "t2.micro"
+}

data/acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/.gitignore

@@ -0,0 +1,2 @@
+nodes/
+tmp/

data/acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/metadata.rb

@@ -0,0 +1,2 @@
+name 'acceptance-cookbook'
+

data/acceptance/{powershell_install_ps1 → windows-server-2012r2}/terraform/application.tf

@@ -72,7 +72,7 @@ EOF
     X-Dept        = "EngServ"
     X-Contact     = "pwright"
     X-Production  = "false"
-    X-Environment = "development"
+    X-Environment = "acceptance"
     X-Application = "mixlib-install"
   }
 

data/acceptance/windows-server-2012r2/terraform/aws.tf

@@ -0,0 +1,8 @@
+# Restrict operation of terraform to chef-es profile so that
+# we do not create resources in other aws profiles.
+# We assume user has configured standard aws credentials
+# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
+provider "aws" {
+  region  = "${var.aws_region}"
+  profile = "chef-aws"
+}

data/ci/before-script.sh

@@ -3,7 +3,7 @@
 set -evx
 
 # Don't run acceptance tests on forks. The decryption keys are not available.
-if [ "${CHEF_ACCEPTANCE}" = "true" ] && [[ $encrypted_e2edbb28e76c_key ]]; then
+if [[ $SUITE ]] && [[ $encrypted_e2edbb28e76c_key ]]; then
 
   # download terraform
   wget "https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip" -O tf.zip

data/ci/run-acceptance-tests.sh

@@ -3,11 +3,11 @@
 set -evx
 
 # Don't run acceptance tests on forks. The decryption keys are not available.
-if [ "${CHEF_ACCEPTANCE}" = "true" ] && [[ $encrypted_e2edbb28e76c_key ]]; then
+if [[ $SUITE ]] && [[ $encrypted_e2edbb28e76c_key ]]; then
   # setup acceptance tests
   cd acceptance
   export BUNDLE_GEMFILE=$PWD/Gemfile
   bundle install
   # run acceptances tests and force cleanup
-  bundle exec chef-acceptance test --force-destroy
+  bundle exec chef-acceptance test $SUITE --force-destroy
 fi

data/lib/mixlib/install/artifact_info.rb

@@ -76,6 +76,10 @@ module Mixlib
       def clone_with(data)
         ArtifactInfo.new(self.to_hash.merge(data))
       end
+
+      def appx_artifact?
+        url.end_with?(".appx")
+      end
     end
   end
 end

data/lib/mixlib/install/backend/base.rb

@@ -26,8 +26,6 @@ module Mixlib
       class Base
         attr_reader :options
 
-        SUPPORTED_WINDOWS_DESKTOP_VERSIONS = %w{7 8 8.1 10}
-
         def initialize(options)
           @options = options
         end
@@ -123,14 +121,14 @@ module Mixlib
             return closest_compatible_artifact
           end
 
-           # Return an exception if we get to the end of the method
+          # Return an exception if we get to the end of the method
           raise ArtifactsNotFound, <<-EOF
 No artifacts found matching criteria.
   product name: #{options.product_name}
   channel: #{options.channel}
   version: #{options.product_version}
   platform: #{options.platform}
-  platform version: #{options.platform_version}
+  platform version: #{options.original_platform_version}
   architecture: #{options.architecture}
   compatibility mode: #{options.platform_version_compatibility_mode}
 EOF
@@ -146,6 +144,15 @@ EOF
           new_artifacts = [ ]
           native_artifacts = [ ]
 
+          # We only return appx packages when a nano platform version is requested.
+          if options.class::SUPPORTED_WINDOWS_NANO_VERSIONS.include?(options.original_platform_version)
+            return artifacts.find_all { |a| a.appx_artifact? }
+
+          # Otherwise, we only return msi artifacts and remove all appx packages
+          else
+            artifacts.delete_if { |a| a.appx_artifact? }
+          end
+
           artifacts.each do |r|
             next if r.platform != "windows"
 
@@ -241,7 +248,7 @@ EOF
         # See https://docs.chef.io/platforms.html
         #
         def map_custom_windows_desktop_versions(desktop_version)
-          server_version = Util.map_windows_desktop_version(desktop_version)
+          server_version = Util.map_windows_version(desktop_version)
 
           # Windows desktop 10 officially maps to server 2016.
           # However, we don't test on server 2016 at this time, so we default to 2012r2
@@ -255,7 +262,7 @@ EOF
         # options hash allows overriding any valid attribute
         #
         def clone_windows_desktop_artifacts(base_artifact, options = {})
-          SUPPORTED_WINDOWS_DESKTOP_VERSIONS.collect do |dv|
+          @options.class::SUPPORTED_WINDOWS_DESKTOP_VERSIONS.collect do |dv|
             options[:platform_version] = dv
             options[:url] = base_artifact.url.gsub("\/#{base_artifact.platform_version}\/", "\/#{map_custom_windows_desktop_versions(dv)}\/")
 

data/lib/mixlib/install/options.rb

@@ -25,7 +25,7 @@ module Mixlib
     class Options
       class InvalidOptions < ArgumentError; end
 
-      attr_reader :options, :errors
+      attr_reader :options, :errors, :original_platform_version
 
       SUPPORTED_ARCHITECTURES = %w{
         i386
@@ -62,13 +62,20 @@ module Mixlib
         :user_agent_headers,
       ]
 
+      SUPPORTED_WINDOWS_DESKTOP_VERSIONS = %w{7 8 8.1 10}
+
+      SUPPORTED_WINDOWS_NANO_VERSIONS = %w{2016nano}
+
       def initialize(options)
         @options = options
         @errors = []
 
+        # Store original platform version in cases where we must remap it
+        @original_platform_version = options[:platform_version]
+
         resolve_platform_version_compatibility_mode!
 
-        map_windows_desktop_versions! if for_windows?
+        map_windows_versions!
 
         validate!
       end
@@ -213,8 +220,10 @@ Must provide platform, platform version and architecture when specifying any pla
         end
       end
 
-      def map_windows_desktop_versions!
-        options[:platform_version] = Util.map_windows_desktop_version(platform_version)
+      def map_windows_versions!
+        return unless for_windows?
+
+        options[:platform_version] = Util.map_windows_version(platform_version)
       end
 
       def all_or_none?(items)

data/lib/mixlib/install/util.rb

@@ -130,13 +130,13 @@ module Mixlib
           user_agents.flatten.compact.uniq.join(" ")
         end
 
-        def map_windows_desktop_version(version)
+        def map_windows_version(version)
           # This logic does not try to compare and determine proper versions based on conditions or ranges.
           # These are here to improve UX for desktop versions.
           case version
           when /^10/
             "2016"
-          when /^6.3/, /^8.1/
+          when /^6.3/, /^8.1/, /2016nano/
             "2012r2"
           when /^6.2/, /^8/
             "2012"

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -216,15 +216,6 @@ files:
 - acceptance/.gitignore
 - acceptance/Gemfile
 - acceptance/README.md
-- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/.gitignore
-- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/metadata.rb
-- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/recipes/destroy.rb
-- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/recipes/provision.rb
-- acceptance/powershell_install_ps1/.acceptance/acceptance-cookbook/recipes/verify.rb
-- acceptance/powershell_install_ps1/inspec/verify.rb
-- acceptance/powershell_install_ps1/terraform/application.tf
-- acceptance/powershell_install_ps1/terraform/aws.tf
-- acceptance/powershell_install_ps1/terraform/variables.tf
 - acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -243,6 +234,25 @@ files:
 - acceptance/ubuntu_install_sh/terraform/application.tf
 - acceptance/ubuntu_install_sh/terraform/aws.tf
 - acceptance/ubuntu_install_sh/terraform/variables.tf
+- acceptance/windows-nano/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/windows-nano/.acceptance/acceptance-cookbook/libraries/chef_extentions.rb
+- acceptance/windows-nano/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/windows-nano/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/windows-nano/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/windows-nano/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/windows-nano/inspec/verify.rb
+- acceptance/windows-nano/terraform/application.tf
+- acceptance/windows-nano/terraform/aws.tf
+- acceptance/windows-nano/terraform/variables.tf
+- acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/windows-server-2012r2/inspec/verify.rb
+- acceptance/windows-server-2012r2/terraform/application.tf
+- acceptance/windows-server-2012r2/terraform/aws.tf
+- acceptance/windows-server-2012r2/terraform/variables.tf
 - bin/mixlib-install
 - ci/before-script.sh
 - ci/es-infrastructure.pem.enc