(SIMP-8382) Confine tmp_mounts on directories (#231)

* Fix confines for tmp_mounts fact
* Fix simplib__mountpoints fact (again)
  * The main facter 'mountpoints' fact does not correctly pick up all
    options, so we now use our collected options in all cases.
  * Added a windows test to ensure that we don't break windows (again)
    moving forward

SIMP-8382 #close

Author: trevor-vaughan

.gitlab-ci.yml

@@ -408,3 +408,9 @@ pup6.16.0-oel-fips:
   <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3
   script:
     - 'BEAKER_fips=yes bundle exec rake beaker:suites[default,oel]'
+
+pup6.16.0-win:
+  <<: *acceptance_base
+  <<: *pup_6_16_0
+  script:
+    - 'bundle exec rake beaker:suites[windows,default]'

Gemfile

@@ -34,6 +34,7 @@ end
 group :system_tests do
   gem 'beaker'
   gem 'beaker-rspec'
+  gem 'beaker-windows'
   gem 'simp-beaker-helpers', ENV['SIMP_BEAKER_HELPERS_VERSION'] || ['>= 1.18.7', '< 2']
 end
 

lib/facter/simplib__mountpoints.rb

@@ -39,10 +39,10 @@
 require 'facter'
 
 Facter.add('simplib__mountpoints') do
-  setcode do
-    confine :kernel => :Linux
-    confine { File.exist?('/proc/mounts') }
+  confine :kernel => :Linux
+  confine { File.exist?('/proc/mounts') }
 
+  setcode do
     target_dirs = ['/tmp', '/var/tmp', '/dev/shm', '/proc']
 
     # Holder of the multi-call content
@@ -60,12 +60,23 @@
 
       next unless target_dirs.include?(path)
 
-      mount_list[path] = (facter_mountpoints[path] || {
+      path_settings = {
         'device' => dev,
         'filesystem' => fs,
         # Split on commas that are not in quotes
         'options' => opts.gsub(%r{'|"}, '').split(%r{,(?=(?:(?:[^'"]*(?:'|")){2})*[^'"]*$)}).map(&:strip)
-      })
+      }
+
+      if facter_mountpoints[path]
+        mount_list[path] = facter_mountpoints[path]
+
+        # The mountpoins fact does not capture all options correctly
+        mount_list[path]['options'] = path_settings['options']
+      else
+        mount_list[path] = path_settings
+      end
+
+
     end
 
     # Lookup table so we don't constantly lookup found UIDs and GIDs, etc...

lib/facter/tmp_mounts.rb

@@ -21,23 +21,32 @@
 
 simplib__tmp_mount_target_dirs.each do |dir|
   Facter.add("tmp_mount#{dir.gsub('/','_')}") do
+    confine :kernel => :Linux
+    confine { File.directory?(dir) }
     setcode do
+
       simplib__tmp_mount_list ||= Facter.value(:simplib__mountpoints)
       next unless simplib__tmp_mount_list[dir]
       simplib__tmp_mount_list[dir]['options'].join(',')
     end
   end
 
   Facter.add("tmp_mount_path#{dir.gsub('/','_')}") do
+    confine :kernel => :Linux
+    confine { File.directory?(dir) }
     setcode do
+
       simplib__tmp_mount_list ||= Facter.value(:simplib__mountpoints)
       next unless simplib__tmp_mount_list[dir]
       simplib__tmp_mount_list[dir]['device']
     end
   end
 
   Facter.add("tmp_mount_fstype#{dir.gsub('/','_')}") do
+    confine :kernel => :Linux
+    confine { File.directory?(dir) }
     setcode do
+
       simplib__tmp_mount_list ||= Facter.value(:simplib__mountpoints)
       next unless simplib__tmp_mount_list[dir]
       simplib__tmp_mount_list[dir]['filesystem']

spec/acceptance/suites/windows/00_facter_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper_acceptance'
+
+test_name 'overall fact sanity'
+
+describe 'running facts' do
+  hosts.each do |host|
+    context "on #{host}" do
+      it do
+        result = on(host, 'puppet facts').output.strip.lines
+
+        expect(result.grep(/Error/).grep(/Facter/)).to be_empty
+      end
+    end
+  end
+end

spec/acceptance/suites/windows/nodesets/default.yml

@@ -0,0 +1,37 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  el7:
+    roles:
+      - default
+    platform: el-7-x86_64
+    box: centos/7
+    hypervisor: <%= hypervisor %>
+
+  win:
+    roles:
+      - windows
+    platform: windows-server-amd64
+    box: gusztavvargadr/windows-server
+    box_version: 1809.0.2006.standard
+    hypervisor: <%= hypervisor %>
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    communicator: winrm
+    is_cygwin: false
+    ssh:
+      host_key: '+ssh-dss'
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>

spec/spec_helper_acceptance.rb

@@ -4,6 +4,13 @@
 require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
 
+require 'beaker/puppet_install_helper'
+require 'beaker-windows'
+include BeakerWindows::Path
+include BeakerWindows::Powershell
+include BeakerWindows::Registry
+include BeakerWindows::WindowsFeature
+
 unless ENV['BEAKER_provision'] == 'no'
   hosts.each do |host|
     # Install Puppet
@@ -15,25 +22,64 @@
   end
 end
 
+hosts.each do |host|
+  # https://petersouter.co.uk/testing-windows-puppet-with-beaker/
+  case host['platform']
+  when /windows/
+    GEOTRUST_GLOBAL_CA = <<-EOM.freeze
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+    EOM
+    install_cert_on_windows(host, 'geotrustglobal', GEOTRUST_GLOBAL_CA)
+  end
+end
+
 
 RSpec.configure do |c|
   # ensure that environment OS is ready on each host
-  fix_errata_on hosts
+  fix_errata_on(hosts)
 
   # Readable test descriptions
   c.formatter = :documentation
 
   # Configure all nodes in nodeset
   c.before :suite do
     begin
+      nonwin = hosts.dup
+      nonwin.delete_if {|h| h[:platform] =~ /windows/ }
       # Install modules and dependencies from spec/fixtures/modules
-      copy_fixture_modules_to( hosts )
-
+      copy_fixture_modules_to( nonwin )
+      begin
+        server = only_host_with_role(nonwin, 'server')
+      rescue ArgumentError => e
+        server = only_host_with_role(nonwin, 'default')
+      end
       # Generate and install PKI certificates on each SUT
       Dir.mktmpdir do |cert_dir|
-        run_fake_pki_ca_on( default, hosts, cert_dir )
-        hosts.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
+        run_fake_pki_ca_on(server, nonwin, cert_dir )
+        nonwin.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
       end
+
+      # add PKI keys
+      copy_keydist_to(server)
     rescue StandardError, ScriptError => e
       if ENV['PRY']
         require 'pry'; binding.pry