summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | | | Modified the behavior of Puppet::Resource::Status as follows:Paul Berry2010-12-174-11/+62
| | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - #change_count now only counts events that represent successful changes. It does not count failures, audits, or noops. - #changed is equivalent to #change_count > 0. - #out_of_sync_count (a new attribute) counts all events except audits. - #out_of_sync is equivalent to #out_of_sync_count > 0. This should hopefully make the summary statistics in reports more useful.
| | | | | * / / / / / / (#5408) Reworked ResourceHarness so that code is clearer and all behaviors ↵Paul Berry2010-12-178-680/+264
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are tested This patch removes the Puppet::Transaction::Change class and replaces it with a method, Puppet::Transaction::ResourceHarness#apply_parameter. The new code is shorter, more thoroughly unit tested, and addresses known bugs in the interaction between auditing and performing changes. This code does not address drawbacks in the report output (for example a resource is still flagged as changed even if it merely contains audit information); those will be addressed in a follow-up patch.
| | | | * | | | | | | Merge branch 'ticket/2.6.next/5493' into 2.6.nextNick Lewis2010-12-1615-91/+77
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | (#5493) Add report_format, puppet_version, and configuration_version to ReportsNick Lewis2010-12-1613-58/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current report formats are: 0: 0.25 reports and earlier 1: 0.26.1 - 0.26.4 reports 2: 0.26.5 and beyond Paired-With: Jesse Wolfe
| | | | | * | | | | | | (#5375) Rework puppet apply to use configurer.runPaul Berry2010-12-164-33/+17
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet apply used to contain code that duplicated the functionality of configurer.run. Refactored to share code. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | | | * | | | | | | Merge branch 'ticket/2.6.4/5566' into 2.6.nextJesse Wolfe2010-12-162-1/+20
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix #5566 none, mtime, and ctime checksum types can write file contentsJesse Wolfe2010-12-162-1/+20
| | | | | | |/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #write method in lib/puppet/type/file/content.rb relies on the block passed to #sum_stream getting executed. "none", "mtime", and "ctime" aren't real checksums, so they violated that assumption and just returned empty results. This patch causes that block to get executed.
| * | | | | | | | | | Merge branch 'maint/next/mocha_workaround' into nextNick Lewis2011-01-063-2/+27
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | maint: Work-around for a Mocha bugNick Lewis2011-01-063-2/+27
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mocha is leaving behind a copy of stubbed methods in the singleton class of the object on which the method is stubbed. So a later stub to any_instance of the class isn't seen by the original object. This change works around the problem by adding a follow-up "test" that removes the method from the singleton class. See: https://github.com/floehopper/mocha/issues#issue/20 Paired-With: Paul Berry
* | | | | | | | | | Merge branch 'next'Matt Robinson2010-12-161-12/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * next: maint: Fix ActiveRecord confine issue maint: Fix a test that was missing a require maint: Fix tests that don't run on their own
| * | | | | | | | | Merge branch '2.6.x' into nextMatt Robinson2010-12-161-12/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: maint: Fix ActiveRecord confine issue maint: Fix a test that was missing a require maint: Fix tests that don't run on their own Manually Resolved Conflicts: spec/unit/network/http/rack/xmlrpc_spec.rb spec/unit/network/http/rack_spec.rb spec/unit/network/http/webrick_spec.rb spec/unit/parser/templatewrapper_spec.rb spec/unit/rails/param_value_spec.rb spec/unit/rails/resource_spec.rb
| | * | | | | | | | Merge branch '2.6.next' into 2.6.xMatt Robinson2010-12-1616-12/+30
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: maint: Fix ActiveRecord confine issue maint: Fix a test that was missing a require maint: Fix tests that don't run on their own
| | | * | | | | | | Merge branch 'ticket/2.6.next/maint-fix_active_record_confine' into 2.6.nextMatt Robinson2010-12-161-12/+15
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/maint-fix_active_record_confine: maint: Fix ActiveRecord confine issue
| | | | * | | | | | | maint: Fix ActiveRecord confine issueMatt Robinson2010-12-161-12/+15
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We made a class that inherited from ActiveRecord, but did so outside a block so the confine wasn't skipping it when ActiveRecord wasn't installed. Moving that class inside a before block caused the confine to work properly. Paired-with: Nick Lewis
| | | * | | | | | | Merge branch 'maint/2.6.next/fix-test-dependency-problems' into 2.6.nextNick Lewis2010-12-1615-0/+15
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | maint: Fix a test that was missing a requireMatt Robinson2010-12-162-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-with: Nick Lewis
| | | | * | | | | | | maint: Fix tests that don't run on their ownMatt Robinson2010-12-1613-0/+13
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the spec directory I found all the specs that fail when run on their own. for TEST in `find . -name "*.rb" -type f`; do spec $TEST > /dev/null 2>&1 if [[ $? != 0 ]]; then echo $TEST fi done All of them were cases of missing requires. Paired-with: Nick Lewis <nick@puppetlabs.com>
* | | | | | | / / / Merge branch 'next'Nick Lewis2010-12-16515-1578/+1735
|\| | | | | | | | | | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch '2.6.x' into nextNick Lewis2010-12-1629-226/+492
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually Resolved Conflicts: lib/puppet/resource/type_collection.rb spec/unit/configurer_spec.rb spec/unit/indirector/catalog/active_record_spec.rb spec/unit/resource/type_collection_spec.rb spec/unit/transaction/resource_harness_spec.rb
| | * | | | | | | Merge branch '2.6.next' into 2.6.xNick Lewis2010-12-1633-256/+507
| | |\| | | | | | | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch 'ticket/2.6.next/4487' into 2.6.nextNick Lewis2010-12-132-12/+27
| | | |\ \ \ \ \
| | | | * | | | | (#4487) Fix environment column in hosts tableNick Lewis2010-12-132-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An entire environment object was being stored in a string field, causing the ZAML form of the environment to be stored. This was over-ridden to return just the ZAML serialized version of the name. Since the hosts model didn't know how to interpret a serialized value, it just returned the ZAML string as the environment. This patch stringifies the environment before putting it in the hosts table, which stores it properly. This patch also introduces a new method of testing using Tableless ActiveRecord models, which emulate their database schema. This helps to eliminate some stubbing, but it is still impossible to fully and accurately test all ActiveRecord interactions without a real database. Paired-With: Matt Robinson
| | | * | | | | | Merge branch 'maint/2.6.next/safe-pluginhandler' into 2.6.nextJesse Wolfe2010-12-132-1/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | maint: restore plugin handler safetyJesse Wolfe2010-12-132-1/+5
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous maintenance patch for this file didn't provide as strong of a guarantee of loading plugins as the code it replaced. This patch restores the extremely broad exception catching, but prevents mocha exceptions from being silently ignored.
| | | * | | | | | Merge branch 'ticket/2.6.next/5408' into 2.6.nextJesse Wolfe2010-12-108-139/+253
| | | |\ \ \ \ \ \
| | | | * | | | | | (#5408) Attributes can be both audited and managedJesse Wolfe2010-12-108-139/+253
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to both audit and manage an attribute. It introduces a new field on Event objects "historical_value", which is the value from state.yaml. The value from the RAL is written to state.yaml, and then the RAL is updated with the desired value. Paired-With: Nick Lewis <nick@puppetlabs.com> Paired-With: Matt Robinson <matt@puppetlabs.com>
| | | * | | | | | Merge branch 'maint/2.6.next/fix-silent-mocha-failures' into 2.6.nextJesse Wolfe2010-12-108-12/+13
| | | |\ \ \ \ \ \
| | | | * | | | | | maint: missing stubJesse Wolfe2010-12-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This missing stub was raising an exception that, in versions of Mocha less than 0.9.10, was coincidentally causing the method under test to behave as expected. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | | | maint: missing stubJesse Wolfe2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This missing stub was raising an exception that, in versions of Mocha less than 0.9.10, was mistaken for the exception that was being tested for. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | | | maint: missing line and filename stubsJesse Wolfe2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another missing stub exposed by Mocha 0.9.10
| | | | * | | | | | maint: Fully stub partially stubbed test.Jesse Wolfe2010-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was succeeding in versions of Mocha before 0.9.10, because the Mocha expectation exceptions were being incorrectly interpreted as if they were File Not Found exceptions.
| | | | * | | | | | maint: remove Puppet.settings stubsJesse Wolfe2010-12-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was stubbing Puppet.settings, instead of setting the values directly. Exceptions thrown by trying to read other settings were getting swallowed when running a version of Mocha older than 0.9.10. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | | | maint: test was expecting Catalog.find too few timesJesse Wolfe2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our code calls Catalog.find multiple times, but this stub did not allow that. The resulting error was silently ignored on versions of Mocha before 0.9.10 Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | | | maint: broken test not failing due to over-eager exception catchingJesse Wolfe2010-12-102-4/+2
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test was not testing what it claimed, but the failure exception was getting swallowed by an unnecessarily broad rescue match. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | * | | | | | Merge branch 'ticket/2.6.next/1757' into 2.6.nextJesse Wolfe2010-12-087-52/+22
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix #1757 Change file mode representation to octalJesse Wolfe2010-12-087-52/+22
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the internal representation of a file's mode to a string instead of an integer. This simplifies the problem of displaying the value consistently throughout all of puppet.
| | | * | | | | | Merge branch 'ticket/next/5423' into 2.6.nextPaul Berry2010-12-061-5/+5
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/next/5423: Bug #5423: This moves the home directory property before the uid property, thus minimizing room for damage when usermod is in use.
| | | | * | | | | Bug #5423: This moves the home directory property before the uid property, ↵Jonathan Boyett2010-12-061-5/+5
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | thus minimizing room for damage when usermod is in use.
| | | * | | | | Merge branch 'ticket/2.6.next/4943' into 2.6.nextNick Lewis2010-12-024-2/+170
| | | |\ \ \ \ \
| | | | * | | | | (#4943) Add puppet inspect applicationNick Lewis2010-12-024-2/+170
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "puppet inspect" will load the locally stored YAML catalog and record the current state of the audited properties in the catalog. It uses settings specified in the [agent] configuration section, and will send its inspect report to the specified server. Paired-With: Jesse Wolfe
| | | * | | | | Merge branch 'ticket/2.6.next/5261' into 2.6.nextMatt Robinson2010-12-022-22/+16
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5261: (#5261) Fix #5261 Don't escape Unicode characters in PSON
| | | | * | | | | (#5261) Fix #5261 Don't escape Unicode characters in PSONJesse Wolfe2010-12-022-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the escaping of valid UTF-8 sequences as "\uXXXX". This code was unreliable, as it relied on Iconv's ability to convert those codepoints between UTF-8 and UTF-16, but some versions of Iconv barf on some valid codepoints. Invalid UTF-8 sequences are still passed through unchanged. We believe that this is fine; if you are concerned about complience with the JSON standard, what we are doing is equivalent to: * interpreting binary files as Latin-1 encoded character sequences * JSON-encoding those characters according to RFC 4627 * outputting the JSON as Latin-1 This allows all raw binary files to be transmitted losslessly. Paired-With: Paul Berry <paul@puppetlabs.com>
| | | * | | | | | Merge branch 'maint/2.6.next/bogus_mongrel_daemonize_test' into 2.6.nextMatt Robinson2010-12-021-6/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * maint/2.6.next/bogus_mongrel_daemonize_test: maint: Remove bogus mongrel test
| | | | * | | | | maint: Remove bogus mongrel testMatt Robinson2010-12-021-6/+0
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why test that mongrel responds to daemonize? EVERYTHING responds to daemonize thanks to activesupport. Paired-with: Paul Berry
| | | * | | | | Merge branch 'ticket/2.6.next/5081' into 2.6.nextMatt Robinson2010-12-012-9/+0
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5081: [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
| | | * | | | | [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always ↵Matt Robinson2010-12-012-9/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading site.pp" The fix for #4349 caused --parse-only not to detect syntax errors when --ignore-import was used by adding a return statement that bypassed the initial import: commit 760e418d254a8d2198d2c6eb466d783a5930ef47 def perform_initial_import + return if Puppet.settings[:ignoreimport] The problem that #4349 fixed was more generally fixed in commit 99c1019e1d3402ec8e476dc859d5aaef82ec4f69 for ticket #4798 so the return statement is no longer needed, so reverting the commit for #4349 does not reintroduce the problem of an import loop error when running puppet doc. Paired-with: Jesse Wolfe
| * | | | | | Merge branch 'ticket/next/5427' into nextMatt Robinson2010-12-145-247/+80
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/5427: (#5427) Using Propery::OrderedList for host_alias (#5427) Remove redundant testunit tests
| | * | | | | | (#5427) Using Propery::OrderedList for host_aliasStefan Schulte2010-12-144-42/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the propertyclass Puppet::Property::OrderedList to represent the list of host_aliases. This lets us remove the in_sync, should_to_s etc overrides. In the provider class the list is represented by a string (=no array) so there were a few changes necessary as well. Because Puppet::Property::List uses the specified delimiter when converting should values to strings, I changed the delimiter to a simple space instead a tab. This keeps messages produced by puppet in a nice format. The tests had to be changed to work with the new behaviour of host_aliases. There are a few additional tests as well.
| | * | | | | | (#5427) Remove redundant testunit testsMatt Robinson2010-12-141-205/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests are now better tested in the specs. Paired-with: Nick Lewis
| * | | | | | Merge branch 'ticket/next/5393' into nextJesse Wolfe2010-12-072-0/+30
| |\ \ \ \ \ \