Commit graph

412 commits

Author SHA1 Message Date
Joshua Harlan Lifton
0798059361 Fixed typo 2012-11-19 08:44:44 -05:00
Jeff McCune
43dd606982 Merge branch 'feature/2.x/pick' into 2.x
* feature/2.x/pick:
  Add the pick() function
2012-11-15 08:56:52 -05:00
Gary Larizza
ba6dd13990 Add the pick() function
This function is similar to a coalesce function in SQL in that it will
return
the first value in a list of values that is not undefined or an empty
string
(two things in Puppet that will return a boolean false value).
Typically,
this function is used to check for a value in the Puppet
Dashboard/Enterprise
Console, and failover to a default value like the following:

  $real_jenkins_version = pick($::jenkins_version, '1.449')

The value of $real_jenkins_version will first look for a top-scope
variable
called 'jenkins_version' (note that parameters set in the Puppet
Dashboard/
Enterprise Console are brought into Puppet as top-scope variables), and,
failing that, will use a default value of 1.449.
2012-11-15 08:52:19 -05:00
Jeff McCune
f8635584a8 Merge branch 'add/2.x/13974-has_interface_with' into 2.x
* add/2.x/13974-has_interface_with:
  (#13974) Add predicate functions for interface facts
2012-11-07 14:03:08 -08:00
Wil Cooley
f8194176dc (#13974) Add predicate functions for interface facts
If one wishes to test if a host has a particular IP address (such as a floating
virtual address) or has an interface on a particular network (such as a
secondary management network), the facts that provide this information are
difficult to use within Puppet.

This patch addresses these needs by implementing functions
‘has_ip_address(value)’ and ‘has_ip_network(value)’. These functions look
through all interfaces for ipaddress_<interface> and network_<interface>
(respectively) having the requested <value>.

These functions are implemented on top of a lower-level predicate
function, ‘has_interface_with(kind, value)’, which iterates through the
interfaces in the ‘interfaces’ fact and checks the facts <kind>_<interface>
looking for <value>.

Additionally, the existence of a particular named interface can be checked for
by calling with only a single argument: has_interface_with(interface).

A Boolean is returned in all cases.
2012-11-07 14:00:44 -08:00
Jeff McCune
bf66ded063 Merge branch 'add/2.x/joejulian-add_uriescape' into 2.x
* add/2.x/joejulian-add_uriescape:
  Add function, uriescape, to URI.escape strings. Redmine #17459
2012-11-07 09:40:37 -08:00
Joe Julian
70f4a0e9ed Add function, uriescape, to URI.escape strings. Redmine #17459 2012-11-07 09:36:54 -08:00
Jeff McCune
cc670fb3b1 Merge branch '2.5.x' into 2.x
* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.1
2012-10-25 15:53:40 -07:00
Jeff McCune
1bb4c7a79e Update Modulefile, CHANGELOG for 2.5.1 2012-10-25 15:51:23 -07:00
Jeff McCune
f7baf36750 Merge branch '2.5.x' into 2.x
* 2.5.x:
  (maint) Fix spec failures resulting from Facter API changes
2012-10-25 15:39:27 -07:00
Jeff McCune
3f310ec874 Merge branch 'fix/2.5.x/facter_loader' into 2.5.x
* fix/2.5.x/facter_loader:
  (maint) Fix spec failures resulting from Facter API changes
2012-10-25 15:38:50 -07:00
Jeff McCune
97f836f41b (maint) Fix spec failures resulting from Facter API changes
Without this patch stdlib tests fail against Facter 2.x and master but
not 1.6.x.

This patch fixes the problem by initializing the example group
differently depending on the version of Facter integrating into the
system.  The adjusted methods are:

 1.x - Facter.collection.loader.load
 2.x - Facter.collection.load

The collection actually implements the load method in both version, it's
simply marked as private in 1.x.
2012-10-25 15:36:54 -07:00
Jeff McCune
88af331b0e Update Modulefile, CHANGELOG for 2.5.0 2012-10-25 11:03:27 -07:00
Jeff McCune
12a146058e Merge branch 'maint/2.5.x/pick_compatible_new_functionality' into 2.5.x
* maint/2.5.x/pick_compatible_new_functionality:
  Explicitly load functions used by ensure_resource
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params
2012-10-25 10:58:27 -07:00
Jeff McCune
c2573298a5 Merge branch 'maint/2.5.x/pick_explicitly_load_functions' into maint/2.5.x/pick_compatible_new_functionality
* maint/2.5.x/pick_explicitly_load_functions:
  Explicitly load functions used by ensure_resource
2012-10-25 10:57:45 -07:00
Dan Bode
9fc3063ea9 Explicitly load functions used by ensure_resource
The ensure_resource function actually calls two
other functions, create_resources and defined_with_param.

When calling Puppet functions from Ruby, you sometimes have
to load the functions manually if they have not been called
before.

This commit explicitly loads the functions that ensure_resource
depends on from within the function.
2012-10-25 10:57:40 -07:00
Jeff McCune
699d520e72 Merge branch 'maint/2.5.x/pick_pr86_ensure_resource' into maint/2.5.x/pick_compatible_new_functionality
* maint/2.5.x/pick_pr86_ensure_resource:
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params
2012-10-25 10:54:39 -07:00
Dan Bode
444393bf6b re-formatting
This commit refactors to ensure 80 character lines.
2012-10-25 10:54:33 -07:00
Dan Bode
97d327ae44 Add better docs about duplicate resource failures
This commit adds better inline documentation
explaining how replicate resource definitions can
occur if the resource exists and does not have
matching parameters.
2012-10-25 10:54:33 -07:00
Dan Bode
4f8b133917 Handle undef for parameter argument
This commit adds better handling of the case where
undef is passed as the parameter value.

This works by converting '' into []
2012-10-25 10:54:33 -07:00
Dan Bode
a0cb8cdee4 Add function ensure_resource and defined_with_params
This commit adds 2 new functions with unit tests.

defined_with_params works similarily to puppet's defined
function, except it allows you to also specify a hash of
params. defined_with_params will return true if a resource
also exists that matches the specified type/title (just like
with defined) as well as all of the specified params.

ensure_resource is a function that basically combines defined_with_params
with create_resources to conditionally create resources only if the
specified resource (title, type, params) does not already exist.

These functions are created to serve as an alternative to using
defined as follows:

    if ! defined(Package['some_package']) {
      package { 'some_package': ensure => present,
    }

The issue with this usage is that there is no guarentee about
what parameters were set in the previous definition of the package
that made its way into the catalog.

ensure_resource could be used instead, as:

    ensure_resource('package', 'some_package', { 'ensure' => 'present' })

This will creat the package resources only if another resource does
not exist with the specified parameters.
2012-10-25 10:54:33 -07:00
Jeff McCune
9693c04c9d Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
This reverts commit d6d23b495c.

This backwards-compatible additional functionality is targeted at the
next minor release.  There are already backwards-incompatible changes in
the master branch so we need to establish a new minor branch.
2012-10-25 10:46:57 -07:00
Jeff McCune
d6d23b495c Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
This reverts commit 74e6411157, reversing
changes made to 417d219aa6.

Here's why:

Actually... I just screwed this up.

I merged this new fact into 2.4.x but it's not fixing any bug. It's adding a
new fact, so this should go into master and we should release 2.5 since this is
new, backwards-compatible functionality.
2012-10-25 10:41:52 -07:00
Jeff McCune
74e6411157 Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x
* haus-add_pe_facts_to_stdlib:
  Prevent undefined method `split' for nil:NilClass with pe_foo_version facts
  (maint) Clear all facts before each example
  Add spec tests for pe_version facts
  Add PE facts to stdlib
2012-10-25 10:06:02 -07:00
Jeff McCune
e68677976b Prevent undefined method `split' for nil:NilClass with pe_foo_version facts
Without this patch the pe_major_version, pe_minor_version, and
pe_patch_version facts directly depend on the pe_version fact in a
manner that calls split directly on the return value.

This is a problem because Fact values are not always guaranteed to
return strings, or objects that respond to split.  This patch is a
defensive measure to ensure we're always calling the split method on a
string object.

If the Fact returns nil, this will be converted to an empty string
responding to split.
2012-10-25 10:00:45 -07:00
Jeff McCune
ba70a3885a (maint) Clear all facts before each example
Without this patch example groups must explicitly call `Facter.clear` to
clear any cached values between examples.  This is a problem because
this behavior is not the concern of the example groups, the behavior is
the concern of the spec_helper or whatever facility we have in place to
initialize the system for testing.

This patch fixes the problem by duplicating the logic in the Facter
spec_helper to ensure facts are cleared out before each example.

This patch requires the example groups to explicitly load the facts they
require if the fact name does not match the filename.
2012-10-24 17:23:42 -07:00
Matthaus Owens
4442f1edb5 Add spec tests for pe_version facts
This commit adds some basic spec tests for the pe_version facts. There are
basic postitive and negative cases.
2012-10-24 17:23:42 -07:00
Matthaus Owens
cdf3b05f35 Add PE facts to stdlib
As many PE modules have PE specific functionality, but are deployed to all
nodes, including FOSS nodes, it is valuable to be able to selectively enable
those PE specific functions. These facts allow modules to use the is_pe fact to
determine whether the module should be used or not. The facts include is_pe,
pe_version, pe_major_version, pe_minor_version, and pe_patch_version. For PE
2.6.0 those facts would have values true, 2.6.0, 2, 6, and 0, respectively.
2012-10-24 17:23:42 -07:00
Jeff McCune
417d219aa6 Merge branch '2.3.x' into 2.4.x
* 2.3.x:
  Disable tests that fail on 2.6.x due to #15912
2012-08-20 14:24:41 -07:00
Jeff McCune
d2798b721a Merge branch '2.2.x' into 2.3.x
* 2.2.x:
  Disable tests that fail on 2.6.x due to #15912
2012-08-20 14:24:23 -07:00
Jeff McCune
73261f14ad Merge branch '2.1.x' into 2.2.x
* 2.1.x:
  Disable tests that fail on 2.6.x due to #15912

Conflicts:
	spec/unit/puppet/parser/functions/getvar_spec.rb
	spec/unit/puppet/parser/functions/has_key_spec.rb
	spec/unit/puppet/parser/functions/merge_spec.rb
2012-08-20 14:24:08 -07:00
Jeff McCune
8fdd59547d Merge branch 'fix/2.1.x/disable_puppet26_failing_tests' into 2.1.x
* fix/2.1.x/disable_puppet26_failing_tests:
  Disable tests that fail on 2.6.x due to #15912
2012-08-20 14:22:40 -07:00
Jeff McCune
c81496ef5e Disable tests that fail on 2.6.x due to #15912
In Puppet 2.6.x there is a bug where a function may be incorrectly detected as
an rvalue when it is not, or not detected when it is. This means that in tests
the correct syntax for calling a function will be rejected. This disables
those tests on 2.6.x, as there is no straightforward way to write them to be
compatible with both 2.6.x and newer versions of Puppet.

Conflicts:
	spec/unit/puppet/parser/functions/getvar_spec.rb
	spec/unit/puppet/parser/functions/has_key_spec.rb
	spec/unit/puppet/parser/functions/merge_spec.rb

This patch was constructed by cherry-picking e27eccb and resolving the
merge conflicts to only include the `pending` statements.  This resolves
the problem by disabling these tests in Puppet 2.6.
2012-08-20 14:21:12 -07:00
Jeff McCune
0f45feb31b Merge branch '2.3.x' into 2.4.x
* 2.3.x:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root
2012-08-20 14:04:15 -07:00
Jeff McCune
607cb54275 Merge branch '2.2.x' into 2.3.x
* 2.2.x:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root
2012-08-20 14:04:03 -07:00
Jeff McCune
a8a4f93992 Merge branch '2.1.x' into 2.2.x
* 2.1.x:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root

Conflicts:
	spec/unit/puppet/parser/functions/getvar_spec.rb
	spec/unit/puppet/parser/functions/has_key_spec.rb
	spec/unit/puppet/parser/functions/merge_spec.rb
2012-08-20 14:03:48 -07:00
Jeff McCune
3f44686f1c Merge branch 'fix/2.1.x/spec_failures' into 2.1.x
* fix/2.1.x/spec_failures:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root
2012-08-20 14:01:56 -07:00
Jeff McCune
44929130f9 (Maint) Fix mis-use of rvalue functions as statements
Without this patch applied the spec tests are invalid because they call
rvalue functions as if they were statements.  This is a problem because
Puppet 2.7.x currently throws an exception if a rvalue function is
invoked as if it were a statement function.  This exception from Puppet
is causing tests to fail.

This patch fixes the problem by changing the tests to assign the return
value of the functions to a variable.  This fixes the problem by
invoking the functions properly.

Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-08-20 13:57:09 -07:00
Jeff McCune
88789e887c Add .rspec file to repo root
Without this patch we don't get an opinionated rspec behavior.  This
patch makes the behavior of `rake test` and `rspec spec/` opinionated
by including some default options.
2012-08-20 11:49:45 -07:00
Jeff McCune
46daf0fb6d Update Modulefile, CHANGELOG for 2.4.0 2012-08-14 10:18:42 -07:00
Jeff McCune
77262494b3 Merge branch 'feature/2.4.x/backport_file_line_match_pr75' into 2.4.x
* feature/2.4.x/backport_file_line_match_pr75:
  Add support for a 'match' parameter to file_line
2012-08-14 10:08:41 -07:00
Chris Price
a06c0d8115 Add support for a 'match' parameter to file_line
This commit adds a new parameter called "match"
to the file_line resource type, and support for
this new parameter to the corresponding ruby
provider.

This parameter is optional; file_line should work
just as before if you do not specify this parameter...
so this change should be backwards-compatible.

If you do specify the parameter, it is treated
as a regular expression that should be used when
looking through the file for a line.  This allows
you to do things like find a line that begins with
a certain prefix (e.g., "foo=.*"), and *replace*
the existing line with the line you specify in your
"line" parameter.  Without this capability, if you
already had a line "foo=bar" in your file and your
"line" parameter was set to "foo=baz", you'd end up
with *both* lines in the final file.  In many cases
this is undesirable.
2012-08-14 09:55:30 -07:00
Jeff McCune
f308851188 Merge branch 'feature/2.4.x/to_bytes_function' into 2.4.x
* feature/2.4.x/to_bytes_function:
  (#15872) Add to_bytes function
2012-08-14 08:47:41 -07:00
Erik Dalén
247b69cbc0 (#15872) Add to_bytes function
Converts a string like "2 MB" to the value in bytes. Useful for
comparisons on facts that return a human readable number instead of
machine readable.
2012-08-14 08:43:36 -07:00
Jeff McCune
deafe88e02 (Maint) use PuppetlabsSpec::PuppetInternals.scope (master)
This patch is the same approach as the one that want into 2.3.x.  It
covers the functions in master that do not exist in 2.3.x.

Without this patch all of the spec tests for parser functions in stdlib
would instantiate their own scope instances.  This is a problem because
the standard library is tightly coupled with the internal behavior of
Puppet.  Tight coupling like this creates failures when we change the
internal behavior of Puppet.  This is exactly what happened recently
when we changed the method signature for the initializer of
Puppet::Parser::Scope instances.

This patch fixes the problem by creating scope instances using the
puppet labs spec helper.  The specific method that provides scope
instances in Puppet-version-independent way is something like this:

    let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

This patch simply implements this across the board.

Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-08-10 11:54:44 -07:00
Patrick Carlisle
bb1afc311c Merge branch '2.3.x' into 2.4.x
* 2.3.x:
  Disable tests that fail on 2.6.x due to #15912
2012-08-10 11:52:40 -07:00
Patrick Carlisle
b93a38c005 Merge branch '2.2.x' into 2.3.x
* 2.2.x:
  Disable tests that fail on 2.6.x due to #15912
2012-08-10 11:52:03 -07:00
Patrick Carlisle
e27eccb356 Disable tests that fail on 2.6.x due to #15912
In Puppet 2.6.x there is a bug where a function may be incorrectly detected as
an rvalue when it is not, or not detected when it is. This means that in tests
the correct syntax for calling a function will be rejected. This disables
those tests on 2.6.x, as there is no straightforward way to write them to be
compatible with both 2.6.x and newer versions of Puppet.
2012-08-10 11:43:36 -07:00
Patrick Carlisle
cdd4529833 Merge branch '2.3.x' into 2.4.x
* 2.3.x:
  Make sure functions are loaded for each test
  Use rvalue functions correctly
  (Maint) Don't mock with mocha
  (Maint) Fix up the get_module_path parser function
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines
  Update CHANGELOG, Modulefile for 2.3.3
  fix regression in #11017 properly
  Fix spec tests using the new spec_helper
  Update CHANGELOG for 2.3.2 release
  Make file_line default to ensure => present
  Memoize file_line spec instance variables
  Fix spec tests using the new spec_helper
  Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
  (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-08-09 14:52:08 -07:00
Patrick Carlisle
424b56da61 Make sure functions are loaded for each test
The test_helper code in Puppet now resets function state between each test.
This patch fixes two spec files where the function was not actually loaded in
the tests, causing them to fail.
2012-08-09 14:51:37 -07:00