Merge branch 'release'

* release: (24 commits)
  (FM-2110) sqlserver_tsql docs
  FM-2122: Added new PE-only development paragraph to readme
  Fix metadata.json and capture back puppet module build metadata.json
  (BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
  (maint) Adjust Geppetto rules
  (FM-2094) Fix examples to use sqlserver
  (maint) - Add .geppetto-rc.json to configure excludes
  Don't quote install switches true, false, 0, 1
  (maint) Redefine installer switch definitions
  (maint) Add ACL module to fixtures dependency
  (maint) Add PE version requirement 3.7.x < 4.0.0
  (maint) Refactor command line switch parsing
  (FM-2576) Add /ASSYSADMINACCOUNTS installer support
  (FM-2576) Whitelist parameters installer accepts
  (FM-2575) - Fixed bug with login exists, and creation
  Fix spec tests raise_error check
  (FM-2404) Refactor acceptance specs to not use shared context
  Add acceptance test starting framework, YAY ACCEPTANCE TESTS
  DOCS: Improved example for install_switches param
  FM-2328: document install_switches param in sqlserver
  ...

Paired-with: Travis Fields <[email protected]>

Author: Iristyle

.fixtures.yml

@@ -1,5 +1,6 @@
 fixtures:
   forge_modules:
+    acl: "puppetlabs/acl"
     stdlib: "puppetlabs/stdlib"
     acl: "puppetlabs/acl"
   symlinks:

.geppetto-rc.json

@@ -0,0 +1,6 @@
+{
+  "excludes": [
+    "**/spec/**",
+    "**/pkg/**"
+  ]
+}

Gemfile

@@ -43,4 +43,7 @@ else
   gem 'puppet', '~> 3.7',       :require => false
 end
 
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end
 # vim:ft=ruby

lib/puppet/provider/sqlserver_features/mssql.rb

@@ -1,8 +1,11 @@
 require 'json'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sqlserver'))
 
-Puppet::Type::type(:sqlserver_features).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
+FEATURE_RESERVED_SWITCHES =
+  %w(AGTSVCACCOUNT AGTSVCPASSWORD ASSVCACCOUNT AGTSVCPASSWORD PID
+       RSSVCACCOUNT RSSVCPASSWORD SAPWD SECURITYMODE SQLSYSADMINACCOUNTS FEATURES)
 
+Puppet::Type::type(:sqlserver_features).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
   def self.instances
     instances = []
     jsonResult = Puppet::Provider::Sqlserver.run_discovery_script
@@ -11,8 +14,8 @@ def self.instances
       existing_instance = {:name => "Generic Features",
                            :ensure => :present,
                            :features =>
-                               PuppetX::Sqlserver::ServerHelper.translate_features(
-                                   jsonResult['Generic Features']).sort!
+                             PuppetX::Sqlserver::ServerHelper.translate_features(
+                               jsonResult['Generic Features']).sort!
       }
       debug "Parsed features = #{existing_instance[:features]}"
 
@@ -59,8 +62,42 @@ def modify_features(action, features)
           cmd_args << "/PID=#{@resource[:pid]}"
         end
       end
-      try_execute(cmd_args, "Unable to #{action} features (#{features.join(', ')})")
+      begin
+        config_file = create_temp_for_install_switch unless action == 'uninstall'
+        cmd_args << "/ConfigurationFile=\"#{config_file.path}\"" unless config_file.nil?
+        try_execute(cmd_args, "Unable to #{action} features (#{features.join(', ')})")
+      ensure
+        if config_file
+          config_file.close
+          config_file.unlink
+        end
+      end
+    end
+  end
+
+  def create_temp_for_install_switch
+    if not_nil_and_not_empty? @resource[:install_switches]
+      config_file = ["[OPTIONS]"]
+      @resource[:install_switches].each_pair do |k, v|
+        if FEATURE_RESERVED_SWITCHES.include? k
+          warn("Reserved switch [#{k}] found for `install_switches`, please know the provided value
+may be overridden by some command line arguments")
+        end
+        if v.is_a?(Numeric) || (v.is_a?(String) && v =~ /^(true|false|1|0)$/i)
+          config_file << "#{k}=#{v}"
+        elsif v.nil?
+          config_file << k
+        else
+          config_file << "#{k}=\"#{v}\""
+        end
+      end
+      config_temp = Tempfile.new(['sqlconfig', '.ini'])
+      config_temp.write(config_file.join("\n"))
+      config_temp.flush
+      config_temp.close
+      return config_temp
     end
+    return nil
   end
 
   def installNet35

lib/puppet/provider/sqlserver_instance/mssql.rb

@@ -1,8 +1,12 @@
 require 'json'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sqlserver'))
 
-Puppet::Type::type(:sqlserver_instance).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
 
+INSTANCE_RESERVED_SWITCHES =
+  %w(AGTSVCACCOUNT AGTSVCPASSWORD ASSVCACCOUNT AGTSVCPASSWORD PID
+       RSSVCACCOUNT RSSVCPASSWORD SAPWD SECURITYMODE SQLSYSADMINACCOUNTS FEATURES)
+
+Puppet::Type::type(:sqlserver_instance).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
   def self.instances
     instances = []
     jsonResult = Puppet::Provider::Sqlserver.run_discovery_script
@@ -12,8 +16,8 @@ def self.instances
         existing_instance = {:name => instance_name,
                              :ensure => :present,
                              :features =>
-                                 PuppetX::Sqlserver::ServerHelper.translate_features(
-                                     jsonResult[instance_name]['features']).sort!
+                               PuppetX::Sqlserver::ServerHelper.translate_features(
+                                 jsonResult[instance_name]['features']).sort!
         }
         instance = new(existing_instance)
         instances << instance
@@ -42,7 +46,17 @@ def add_features(features)
   def modify_features(features, action)
     if not_nil_and_not_empty? features
       debug "#{action.capitalize}ing features '#{features.join(',')}'"
-      try_execute(build_cmd_args(features, action), "Error trying to #{action} features (#{features.join(', ')}")
+      cmd_args = build_cmd_args(features, action)
+      begin
+        config_file = create_temp_for_install_switch unless action == 'uninstall'
+        cmd_args << "/ConfigurationFile=\"#{config_file.path}\"" unless config_file.nil?
+        try_execute(cmd_args, "Error trying to #{action} features (#{features.join(', ')}")
+      ensure
+        if config_file
+          config_file.close
+          config_file.unlink
+        end
+      end
     end
   end
 
@@ -56,9 +70,44 @@ def create
       destroy
     else
       installNet35
-      cmd_args = build_cmd_args(@resource[:features])
-      try_execute(cmd_args)
+      add_features(@resource[:features])
+      # cmd_args = build_cmd_args(@resource[:features])
+      # begin
+      #   config_file = create_temp_for_install_switch
+      #   cmd_args << "/ConfigurationFile=\"#{config_file.path}\"" unless config_file.nil?
+      #   try_execute(cmd_args)
+      # ensure
+      #   if config_file
+      #     config_file.close
+      #     config_file.unlink
+      #   end
+      # end
+    end
+  end
+
+  def create_temp_for_install_switch
+    if not_nil_and_not_empty? @resource[:install_switches]
+      config_file = ["[OPTIONS]"]
+      @resource[:install_switches].each_pair do |k, v|
+        if INSTANCE_RESERVED_SWITCHES.include? k
+          warn("Reserved switch [#{k}] found for `install_switches`, please know the provided value
+may be overridden by some command line arguments")
+        end
+        if v.is_a?(Numeric) || (v.is_a?(String) && v =~ /^(true|false|1|0)$/i)
+          config_file << "#{k}=#{v}"
+        elsif v.nil?
+          config_file << k
+        else
+          config_file << "#{k}=\"#{v}\""
+        end
+      end
+      config_temp = Tempfile.new(['sqlconfig', '.ini'])
+      config_temp.write(config_file.join("\n"))
+      config_temp.flush
+      config_temp.close
+      return config_temp
     end
+    return nil
   end
 
   def basic_cmd_args(features, action)
@@ -73,20 +122,25 @@ def basic_cmd_args(features, action)
   def build_cmd_args(features, action="install")
     cmd_args = basic_cmd_args(features, action)
     if action == 'install'
-      (@resource.parameters.keys - %w(ensure loglevel features name provider source sql_sysadmin_accounts sql_security_mode).map(&:to_sym)).sort.collect do |key|
-        cmd_args << "/#{key.to_s.gsub(/_/, '').upcase}=\"#{@resource[key]}\""
-      end
-      if not_nil_and_not_empty? @resource[:sql_sysadmin_accounts]
-        if @resource[:sql_sysadmin_accounts].kind_of?(Array)
-          cmd_args << "/SQLSYSADMINACCOUNTS=#{ Array.new(@resource[:sql_sysadmin_accounts]).collect { |account| "\"#{account}\"" }.join(' ')}"
-        else
-          cmd_args << "/SQLSYSADMINACCOUNTS=\"#{@resource[:sql_sysadmin_accounts]}\""
+      %w(pid sa_pwd sql_svc_account sql_svc_password agt_svc_account agt_svc_password as_svc_account as_svc_password rs_svc_account rs_svc_password security_mode).map(&:to_sym).sort.collect do |key|
+        if not_nil_and_not_empty? @resource[key]
+          cmd_args << "/#{key.to_s.gsub(/_/, '').upcase}=\"#{@resource[key]}\""
         end
       end
+
+      format_cmd_args_array('/SQLSYSADMINACCOUNTS', @resource[:sql_sysadmin_accounts], cmd_args)
+      format_cmd_args_array('/ASSYSADMINACCOUNTS', @resource[:as_sysadmin_accounts], cmd_args)
     end
     cmd_args
   end
 
+  def format_cmd_args_array(switch, arr, cmd_args)
+    if not_nil_and_not_empty? arr
+      arr = [arr] if !arr.kind_of?(Array)
+      cmd_args << "#{switch}=#{arr.collect { |item| "\"#{item}\"" }.join(' ')}"
+    end
+  end
+
   def destroy
     cmd_args = basic_cmd_args(current_installed_features, 'uninstall')
     try_execute(cmd_args, "Unable to uninstall instance #{@resource[:name]}")

lib/puppet/type/sqlserver_features.rb

@@ -43,6 +43,13 @@
     end
   end
 
+  newparam(:install_switches) do
+    desc 'A hash of switches you want to pass to the installer'
+    validate do |value|
+      fail ArguemntError, 'install_switch must be in the form of a Hash' unless value.is_a?(Hash)
+    end
+  end
+
   def validate
     if set?(:features)
       self[:features] = self[:features].flatten.sort.uniq

lib/puppet/type/sqlserver_instance.rb

@@ -2,7 +2,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/sqlserver/server_helper'))
 
 Puppet::Type::newtype(:sqlserver_instance) do
+
   ensurable
+
   newparam(:name, :namevar => true) do
     munge do |value|
       value.upcase
@@ -114,6 +116,13 @@
     newvalues('SQL')
   end
 
+  newparam(:install_switches) do
+    desc 'A hash of switches you want to pass to the installer'
+    validate do |value|
+      fail ArguemntError, 'install_switch must be in the form of a Hash' unless value.is_a?(Hash)
+    end
+  end
+
 
   def validate
     if set?(:agt_svc_account)

metadata.json

@@ -7,7 +7,16 @@
   "source": "https://tickets.puppetlabs.com/browse/MODULES/component/12400",
   "project_page": "https://tickets.puppetlabs.com/browse/MODULES/component/12400",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES/component/12400",
-  "tags": ["ms sql", "mssql", "sql server", "microsoft sql server", "windows", "sql 2012", "sql 2014"],
+  "tags": [
+    "sql",
+    "mssql",
+    "sqlserver",
+    "microsoft",
+    "sql2012",
+    "sql2014",
+    "tsql",
+    "database"
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "Windows",
@@ -20,7 +29,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.7.x"
+      "version_requirement": ">= 3.7.0 < 4.0.0"
     }
   ],
   "dependencies": [

spec/acceptance/nodesets/windows-2012r2-64a-inverted.yml

@@ -0,0 +1,31 @@
+HOSTS:
+  debian6:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: debian-6-i386
+    template: debian-6-i386
+    hypervisor: vcloud
+  sql2012:
+    roles:
+      - agent
+      - default
+      - sql2012
+    platform: windows-2012r2-x86_64
+    template: win-2012r2-x86_64
+    hypervisor: vcloud
+  sql2014:
+    roles:
+      - agent
+      - sql2014
+    platform: windows-2012r2-x86_64
+    template: win-2012r2-x86_64
+    hypervisor: vcloud
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

spec/spec_helper_acceptance.rb

@@ -0,0 +1,58 @@
+require 'beaker-rspec/spec_helper'
+require 'beaker-rspec/helpers/serverspec'
+require 'sql_testing_helpers'
+
+QA_RESOURCE_ROOT = "http://int-resources.ops.puppetlabs.net/QA_resources/microsoft_sql/iso/"
+SQL_2014_ISO = "SQLServer2014-x64-ENU.iso"
+SQL_2012_ISO = "SQLServer2012SP1-FullSlipstream-ENU-x64.iso"
+
+RSpec.configure do |c|
+  # Readable test descriptions
+  c.formatter = :documentation
+  c.before(:suite) do
+    base_install
+  end
+end
+
+FUTURE_PARSER = ENV['FUTURE_PARSER'] == 'true' || false
+
+unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
+  is_foss = (ENV['IS_PE'] == 'no' || ENV['IS_PE'] == 'false') ? true : false
+  if hosts.first.is_pe? && !is_foss
+    install_pe
+  else
+    version = ENV['PUPPET_VERSION'] || '3.7.4'
+    download_url = ENV['WIN_DOWNLOAD_URL'] || 'http://downloads.puppetlabs.com/windows/'
+    hosts.each do |host|
+      if host['platform'] =~ /windows/i
+        install_puppet_from_msi(host,
+                                {
+                                  :win_download_url => download_url,
+                                  :version => version,
+                                  :install_32 => true})
+      end
+    end
+  end
+
+  agents.each do |agent|
+    step "Install sqlserver module to agent #{agent.node_name}"
+    on agent, "mkdir -p #{default['distmoduledir']}/sqlserver"
+    result = on agent, "echo #{default['distmoduledir']}"
+    target = result.raw_output.chomp
+    proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    exec_puppet = <<-EOS
+    exec{'Download':
+      command => 'powershell.exe -command "Invoke-WebRequest https://forgeapi.puppetlabs.com"',
+      path => ['c:\\windows\\sysnative\\WindowsPowershell\\v1.0','c:\\windows\\system32\\WindowsPowershell\\v1.0'],
+    }
+    EOS
+    apply_manifest_on(agent, exec_puppet)
+    %w(puppetlabs/stdlib puppetlabs/acl cyberious/pget puppetlabs/reboot puppetlabs/registry).each do |dep|
+      on agent, puppet("module install #{dep}")
+    end
+    on agent, "git clone https://github.com/puppetlabs/puppetlabs-mount_iso #{target}/mount_iso"
+    install_dev_puppet_module_on(agent, {:proj_root => proj_root, :target_module_path => "#{target}", :module_name => 'sqlserver'})
+  end
+end
+
+