Commit graph

68 commits

Author SHA1 Message Date
Ken Barber
010fb5e568 (#13018) Fix missing method any? message for ruby 1.9.x
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-07 19:55:21 -08:00
Jeff McCune
41b07232e4 (#12357) Add ability to display an error message from validate_re
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-07 15:33:27 -08:00
Jeff McCune
2ce669c7f8 (#12357) Add validate_absolute_path() function
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 11:58:47 -08:00
Chris Spence
8713943d37 (#12776) Added validate_slength function and rspec test
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-22 18:12:34 +00:00
Peter Meier
fc5cfc8cca implement #11017 - make file_line type ensurable
* 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-09 15:56:09 +01:00
Jeff McCune
c6d06cf66c Merge branch '2.2.x'
* 2.2.x:
  Check according to rfc1035
  Add additional domain name tests
  (maint) Memoize scope in domain_name spec
2012-01-11 19:19:51 -08:00
Stig Sandbeck Mathisen
14b77eae6d Check according to rfc1035
Update doc string to match function
2012-01-11 19:17:03 -08:00
Gary Larizza
02e85b9651 New str2saltedsha512 function for OS X Passwords
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.
2012-01-09 11:30:47 -08:00
Jeff McCune
80c9a8feea Merge branch 'v2.1.x' into v2.2.x
* 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 11:48:21 -08:00
Jeff McCune
7aeeae3721 Merge branch 'v2.x'
* v2.x:
  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 10:46:57 -08:00
Dan Bode
05c67671fd (#10802) add new function get_module_path
This commit adds a new function called get_module_path.

get_module_path returns the absolute path of a specified module. The
code and functionality is very similar to how templates and files
are detected inside of modules.

the function has been tested against puppet 2.6.10 and 2.7.x
2011-11-14 13:22:55 -08:00
Nan Liu
b58810089f (#10285) Refactor json to use pson instead.
Remove json requirement since puppet already provides pson which is
equivalent.
2011-10-25 15:54:47 -07:00
Jeff McCune
07b2a3afd9 (#10007) Revert "Merge pull request #13 from kbarber/issue/master/8925-user_ssl_certs"
This reverts commit 14852e0259, reversing
changes made to a95dccd464.

This is to fix the broken build (failing tests) as per #8925 and #10007
2011-10-10 11:51:14 -07:00
nfagerlund
8e770b0423 Docs: Clarify the use case for the anchor type
This commit tweaks the docs for the anchor resource type to give more context
for its existence.
2011-08-18 12:39:05 -07:00
nfagerlund
9e87fd1457 Docs: Remove author emails from stdlib functions
Author email addresses were included in the doc strings for some (but not all)
stdlib functions. This commit removes them in the interest of consistency.
2011-08-18 12:39:05 -07:00
nfagerlund
4b5dfcc733 Docs: Copyedit function doc strings
This commit makes several minor consistency and wording edits to the doc
strings of the stdlib functions.
2011-08-18 12:39:04 -07:00
nfagerlund
400b91ab02 Docs: Correct indentation of markdown code examples
Code examples in several function doc strings were only indented by two
spaces, which would not result in proper display when rendered as HTML. This
commit corrects the indentation to four spaces.
2011-08-18 12:39:04 -07:00
Jeff McCune
0594aa9141 Docs: Update file_line documentation
This commit clarifies the behavior of the file_line resource type.
2011-08-18 12:39:04 -07:00
Jeff McCune
27c3b644b0 Docs: Improve example in merge function
This commit replaces the example in the merge function with a much clearer
one. It also mentions that the rightmost value wins in the event of duplicated
hash keys.
2011-08-18 12:39:04 -07:00
Ken Barber
9b912d028f (#8925) Added new function called 'get_certificate' for retrieving
certificates from a CA (or locally).

This function works by either obtaining the file locally
or remotely based on Puppets configuration.

Also added get_pubkey which wraps get_certificate and extracts the
public key.
2011-08-17 16:36:59 +02:00
Jeff McCune
33887f9be5 Merge branch 'issue/master/8797_puppetlabs-functions_merge'
Closes pull request #12

Reviewed-by: Jeff McCune

Verified all spec tests pass using rspec **/*_spec.rb

* issue/master/8797_puppetlabs-functions_merge: (164 commits)
  * Moved kwalify to puppetlabs-kwalify project * Re-arranged tests in line with puppetlabs-stdlib
  Prep for stdlib merge * Renamed load_yaml & load_json to parseyaml & parsejson * Renamed is_valid_* functions and remove the 'valid_'
  Fix some ruby 1.9.2 issues.
  (#3) Provide documentation for remaining functions.
  (#3) Apply missing documentation to more functions.
  Remove rand.
  Some improvements to values_at tests.
  (#1) provide some more detailed tests for a number of functions.
  Removed date stub since this functinality is available in strftime anyway.
  (#2) fix is_string finally so it also makes sure numbers return false.
  (#2) unstub is_valid_domain_name
  Added doc strings for first five functions
  Removed join_with_prefix.
  (#2) unstub is_valid_mac_address.
  Allow sort for strings.
  Count functionality overlaps with size - so removing it.
  Removed crontab functions instead of unstubbing them.
  Removed load_variables. load_yaml is sufficient to solve this problem on its own.
  Remove is_valid_netmask instead of unstubbing. Doesn't seem like a sensible function on its own.
  (#2) unstub is_numeric function.
  ...
2011-08-08 16:58:40 -07:00
Ken Barber
aa27fc76c7 (#8797) Merge puppetlabs-functions into puppetlabs-stdlib
It was decided that maintaining puppetlabs-functions and
puppetlabs-stdlib was duplication as both are trying to
achieve the same goal.

This patch provides a merge of the puppetlabs-functions
into the puppetlabs-stdlib repository, with history
preservation.

The following conflicts were found and resolved:

* LICENSE file from functions was used as it aligns with
  ASL usage instructions and contains relevant copyright
  information:
  http://www.apache.org/licenses/LICENSE-2.0.html
* Used spec_helper.rb from functions - this is what
  Puppet core uses and doesn't break tests.
* Merged .gitignore and spec.opts options.
2011-08-05 10:31:46 +01:00
Ken Barber
1b73a66fc6 * Moved kwalify to puppetlabs-kwalify project
* Re-arranged tests in line with puppetlabs-stdlib
2011-08-05 08:46:38 +01:00
Ken Barber
681a1c7971 Prep for stdlib merge
* Renamed load_yaml & load_json to parseyaml & parsejson
* Renamed is_valid_* functions and remove the 'valid_'
2011-08-05 08:25:03 +01:00
Jeff McCune
4c93090e1a (#8792) Rename whole_line type to file_line
Without this patch the resource whole_line would be included in the
stable stdlib module shipping in PE 1.2.  Ideally the name will be
stable and unchanging in the future.

There was quite a bit of concern over whole_line being an unwise name.
file_line appears to be the most suitable name and least likely to need
another rename in the future.
2011-08-04 19:17:48 -07:00
Jeff McCune
ee1081571e Merge branch 'refactor/master/8665_whole_line'
* refactor/master/8665_whole_line:
  (#8665) Change type from append_line to whole_line
2011-08-04 17:58:05 -07:00
Jeff McCune
7393de9895 (#8678) Add validate_array and validate_string functions
The accounts module is making use of validate_array() and
validate_string() which do not exist int he stdlib module without this
patch.

This patch adds the two functions to the stdlib with unit tests.

Reviewed-by: Dan Bode
2011-08-04 16:05:39 -07:00
Jeff McCune
4725c97102 (#8717) Make merge() function work with Ruby 1.8.5
The previous behavior of the merge() function used Array#inject with two
arguments.  Ruby 1.8.5 only supports inject being used with one
argument.

This change initializes and empty Hash object and merges each argument
into the accumulator.  The last argument still "wins" in the merge.

rspec tests (cd spec; rspec **/*_spec.rb) verified as passing with this
change.

Reviewed-by: Dan Bode
2011-08-01 11:45:08 -07:00
Ken Barber
35fefe1865 Fix some ruby 1.9.2 issues. 2011-07-30 00:44:02 +01:00
Dan Bode
c4a13acafe (#8709) Add hash merging function
In Puppet, it is not possible to reassign hash
values.

This function allows a reasonable way to perform
hash munging in Puppet.

Reviewed-by: Jeff McCune
2011-07-29 15:28:21 -07:00
Dan Bode
b1beaec2da (#8708) Add has_key function
It is difficult to use existance of keys in a hash
as a boolean condition in Puppet (see #8705)

This function provides a working solution until
the underlying issue in Puppet can be resolved.

Reviewed-by: Jeff McCune
2011-07-29 15:11:10 -07:00
Ken Barber
a1cae426f1 (#3) Provide documentation for remaining functions. 2011-07-29 23:09:30 +01:00
Ken Barber
19313b43ea (#3) Apply missing documentation to more functions. 2011-07-29 22:18:56 +01:00
Ken Barber
f9634b7f9b Remove rand. 2011-07-29 22:08:09 +01:00
Ken Barber
aa023c1e5d Removed date stub since this functinality is available in strftime anyway. 2011-07-29 20:56:40 +01:00
Ken Barber
18e5302614 (#2) fix is_string finally so it also makes sure numbers return false. 2011-07-29 20:11:47 +01:00
Ken Barber
56a402e654 (#2) unstub is_valid_domain_name 2011-07-29 20:08:31 +01:00
James Turnbull
62520a2df0 Added doc strings for first five functions 2011-07-30 04:22:30 +10:00
Ken Barber
db7e06e301 Removed join_with_prefix. 2011-07-29 18:00:32 +01:00
Ken Barber
4080c0534e (#2) unstub is_valid_mac_address. 2011-07-29 17:55:45 +01:00
Ken Barber
ce48eb6e7a Allow sort for strings. 2011-07-29 00:10:31 +01:00
Ken Barber
7d6ae5d57c Count functionality overlaps with size - so removing it. 2011-07-28 21:30:02 +01:00
Ken Barber
4915eff575 Removed crontab functions instead of unstubbing them. 2011-07-28 21:23:53 +01:00
Ken Barber
a47853502d Removed load_variables. load_yaml is sufficient to solve this problem on its own. 2011-07-28 21:15:43 +01:00
Ken Barber
1a7bd1ae83 Remove is_valid_netmask instead of unstubbing. Doesn't seem like a sensible function on its own. 2011-07-28 21:10:33 +01:00
Ken Barber
313df566bf (#2) unstub is_numeric function. 2011-07-28 21:03:33 +01:00
Ken Barber
635ed82e5c (#2) - unstubbed is_valid_ip_address 2011-07-28 18:10:16 +01:00
Ken Barber
a55930368a (#2) - Added is_float and is_integer functionality. 2011-07-28 15:38:19 +01:00
Dan Bode
4540949d96 (#8665) Change type from append_line to whole_line
Changed the type name from append_line to
whole_line.

After feedback that having a type with a verb in
the name was confusing.
2011-07-27 15:28:44 -07:00
Jeff McCune
9560b6336c Merge branch 'ticket/master/8585_load_yaml_function'
* ticket/master/8585_load_yaml_function:
  (#8575) Add loadyaml() function
2011-07-26 15:46:23 -07:00