1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ coverage/
.*.sw[op]
.DS_Store
.rspec
tmp/

25 changes: 8 additions & 17 deletions .sync.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,9 @@ CONTRIBUTING.md:
unmanaged: true
Gemfile:
supports_windows: true
required:
optional:
':development':
- gem: rake
version: '~>10.1'
- gem: rspec
version: '~>3.0'
- gem: puppet-lint
- gem: puppetlabs_spec_helper
version: '~>0.10.3'
- gem: puppet_facts
- gem: mocha
version: '~>0.10.5'
- gem: pry
- gem: simplecov
- gem: yard
':system_tests':
- gem: beaker-rspec
- gem: beaker
- gem: beaker-puppet_install_helper
Rakefile:
unmanaged: true
spec/spec_helper.rb:
Expand All @@ -39,3 +23,10 @@ appveyor.yml:
RUBY_VER: 193
- PUPPET_GEM_VERSION: 3.7.0
RUBY_VER: 200-x64
LICENSE:
license_type: 'puppetpe'
NOTICE:
unmanaged: true
MAINTAINERS.md:
maintainers:
- "Puppet Windows Team `windows |at| puppet |dot| com`"
19 changes: 18 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
##2016-04-06 - Supported Release 1.1.2
##2016-07-12 - Supported Release 1.1.3
###Summary

- Small release with several bug fixes and minor features
- Updated the supported Puppet version ranges

####Features
- Updated documentation with more advanced SQL example
- Add Windows Based Authentication for `sqlserver::config`. Modifies the `sqlserver::config` class with an additional property called `login_type` which can be either `SQL_LOGIN` or `WINDOWS_LOGIN`, with a default of `SQL_LOGIN`

####Bug Fixes
- Fix Role Name Collisions. This fix introduces the database name into the title created for the `sqlserver_tsql` statements so that it is unique
- Minor refactoring of code which is not used or make code path more obvious
- Fix TSQL error propagation. Introduce a minor refactor so that the `returns` property captures errors properly from TSQL executions
- Emit debug output on failed `onlyif` TSQL. Previously, there was no way of getting the log output from SQL Server when executing TSQL during an `onlyif`

##2016-04-11 - Supported Release 1.1.2
###Summary

Small release to support Puppet version ranges.


##2015-12-08 - Supported Release 1.1.1
###Summary

Expand Down
54 changes: 35 additions & 19 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@ end
#end

group :development do
gem 'rake', '~>10.1', :require => false
gem 'rake', :require => false
gem 'rspec', '~>3.0', :require => false
gem 'puppet-lint', :require => false
gem 'puppetlabs_spec_helper', '~>0.10.3', :require => false
gem 'puppet_facts', :require => false
gem 'mocha', '~>0.10.5', :require => false
gem 'pry', :require => false
gem 'simplecov', :require => false
gem 'yard', :require => false
end

Expand Down Expand Up @@ -79,32 +78,39 @@ if puppet_gem_location != :gem || puppetversion < '3.5.0'
if Gem::Platform.local.os == 'mingw32'
explicitly_require_windows_gems = true
end

if puppet_gem_location == :gem
# If facterversion hasn't been specified and we are
# looking for a Puppet Gem version less than 3.5.0, we
# need to ensure we get a good Facter for specs.
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless facterversion
# If hieraversion hasn't been specified and we are
# looking for a Puppet Gem version less than 3.5.0, we
# need to ensure we get a good Hiera for specs.
gem "hiera",">= 1.0.0","<= 1.3.0",:require => false unless hieraversion
end
end

if explicitly_require_windows_gems
# This also means Puppet Gem less than 3.5.0 - this has been tested back
# to 3.0.0. Any further back is likely not supported.
if puppet_gem_location == :gem
gem "ffi", "1.9.0", :require => false
gem "win32-eventlog", "0.5.3", :require => false
gem "win32-process", "0.6.5", :require => false
gem "win32-security", "~> 0.1.2", :require => false
gem "win32-service", "0.7.2", :require => false
gem "minitar", "0.5.4", :require => false
# If facterversion hasn't been specified and we are
# looking for a Puppet Gem version less than 3.5.0, we
# need to ensure we get a good Facter for Windows specs.
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless facterversion
gem "ffi", "1.9.0", :require => false
gem "win32-eventlog", "0.5.3","<= 0.6.5", :require => false
gem "win32-process", "0.6.5","<= 0.7.5", :require => false
gem "win32-security", "~> 0.1.2","<= 0.2.5", :require => false
gem "win32-service", "0.7.2","<= 0.8.7", :require => false
gem "minitar", "0.5.4", :require => false
else
gem "ffi", "~> 1.9.0", :require => false
gem "win32-eventlog", "~> 0.5", :require => false
gem "win32-process", "~> 0.6", :require => false
gem "win32-security", "~> 0.1", :require => false
gem "win32-service", "~> 0.7", :require => false
gem "minitar", "~> 0.5.4", :require => false
gem "ffi", "~> 1.9.0", :require => false
gem "win32-eventlog", "~> 0.5","<= 0.6.5", :require => false
gem "win32-process", "~> 0.6","<= 0.7.5", :require => false
gem "win32-security", "~> 0.1","<= 0.2.5", :require => false
gem "win32-service", "~> 0.7","<= 0.8.7", :require => false
gem "minitar", "~> 0.5.4", :require => false
end

gem "win32-dir", "~> 0.3", :require => false
gem "win32-dir", "~> 0.3","<= 0.4.9", :require => false
gem "win32console", "1.3.2", :require => false if RUBY_VERSION =~ /^1\./

# Puppet less than 3.7.0 requires these.
Expand All @@ -119,6 +125,16 @@ if explicitly_require_windows_gems
gem "win32-taskscheduler", "0.2.2", :require => false
gem "windows-api", "0.4.3", :require => false
gem "windows-pr", "1.2.3", :require => false
else
if Gem::Platform.local.os == 'mingw32'
# If we're using a Puppet gem on windows, which handles its own win32-xxx gem dependencies (Pup 3.5.0 and above), set maximum versions
# Required due to PUP-6445
gem "win32-dir", "<= 0.4.9", :require => false
gem "win32-eventlog", "<= 0.6.5", :require => false
gem "win32-process", "<= 0.7.5", :require => false
gem "win32-security", "<= 0.2.5", :require => false
gem "win32-service", "<= 0.8.7", :require => false
end
end

# Evaluate Gemfile.local if it exists
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This Module is only available for users of Puppet Enterprise with a valid Software License Agreement
for Puppet Enterprise. This Module is not available for users of Puppet software under an open source license.

By downloading this Module, you agree that you have a valid Software License Agreement with Puppet Labs for
By downloading this Module, you agree that you have a valid Software License Agreement with Puppet for
Puppet Enterprise and you further agree that your use of this Module is governed by the terms of that
Software License Agreement.
6 changes: 6 additions & 0 deletions MAINTAINERS.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## Maintenance

Maintainers:
- Puppet Windows Team `windows |at| puppet |dot| com`

Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `sqlserver`.
Loading