Commit graph

436 commits

Author SHA1 Message Date
Mathias Klette
e96a818782 catch and rescue from looking up non-existent facts when looking for 'kind'
facter (2.x) only provides facts without interface suffix for
 * ipaddress
 * netmask

'macaddress' and 'network' facts will always have the related interface
name appended. in turns lookupvar throws errors when strict_variables is
enabled.
2015-06-24 15:02:02 +02:00
Tomas Doran
212c498df3 Also catch :undefined_variable as thrown by future parser 2015-06-05 12:43:01 +01:00
Hunter Haugen
ad4ca4cc34 Fix time() on 1.8.7
The time() function takes an argument of a timezone, and always returns
time in epoch format. The epoch format is the number of seconds that
have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
seconds. This means that it is universally the same regardless of
timezones.

I don't know what the timezone argument is supposed to do, and it is not
documented. So lets just make 1.8.7 work like > 1.8.7
2015-06-04 09:40:52 -07:00
Eli Young
d7c8460353 fqdn_rotate: Improve documentation 2015-06-01 16:19:07 -07:00
Eli Young
601f681787 fqdn_rotate: Don't use the value itself as part of the random seed
Previously, the random number generator was seeded with the array or
string to be rotated in addition to any values specifically provided for
seeding. This behavior is potentially insecure in that it allows an
attacker who can modify the source data to choose the post-shuffle
order.
2015-06-01 16:19:07 -07:00
David Schmitt
f3e79ddcd5 Convert tests to use plain rspec-puppet
Tests in the new style produces the following documentation output:

abs
  should not eq nil
  should run abs() and raise an Puppet::ParseError
  should run abs(-34) and return 34
  should run abs("-34") and return 34
  should run abs(34) and return 34
  should run abs("34") and return 34
2015-06-01 18:02:22 +01:00
Igor Galić
687600c30c simplify mac address regex
let the computer do the counting and repetition and case
2015-05-29 20:13:21 +02:00
David Schmitt
4a8c0a57f2 Merge pull request #463 from CENGN/fix/master/file_line_multiple_after
(MODULES-2071) Patch file_line provider to use multiple with after
2015-05-29 10:21:41 +01:00
Raymond Maika
72089f3d13 (MODULES-2071) Refactor file_line provider to contain logic to handle parameter multiple in function handle_create_with_after
Without this, file_line resource without the `match` parameter but with the `after` param will throw an error if there are multiple matches for the after expression. This patch creates the handling for the `multiple` parameter in handle_create_with_after. This allows you to add a line after the `after` expression if it appears at multiple points in a file.

Updated reference to `file_line` in the README to reflect that the multiple parameter can be set when using `after` and/or `match` as the matching regex.
2015-05-29 00:30:44 -04:00
David Schmitt
cf9f7a6b7e validate_integer, validate_numeric: explicitely reject hashes in arrays
Without this patch, Ruby 1.8's Hash#to_s behaviour causes [{1=>2}] to be
treated as "12" when validating values.
2015-05-27 20:05:05 +01:00
David Schmitt
0dc0e0dbcf fqdn_rotate: reset srand seed correctly on old ruby versions
Without this, the global seed is reseeded on every use
of fqdn_rotate, which is a waste. Older rubies might even use a
time-base seed which adversly impacts the quality of the RNG.
2015-05-26 14:25:43 +01:00
Eli Young
3b8ded184d (FM-2130) Document new location of facts.d cache 2015-05-11 11:12:15 -07:00
David Schmitt
f49eb6b8e2 range(): fix TypeError(can't convert nil into Integer) when using range syntax 2015-05-06 10:13:27 +01:00
David Schmitt
cf251303be Merge pull request #447 from elyscape/fix_range
Restore removed functionality to range()
2015-05-06 09:48:31 +01:00
Eli Young
25ed4b43c4 range: Clean up and clarify function contents 2015-05-05 16:06:35 -07:00
Eli Young
8cf011d7a2 Revert "range: remove dead code"
This reverts commit 063c58a992, which
actually removed non-dead code. Specifically, it removed the ability to
make calls such as `range('2..3')`, `range('2...3')`, and
`range('2-3')`.

cf. https://github.com/puppetlabs/puppetlabs-stdlib/pull/443#commitcomment-11055565
2015-05-05 16:06:08 -07:00
Eli Young
7d7e905b54 pw_hash: Fix functionality on JRuby < 1.7.17
The previous change to this function broke it on JRuby before 1.7.17 by
attempting to use a variable that wasn't defined (`salt`). To fix this,
define `salt` ahead of time and use that instead of building the salt
later.

cf. https://github.com/puppetlabs/puppetlabs-stdlib/pull/443#discussion_r29718588
2015-05-05 15:53:34 -07:00
David Schmitt
d4f3d57f16 validate_augeas: fix URL to docs 2015-05-05 13:55:18 +01:00
David Schmitt
063c58a992 range: remove dead code
Since a ParseError is always thrown for zero arguments, the if and all
dependent code can be removed.
2015-05-05 13:30:57 +01:00
David Schmitt
9bae8356fd pw_hash: avoid ruby magic when running on java 2015-05-05 13:30:57 +01:00
David Schmitt
c27513463d fqdn_rand_string: fix argument error message 2015-04-17 14:24:40 -07:00
Morgan Haskel
8a1d1e2f34 Merge pull request #314 from amateo/feature/loadyaml_check_file
Check if file exists before loading with loadyaml. If not, return nil
2015-04-16 10:48:10 -07:00
Morgan Haskel
5ee6e960f6 Merge pull request #431 from bmjen/file-line-refactor
File_line checks provided after param if no match is found
2015-04-09 16:47:34 -07:00
Travis Fields
0af0d7e539 Add spec tests and pulled in PR #427
Changed append line to open in 'w' mode and have to rewrite lines in order to append new line
2015-04-09 15:24:39 -07:00
Bryan Jen
35303ce0f7 file_line honors after if match not found. 2015-04-09 14:44:52 -07:00
Gerrard Geldenhuis
ee2225b63c Clarifying behaviour of attributes and adding an extra example. 2015-04-09 11:13:42 -07:00
Hunter Haugen
8fba5c058b Merge pull request #405 from elyscape/feature/fqdn_rand_strings
(MODULES-1715) Add FQDN-based random string generator
2015-04-09 10:45:38 -07:00
Eli Young
23be4020dd (MODULES-1737) Add pw_hash() function 2015-04-05 17:21:17 -07:00
Eli Young
a82266c256 (MODULES-1715) Add fqdn_rand string generators 2015-03-31 17:33:04 -07:00
Rod Montgomery
ee13438d2a If present, top-level domain must be alphabetic
See RFC 1123, Section 2.1
http://tools.ietf.org/html/rfc1123#section-2
2015-03-05 21:51:12 -06:00
TP Honey
bf8e5b0573 Merge pull request #422 from cyberious/assert_private
Assert private
2015-03-05 19:15:41 +00:00
Travis Fields
4a68b224c4 Add private function back and forward to assert_private with deprecation warning 2015-03-05 11:12:51 -08:00
Hunter Haugen
668b3c31b5 Merge pull request #369 from rfugina/dirname_typecheck
Dirname typecheck
2015-03-05 11:00:36 -08:00
Franz Pletz
56d815bcfc Rename private() to assert_private()
As mentioned in #270, private is a reserved keyword in the future parser
which is to be released with Puppet 4. As it stands, this function is
not useable with the future parser so it needs to renamed.

This is a breaking change.
2015-03-05 10:59:31 -08:00
Hunter Haugen
41965fd2c9 Merge pull request #375 from poikilotherm/feature/master/validate_integer_and_numeric
(MODULES-560) Add new functions validate_numeric() and validate_integer().
2015-03-05 10:57:43 -08:00
Stefan Goethals
0236cd51bc Add support for hashes in the prefix function
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2015-03-03 16:20:55 -08:00
Bryon Roché
41baef8502 URI.escape for the array case was incorrect.
The previous commit to uriescape() changed the implementation to use the ruby default escape list for URI.escape(), but did not change the call triggered when uriescape() was called on an array, triggering ruby errors.
2015-03-03 16:05:47 -08:00
Morgan Haskel
055083c117 Merge pull request #407 from adamcrews/ceiling_function
Add a ceiling function to complement the floor function.
2015-03-03 15:59:06 -08:00
Travis Fields
85e81f9bdf Loosen the restrictions of upcase and allow for recursion of the objects and only worry if the object responds to upcase 2015-03-02 10:45:43 -08:00
Travis Fields
419f51bdd9 Fix issue with Ruby 1.8.7 which did not allow for the return in an each_pair of the hash 2015-02-26 10:13:28 -08:00
Travis Fields
7021b1f55c Add Hash to upcase 2015-02-25 11:39:27 -08:00
Morgan Haskel
b693c870d2 Check for string before copying 2015-02-19 12:01:26 -08:00
Sean Millichamp
1321d586a8 (MODULES-1771) Don't modify input to is_domain_name()
Fix is_domain_name() so it dup's its incoming argument
to avoid changing the original with a later chomp!
2015-02-14 10:49:26 -05:00
Eli Young
84f866ffaf (MODULES-1738) Don't modify global seed in fqdn_rotate()
As per puppetlabs/puppet@292233c, this leaves the global seed in a
deterministic state, which is bad. Puppet::Util.deterministic_rand()
exists to avoid running into this issue, but is only present starting in
Puppet 3.2.0.
2015-02-12 14:04:47 -08:00
Adam Crews
53b1802a92 Add a ceiling function to complement the floor function. 2015-02-01 22:46:16 -08:00
Travis Fields
b11311ad65 FM-2130 Move cache file to non temp directory 2015-01-13 16:50:27 -08:00
Hunter Haugen
7c8ae311ca (MODULES-1473) Deprecate type() function for new parser
The `type()` function will cease to work on the new parser because 'type'
is a reserved keyword. The `type3x()` function may be used to continue
similar functionality, but will be deprecated in favor of the built-in
typing system.

The `type_of()` function has been included to introspect types in the
new parser.
2015-01-07 16:40:06 -08:00
Travis Fields
4700f16e82 Merge pull request #336 from mklette/master
ensure_resource: be more verbose in debug mode
2015-01-02 12:27:33 -08:00
Travis Fields
f6e20d2068 Update docs to reflect new behavior of delete function taking array in second argument 2014-12-19 10:41:07 -08:00
Travis Fields
8ec6f8dbfd MODULES-1606 add ability to pass array to delete for items to delete 2014-12-19 10:26:01 -08:00
Hunter Haugen
1ae0a10707 Merge pull request #388 from mhaskel/merge_4.5.x_into_master
Merge 4.5.x into master
2014-12-18 15:55:33 -08:00
Peter Souter
b3d007f1da (MODULES-1582) Improve % detection
Avoids any validate commands that have %'s in them other than "... % ..."
2014-12-18 23:35:24 +00:00
Peter Souter
165caa8be1 (MODULES-1582) Initial spike for % placeholder
This simply `gsub`'s the file path into where the % placeholder is.
2014-12-18 23:08:33 +00:00
Morgan Haskel
696c89de99 Merge pull request #372 from poikilotherm/feature/master/validate_absolute_path_allow_arrays
Allow array of pathes in validate_absolute_path
2014-12-17 14:19:30 -08:00
Morgan Haskel
841b0df210 Merge pull request #368 from rfugina/basename
Basename implementation
2014-12-17 11:00:23 -08:00
Rob Fugina
2a3babc348 Added type checks for dirname(), and additional tests 2014-12-17 12:55:48 -06:00
Rob Fugina
ef3d42f7bb Added basename() based on Ruby's File.basename
Based on dirname code.  Includes RSpec tests and docs.
2014-12-17 12:39:40 -06:00
Hunter Haugen
c6c203fca8 Remove line match validation
The `match` attribute was validated to match `line`, except that in many
cases (even the example given in the docs) a user would want to match a
line entirely different from the new line.

See comments on the original commit
a06c0d8115
and ask
https://ask.puppetlabs.com/question/14366/file_line-resource-match-problems/
for further examples of confusion.
2014-12-16 15:05:31 -08:00
Oliver Bertuch
3053427829 Fixing ruby 1.8 support. 2014-12-05 08:51:40 +01:00
Oliver Bertuch
260c1f4b92 Add new functions validate_numeric() and validate_integer(). 2014-12-04 22:33:15 +01:00
Peter Souter
84bd98645f (MODULES-444) - Real meat of the change
This is the core change, we now go through the array and add it to the first element, instead of just two arguments.
2014-12-04 14:34:25 +00:00
Peter Souter
594c2dd38d (MODULES-444) Change argument restriction to < 2 2014-12-04 14:33:23 +00:00
Peter Souter
75a6186512 (MODULES-444) Update docs with new functionality 2014-12-04 14:32:39 +00:00
Oliver Bertuch
89995e4db0 Allow array of pathes in validate_absolute_path 2014-11-25 12:45:23 +01:00
Morgan Haskel
c5467cc507 Need to convert strings and fixnums to arrays 2014-11-17 12:27:05 -08:00
Hunter Haugen
fb42396c75 Merge pull request #319 from Spredzy/member_array_in_array
(MODULES-1329) Allow member to look for array
2014-11-13 12:27:14 -08:00
Hunter Haugen
b6830f1ade Merge pull request #365 from dalen/range-integers
Make the range function work with integers
2014-11-13 10:16:21 -08:00
Yanis Guenane
c9f906f803 (MODULES-1329) Allow member function to look for array
Currently, the member function allows one to only find if a variable
is part of an array. Sometimes it is useful to find if an array is part
of a bigger array for validation purpose.
2014-11-12 14:40:34 -05:00
Erik Dalén
ce995e15d5 Make the range function work with integers
This is needed for the future parser which actually treats numbers as
numbers and strings as strings. With this patch you can use range(1,5)
instead of having to quote them like range('1','5').
2014-11-12 16:02:05 +01:00
Erik Dalén
e61f402283 (maint) Fix indentation of range function 2014-11-12 15:52:33 +01:00
Hunter Haugen
4949cfd21c Fix breaking out of .each loop
And some other small formatting fixes that don't belong in this patch.
2014-11-10 16:37:53 -08:00
Travis Fields
c52e262a17 Catch :undefined_variable thrown when Future Parser is enabled with 3.7.x 2014-11-10 16:33:18 -08:00
Morgan Haskel
850297b560 Merge pull request #354 from puppetlabs/4.3.x
4.3.x
2014-11-10 11:10:41 -08:00
Travis Fields
406e9dbda2 Merge pull request #343 from zacharyalexstern/fix_to_bytes
Added correct converstions for PB and EB.
2014-11-07 13:42:48 -08:00
Morgan Haskel
03f0ecd128 Merge pull request #350 from cyberious/modules1413
MODULES-1413 Add ability for member to take numeric objects
2014-11-04 15:29:25 -08:00
Travis Fields
f19aea5a75 MODULES-1413 Ability to for future parser to use member with FixNum types 2014-11-04 14:33:34 -08:00
Travis Fields
35c2dc7ca3 Merge branch '4.3.x' 2014-10-30 10:23:12 -07:00
Travis Fields
6c7da72c0f Fix validate_cmd, previous addition of SystemCallError only works for Puppet 3.7, previous version throw different exception. Wrapping in generic Exception catch all 2014-10-29 20:03:07 -07:00
Travis Fields
12f734476c Merge remote-tracking branch 'origin/4.3.x' 2014-10-29 12:52:52 -07:00
Travis Fields
328aae223f Add proper exception catching of Windows errors when CreateProcess does not succeed 2014-10-29 11:47:57 -07:00
Travis Fields
a6f3f781d1 Merge remote-tracking branch 'origin/4.3.x' back to master 2014-10-28 15:31:37 -07:00
Travis Fields
51f1d574d9 Fix testcases for Future Parser and resolve issue with values_at in assuming that it was dealing with a string 2014-10-28 15:27:24 -07:00
Zachary Alex Stern
9295d0d5ca Added correct converstions for PB and EB.
* We were converting Exabytes to bytes as Petabytes.
 * Updated tests to cover ever unit.
 * Added note that we're going by the old, inaccurate definitions of
   Kilobytes, Megabytes, etc, in that we treat them as powers of 2.
2014-10-28 13:14:06 -07:00
Travis Fields
9dea092979 Merge branch '4.3.x', add tempfile back for resource validate_cmd and validate_augeas 2014-10-24 16:41:05 -07:00
Travis Fields
624ccbd22c add require 'tempfile' to resolve a previously autorequired resource 2014-10-24 16:35:34 -07:00
Travis Fields
f0b207c035 Merge branch '4.3.x'
Conflicts:
	README.markdown
	lib/puppet/parser/functions/has_interface_with.rb
2014-10-24 14:30:01 -07:00
Mathias Klette
0d11bde507 ensure_resource: be more verbose in debug mode
helps discovering duplication issues, especially when figthing boolean vs. string arguments
2014-10-10 22:57:26 +02:00
Morgan Haskel
0c0f7e13cd Merge pull request #262 from tremble/MODULES-707
Modules 707
2014-10-09 13:33:06 -04:00
Travis Fields
8ad7f68eca ENTERPRISE-281 fixes issue with has_interfaces and case mismatch causing us not to return some interfaces 2014-10-08 10:14:10 -07:00
Tomas Doran
032f93af1d Fix strict_variables = true 2014-09-22 14:43:27 -07:00
Mark Chappell
23bc7d51bd Re-use existing str2bool code rather than doing a copy and paste 2014-09-22 19:49:50 +02:00
Mark Chappell
e2d7f3bb89 (MODULES-707) chomp() fails because generate() no longer returns a string
We need to use

  unless value.is_a?(String) || value.is_a?(Array)

rather than

  klass = value.class
  unless [String, Array].include?(klass)

because the klass version enforces type checking which is too strict, and does
not allow us to accept objects wich have extended String (or Array).

For example, generate() function now returns Puppet::Util::Execution::ProcessOutput
which is just a very simple extension of String.  While this in it's self was
not intentional (PUP-2306) it is not unreasonable to cope with objects which
extend Strings
2014-09-22 19:49:50 +02:00
Travis Fields
acf435d1ce MODULES-1248 Fix issue with not properly counting regex matches with legacy versions of ruby 2014-09-16 13:41:39 -07:00
Alexander Pánek
6631934df8 Note that also future parser does not work 2014-09-16 19:03:02 +02:00
Alexander Pánek
448e66b8bb Updated docs of validate_string to reflect bug
See: https://tickets.puppetlabs.com/browse/MODULES-457
2014-09-16 17:55:26 +02:00
Angel L. Mateo
b9560df899 Check if file exists before loading with loadyaml. If not, return nil 2014-09-02 11:35:42 +02:00
Hunter Haugen
2ba0e375e2 Merge branch '4.3.x' 2014-08-05 10:55:58 -07:00
Colleen Murphy
85d5eadbab Concatenate arrays without modifying the first array 2014-07-31 11:22:18 -07:00
Thomas Linkin
9fd13be825 (MODULES-1221) Add file_line autorequire documentation
This commit adds additional documentation to the file_line resource
explaining how it will autorequire file resources when present.
2014-07-16 11:45:36 -04:00
Travis Fields
64f0ae2269 Increase resilience if lookup var comes back with nil object 2014-06-23 22:47:03 -07:00