Age | Commit message (Collapse) | Author |
|
|
|
'hkenney-ticket/master/2157_remove_facts_dot_d'""""
This reverts commit 2885d314b61055d20d85d36a68214f7d9e1e6ac6.
No, really. Keep the !@#$% integration branches around so we don't have
this revert nightmare again.
|
|
* 3.1.x:
Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
|
|
'hkenney-ticket/master/2157_remove_facts_dot_d'"""
This reverts commit 8fc00ea5b6b39b220ebc6391489915dbeeb364ab.
I really wish we could get this right.
Without this patch there is no branch that contains backwards-comaptible
new functionality relative to the current 3.0.1. There are only
branches that contain backwards-incompatible functionality relative to
3.0.1.
This is a problem because I need to do a release of stdlib that contains
backwards compatible facts but does not contain any breaking changes.
This patch fixes the problem by establishing the 3.1.x branch. This
branch will then revert the backwards incompatible changes from the
3.1.x branch and revert the revets in the 4.x and master branches.
I'll review our merge process, but it seems wrong that there is no place
to separate out incompatible from compatible changes when working beyond
the most recent patch release.
|
|
* 2.5.x:
Update Modulefile, CHANGELOG for 2.5.0
Conflicts:
CHANGELOG
Modulefile
|
|
|
|
* 2.5.x:
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
|
|
* 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
|
|
maint/2.5.x/pick_compatible_new_functionality
* maint/2.5.x/pick_explicitly_load_functions:
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.
|
|
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
|
|
This commit refactors to ensure 80 character lines.
|
|
This commit adds better inline documentation
explaining how replicate resource definitions can
occur if the resource exists and does not have
matching parameters.
|
|
This commit adds better handling of the case where
undef is passed as the parameter value.
This works by converting '' into []
|
|
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.
|
|
* 2.5.x:
Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
|
|
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e.
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.
|
|
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e.
Why? Because this change set should actually be in master and our
merge-up process reverted the change set in master when I reverted from
2.4.x.
This patch reverts the revert, restoring the original change set.
|
|
* 2.4.x:
Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
|
|
This reverts commit 74e6411157b8df1af9a24c17971e3236f3096529, reversing
changes made to 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd.
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.
|
|
* 2.4.x:
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
Conflicts:
spec/spec_helper.rb
|
|
* 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
|
|
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.
|
|
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.
|
|
This commit adds some basic spec tests for the pe_version facts. There are
basic postitive and negative cases.
|
|
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.
|
|
* 3.x:
(Maint) Remove core function documentation from README
Conflicts:
README.markdown
|
|
* 3.0.x:
(Maint) Remove core function documentation from README
|
|
* bug/3.0.x/remove_core_function_docs:
(Maint) Remove core function documentation from README
|
|
Without this patch the README contains the documentation for core
functions shipped in Puppet in addition to the functions shipped in
stdlib.
This is a problem because it's confusing for end users trying to get
started with puppet.
This patch makes it so only the stdlib functions are included.
|
|
Fix some logical inconsistencies in README
|
|
|
|
* 3.x:
Disable tests that fail on 2.6.x due to #15912
|
|
* 3.0.x:
Disable tests that fail on 2.6.x due to #15912
|
|
* 2.4.x:
Disable tests that fail on 2.6.x due to #15912
|
|
* 2.3.x:
Disable tests that fail on 2.6.x due to #15912
|
|
* 2.2.x:
Disable tests that fail on 2.6.x due to #15912
|
|
* 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
|
|
* fix/2.1.x/disable_puppet26_failing_tests:
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.
|
|
* 3.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
|
|
* 3.0.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
|
|
* 2.4.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
|
|
* 2.3.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
|
|
* 2.2.x:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
|
|
* 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
|
|
* fix/2.1.x/spec_failures:
(Maint) Fix mis-use of rvalue functions as statements
Add .rspec file to repo root
|
|
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>
|
|
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.
|
|
* 3.x:
(#14422) Update README to include the bug tracker URL.
|