Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-chocolatey
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.1
Choose a base ref
...
head repository: puppetlabs/puppetlabs-chocolatey
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.1.2
Choose a head ref
  • 11 commits
  • 8 files changed
  • 3 contributors

Commits on Sep 30, 2015

  1. Configuration menu
    Copy the full SHA
    b5034d1 View commit details
    Browse the repository at this point in the history
  2. Update config.pp to accomodate new choco feature list -r output

    The findstr fails to match on the new version of chocolatey 0.9.9.9.  This is less exact but ignores the descriptions after the enabled/disabled section.
    9bryan committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    567fe21 View commit details
    Browse the repository at this point in the history
  3. (GH-86) refactor to create a shared library for install_path code

    The facter fact choco_install_path contains code that needs to
    be used by the puppet-provider.
    
    To be DRY, this a refactor around the Puppetx namespace pattern
    and as such is not a behavioral change.
    rismoney committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    bcb468b View commit details
    Browse the repository at this point in the history
  4. (GH-86) handle edge case environment variable setting in provider

    edge case scenario scenario:
    a puppet agent runs exec {'install_chocolatey_official'}
    that performs an upgrade against an existing chocolatey
    instance with the following environment variable set:
    
    %ChocolateyInstall%=C:\chocolatey
    
    This ChocolateyInstall environment variable is unable
    to be refreshed until a clean shell is started.
    
    As such the current shell for subsequent provider
    calls ChocolateyInstall is stale.
    
    This commit ensures the session env variable matches the
    machine variable before running any choco commands.
    rismoney committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    e44d0ef View commit details
    Browse the repository at this point in the history
  5. Merge pull request #91 from 9bryan/master

    Update config.pp to accomodate new choco feature list -r output
    ferventcoder committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    f93e34b View commit details
    Browse the repository at this point in the history
  6. Merge pull request #87 from rismoney/envs

    (GH-86) add environment variable on exec
    ferventcoder committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    e9816c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2015

  1. (GH-60) fix upgrade/installation Filestream errors on PSv2

    Powershell version 2, has several issues in handling output
    redirection
    
    This is best documented here:
    https://connect.microsoft.com/PowerShell/feedback/details/587165/
    powershell-double-redirection-problem
    
    Another obscure bug that occurs in powershell is here.
    https://connect.microsoft.com/PowerShell/feedback/details/371321/
    benign-errors-for-missing-closing-are-left-in-the-error-variable
    
    These 2 issues are compounded in the provider, because the benign
    error sent to $error, then triggers the double redirection issue
    within puppet.  This will automatically fail the resource.
    
    This patch is confined to Powershell v2 (Win2008r2/Win7) and
    essentially captures the output from running chocolateyInstall.ps1
    via a variable. We can now see the errors that are thrown instead
    of the FileStream errors in a log stored here:
    $env:TEMP\chocoError.log
    
    While this may cause a false positive success to be returned to
    puppet, IMHO this is better than a false failure, based on upstream
    legacy bugs to be returned, particularly because of the transparency
    around the $error content.
    
    This fix leaves the existing logic intact for Powershell versions
    greater than 2 as I have not observed this behavior on them.
    
    Additionally write-host calls were switched to write-output as a best
    practice to avoid observed Filestream errors within this edge case.
    
    The recommendation to avoid this scenario altogether on Win2008r2
    is to install .NET 4.5 and then WMF 4.0, or use Win2012+
    rismoney committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    9f37995 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #92 from rismoney/inst

    (GH-60) fix upgrade/installation Filestream errors on PSv2
    ferventcoder committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    9398630 View commit details
    Browse the repository at this point in the history
  3. (GH-86) avoid using stale version of chocolateyinstall env var

    In a case where chocolatey was recently installed but the shell
    was not refreshed, the exec resource could be run with a stale
    path (ie C:\chocolatey) if a migration to C:\ProgramData\chocolatey
    had recently occured.
    
    In this scenario, a folder structure will be improperly created
    in the legacy path.
    
    This patch ensures that the exec uses the puppet specified value
    for the install location.
    rismoney committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    3d3b43d View commit details
    Browse the repository at this point in the history
  4. Merge pull request #93 from rismoney/envvar

    (GH-86) avoid using stale version of chocolateyinstall env var
    ferventcoder committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    d779bb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2015

  1. (version) 1.1.2

    ferventcoder committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    3790706 View commit details
    Browse the repository at this point in the history
Loading