summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-12Merge pull request #49 from ↵Ken Barber
jeffmccune/bug/2.3.x/fix_absolute_path_error_with_puppet26 (#12357) Fix broken compatibility with Puppet 2.6
2012-03-12(#12357) Fix broken compatibility with Puppet 2.6Jeff McCune
Without this patch, the previous change set to the validate_absolute_path() parser function contains Puppet 2.6 incompatible changes. stdlib 2.x is compatible with Puppet 2.6. These changes are a problem because we cannot introduce backwards incompatible changes in a minor release. This patch fixes the problem by back porting the implementation of the `Puppet::Util.absolute_path?` from 2.7.x to the function block itself. The function block tests to see if `Puppet::Util.absolute_path?` will respond and if not, falls back to the inline back ported implementation. The spec tests have been updated to simulate the behavior of Puppet 2.6 even when running with Puppet 2.7.
2012-03-09Merge branch 'ticket/2.3.x/13018_any_on_string' into 2.3.xJeff McCune
* ticket/2.3.x/13018_any_on_string: (maint) Comment Ken's fix to String#any? (#13018) Fix missing method any? message for ruby 1.9.x
2012-03-09(maint) Comment Ken's fix to String#any?Jeff McCune
Just added a comment about why we're doing what we're doing.
2012-03-07(#13018) Fix missing method any? message for ruby 1.9.xKen Barber
The any? method doesn't exist for 1.9.x, this converts a string to a single element array to work around the problem.
2012-03-07Merge pull request #47 from ↵Ken Barber
jeffmccune/feature/2.3.x/validate_re_better_error_messages (#12357) Add ability to display an error message from validate_re
2012-03-07(#12357) Add ability to display an error message from validate_reJeff McCune
I've seen a number of times the following error displayed to the end user: validate_re(): "" does not match "^true$|^false$" at /p/t/f.pp:40 This is an absolutely horrific error message. I'm to blame for it. Users stumble over this quite often and they shouldn't have to go read the code to sort out what's happening. This patch makes an effort to fix the problem by adding a third, optional, argument to validate_re(). This third argument will be the message thrown back in the exception which will be displayed to the end user. This sets the stage for nicer error messages coming from modules we write. This patch is backwards compatible but is a new feature.
2012-03-07Merge pull request #46 from ↵Ken Barber
jeffmccune/feature/2.3.x/validate_absolute_path_function (#12357) Add validate_absolute_path() function
2012-03-07(#12357) Add validate_absolute_path() functionJeff McCune
This patch adds a new function to validate if a string is an absolute filesystem path or not. The intent of this is to make this functionality generic and reusable. Josh left a comment in another pull request I had: If node_installdir or $node_vardir is not defined, then we should raise an error, otherwise we may create a scheduled task to an untrusted directory. One solution to this comment is to validate the Puppet variable is an absolute path. Examples of this function look like: function_validate_absolute_path Using Puppet::Parser::Scope.new Garbage inputs validate_absolute_path(nil) should fail validate_absolute_path([nil]) should fail validate_absolute_path({"foo"=>"bar"}) should fail validate_absolute_path({}) should fail validate_absolute_path("") should fail relative paths validate_absolute_path("relative1") should fail validate_absolute_path(".") should fail validate_absolute_path("..") should fail validate_absolute_path("./foo") should fail validate_absolute_path("../foo") should fail validate_absolute_path("etc/puppetlabs/puppet") should fail validate_absolute_path("opt/puppet/bin") should fail absolute paths validate_absolute_path("C:/") should not fail validate_absolute_path("C:\\") should not fail validate_absolute_path("C:\\WINDOWS\\System32") should not fail validate_absolute_path("C:/windows/system32") should not fail validate_absolute_path("X:/foo/bar") should not fail validate_absolute_path("X:\\foo\\bar") should not fail validate_absolute_path("/var/tmp") should not fail validate_absolute_path("/var/lib/puppet") should not fail validate_absolute_path("/var/opt/../lib/puppet") should not fail validate_absolute_path("C:\\Program Files (x86)\\Puppet Labs\\Puppet Enterprise") should not fail validate_absolute_path("C:/Program Files (x86)/Puppet Labs/Puppet Enterprise") should not fail Finished in 0.05637 seconds 23 examples, 0 failures
2012-03-07(maint) Stop printing the directory of spec_helperJeff McCune
Without this patch every rspec run prints out the directory of the spec_helper script. I think this was just a debugging line or whatever that accidentally got added.
2012-03-06Merge pull request #44 from ↵Josh Cooper
jeffmccune/ticket/2.3.x/12357_add_puppet_settings_facts (#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
2012-03-06(#12357) Make facter_dot_d look in Puppet[:confdir]/facts.dJeff McCune
On Windows, we have no folders that match up to the default set of directories the facter_dot_d fact looks in by default. This is a problem because the Puppet Enterprise installer writes out the following facts by default, and our modules require them to be present: % cat /etc/puppetlabs/facter/facts.d/puppet_enterprise_installer.txt fact_stomp_port=61613 fact_stomp_server=puppetmaster fact_is_puppetagent=true fact_is_puppetmaster=true fact_is_puppetconsole=true On windows, the Puppet confdir is quite variable. On 2003 systems we default to the All Users application data directory. On 2008 systems we default to the ProgramData directory. The actual configuration directory varies depending on the Puppet or Puppet Enterprise branding. In order to simplify all of this variable behavior, this patch fixes the problem by automatically looking for facts in `%COMMON_APPDATA%/PuppetLabs/facter/facts.d` This patch paves the way for the MSI installer to use an IniFile element to write custom facts during installation.
2012-03-06Merge pull request #45 from ↵Josh Cooper
jeffmccune/ticket/2.3.x/12357_disable_root_home_fact_on_windows (#12357) Fix root_home fact on Windows
2012-03-05(#12357) Add puppet_vardir custom factJeff McCune
Without this patch the PE modules don't have a way to identify a filesystem path where it's OK to place variable data related to managing the target node. This is a problem when a module like pe_compliance needs to write a wrapper script to the node's filesystem. This patch addresses the problem by exposing the node's Puppet[:vardir] setting as a Facter fact. This fact value will be set to `nil` if Puppet is not loaded into memory. If Puppet is loaded, e.g. using `facter --puppet` or using `puppet agent` or `puppet apply` then the fact will automatically set the value to Puppet[:vardir] The value of this setting is subject to Puppet's run_mode. This patch implements a new utility method in the standard library module named `Facter::Util::PuppetSettings.with_puppet`. The method accepts a block and will only invoke the block if the Puppet library is loaded into the Ruby process. If Puppet is not loaded, the method always returns nil. This makes it easy to define Facter facts that only give values if Puppet is loaded in memory.
2012-03-05(#12357) Fix root_home fact on WindowsJeff McCune
Without this patch the root_home fact fails on windows. This patch fixes the problem by only calling methods on the object returned by the `getent passwd root` command if the object evaluates to true. Because there is no root account on Windows the code block simply returns `nil` which makes the Facter fact undefined on Windows platforms. The root cause of the failure is that we always expected the command to succeed and return something useful, and it may not on all supported platforms.
2012-02-22Merge pull request #37 from fiddyspence/ticket/master/12776-validate_slengthKen Barber
(#12776) Added validate_slength function and rspec test
2012-02-22(#12776) Added validate_slength function and rspec testChris Spence
This function is used to validate a string is less than a maximum length. The string, or array of strings, is passed as the first argument to the function. The maximum length of the string is passed as the second argument. It is useful to validate, for example, that Puppet is not sending a username to a downstream system that the system cannot cope with, but that might not cause an error message - for example, MySQL will not accept a username of more than 16 characters. This enables a Puppet administrator to validate the data that it may have been passed from upstream through, for example, Hiera.
2012-02-09Merge pull request #36 from duritong/tickets/11017Daniel Pittman
implement #11017 - make file_line type ensurable
2012-02-09implement #11017 - make file_line type ensurablePeter Meier
* Implement a simple destroy method. * Add tests for it * Refactor code, so file is actually read only once. However, due to the nature how provider tests are run, we need to ensure that the file is read before we open it to write it.
2012-02-07Merge branch '2.2.x'Ken Barber
* 2.2.x: (#12377) Avoid infinite loop when retrying require json
2012-02-07Merge branch '2.1.x' into 2.2.xKen Barber
* 2.1.x: (#12377) Avoid infinite loop when retrying require json
2012-02-06Merge branch ↵Ken Barber
'ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful' into 2.1.x * ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful: (#12377) Avoid infinite loop when retrying require json
2012-02-06(#12377) Avoid infinite loop when retrying require jsonJeff McCune
Without this patch an infinite loop will be entered if the json and rubygems libraries are not available. This patch fixes the problem by retrying the `require 'json'` only if rubygems was successfully loaded for the first time. Subsequent attempts to load rubygems will cause the LoadError exception from a missing json library to be re-raised. Thanks to Krzysztof Wilczynski for pointing out this issue.
2012-02-03Merge pull request #33 from richardc/masterJeff McCune
Update a documentation comment - facts_dot_d
2012-02-03Update the documentation comment Richard Clamp
This is causing a little confusion, so make the comment match the behaviour.
2012-01-11Merge branch '2.2.x'Jeff McCune
* 2.2.x: Check according to rfc1035 Add additional domain name tests (maint) Memoize scope in domain_name spec
2012-01-11Merge branch 'bug/2.2.x/is_domain_name' into 2.2.xJeff McCune
* bug/2.2.x/is_domain_name: Check according to rfc1035 Add additional domain name tests (maint) Memoize scope in domain_name spec Closes pull request GH-24
2012-01-11Check according to rfc1035Stig Sandbeck Mathisen
Update doc string to match function
2012-01-11Add additional domain name testsJeff McCune
Without this patch some valid domain names are not covered in the spec tests as Stig Sandbeck Mathisen <ssm@debian.org> points out. This patch adds spec tests for the domains "." and "x.com" which are both valid.
2012-01-11(maint) Memoize scope in domain_name specJeff McCune
This is an opportunity improvement since I'm in the code. Get rid of instance variables in the spec test and replace them with a memo let method block.
2012-01-11Merge branch '2.2.x'Jeff McCune
* 2.2.x: (#11901) Fix sort order error in tests for 'keys' and 'values'
2012-01-11Merge branch 'ticket/2.2.x/11901-rspec_sort_order' into 2.2.xJeff McCune
* ticket/2.2.x/11901-rspec_sort_order: (#11901) Fix sort order error in tests for 'keys' and 'values'
2012-01-11(#11901) Fix sort order error in tests for 'keys' and 'values'Jeff McCune
Between Ruby 1.8.7 p352 and p357 the way arrays were returned when using keys and values in Ruby changed, and due to assumption about the ordering our tests are now failing. This patch fixes the issue by using the =~ operator matcher in rspec. This matcher is implemented as RSpec::Matchers::MatchArray and performs multiset equality matching of arrays. Order doesn't matter, but duplicate values do. This patch also switches @scope instance variables to memoized let methods for clarity in the code. Original Author: Ken Barber Reviewed-by: Nick Lewis This commit closes GH-29
2012-01-11Merge branch '2.2.x'Ken Barber
* 2.2.x: (#11873) time function spec failure on Fixnum matcher
2012-01-10Merge pull request #28 from kbarber/ticket/2.2.x/11873-time_spec_failureDaniel Pittman
(#11873) time function spec failure on Fixnum matcher
2012-01-10(#11873) time function spec failure on Fixnum matcherKen Barber
The rspec code for the time function was trying to match the type to be a 'Fixnum'. Ruby will sometimes make this a 'Bignum' depending on its internals and we can't rely on this to be true all the time. This patch just makes sure the type is an integer instead.
2012-01-09Merge pull request #27 from glarizza/feature/master/str2saltedsha512Jeff McCune
New str2saltedsha512 function for OS X Passwords
2012-01-09New str2saltedsha512 function for OS X PasswordsGary Larizza
OS X 10.7 introduced salted-SHA512 password hashes as opposed to the older LANMAN + SHA1 hashes. To assist in generating properly-formatted password hashes, this commit adds the str2saltedsha512() function which accepts a single string argument (the password) and returns a salted-SHA512 password hash which can be fed as the password attribute of a user resource in OS X 10.7. Spec tests are also added to ensure that functionality isn't broken with future commits.
2011-12-30Merge branch '2.2.x'Jeff McCune
* 2.2.x: (#11607) Add Rakefile to enable spec testing
2011-12-30Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: (#11607) Add Rakefile to enable spec testing
2011-12-30Merge pull request #26 from ↵Jeff McCune
jeffmccune/ticket/2.1.x/11607_fix_ci_tests_for_stdlib (#11607) Add Rakefile to enable spec testing
2011-12-30(#11607) Add Rakefile to enable spec testingJeff McCune
Without this patch the 2.1.x branch does not have a Rakefile like the 2.2.x and master branches do. This is a problem for the continuous integration testing since it executes `rake test` against 2.1.x, 2.2.x and master currently. This patch fixes the problem by copying the Rakefile into place enabling the `rake test` task. Reviewed-by: Josh Cooper
2011-12-30Merge branch '2.2.x'Jeff McCune
* 2.2.x: Update CHANGELOG and Modulefile for 2.2.1
2011-12-30Update CHANGELOG and Modulefile for 2.2.1Jeff McCune
2011-12-30Merge branch '2.2.x'Jeff McCune
* 2.2.x: Update Modulefile CHANGELOG for v2.1.2 release
2011-12-30Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: Update Modulefile CHANGELOG for v2.1.2 release Conflicts: CHANGELOG Modulefile
2011-12-30Update Modulefile CHANGELOG for v2.1.2 releaseJeff McCune
2011-12-30Merge branch 'v2.2.x'Jeff McCune
* v2.2.x: (maint) Add semantic versioning info to README
2011-12-30Merge branch 'v2.1.x' into v2.2.xJeff McCune
* v2.1.x: (maint) Add semantic versioning info to README Docs: Clarify the use case for the anchor type Docs: Remove author emails from stdlib functions Docs: Copyedit function doc strings Docs: Correct indentation of markdown code examples Docs: Update documentation of stdlib classes Docs: Update file_line documentation Docs: Improve example in merge function
2011-12-30(maint) Add semantic versioning info to READMEJeff McCune
This patch adds semantic versioning information to the README of this module. This information is missing and unclear without this patch. This should help clarify the support matrix for the Standard Library as it relates to Puppet Enterprise released versions.