mixlib-install 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18332899c9613f49a801ec4ceb6508511b29d81
-  data.tar.gz: 89d42e1043cdc5ae1da07b89fbb6f501a33b9e22
+  metadata.gz: 52c2a6687ddf2b789dc55e0f1aeacdbc8787c8fa
+  data.tar.gz: 834ce2f31d9b9ead5346938cb13e95a20f49ae72
 SHA512:
-  metadata.gz: 2fcaa63666676a96788e7b28375d033369bba761db6223b3d365ccfd316d9903ec66f5dd247f05b2ef5a26614a7b3aa9cbfeb42fc23643d885151903197a3b00
-  data.tar.gz: 9b3e8c8dad6034f288888cac36cfedb51a4a368f3c46bafcff47182db6508e35fe5234c15573143dc4f180c5b43dc27e917d6bd468369f53d76686f7fc9e68eb
+  metadata.gz: 3f14fec50a6fea2ccc9c71f8386b459f463b9f99bffe7e8380dd4b194df3b5430a82366a3dd4941f62b2d12f8b169ce6694de54588204ee243934622e8ddaa73
+  data.tar.gz: fdf3718b08e263d150953fbd49c8b52bdb1f16323a7d26a9999a05fcec52067e7fc3c4b889bb8366dcef7ab4c1f2fdbb435c194d213f86d697cbf58c5ac7fcfb

data/.expeditor/config.yml

@@ -0,0 +1,14 @@
+slack:
+  notify_channel: eng-services-alerts
+
+github:
+  maintainer_group: chef/engineering-services
+  version_tag_format: v{{version}}
+
+merge_actions:
+  built_in:bump_version:
+    ignore_labels: "Version: Skip Bump"
+  bash:.expeditor/update_version.sh:
+    only_if: built_in:bump_version
+  built_in:update_changelog:
+    ignore_labels: "Changelog: Skip Update"

data/.expeditor/update_version.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file.
+# It then executes this file to update any other files/components with that new version.
+#
+
+set -evx
+
+sed -i -r "s/VERSION = \".+\"/VERSION = \"$(cat VERSION)\"/" lib/mixlib/install/version.rb

data/.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Order is important. The last matching pattern has the most precedence.
+
+* @chef/engineering-services

data/.travis.yml

@@ -36,9 +36,7 @@ matrix:
   - rvm: 2.3
     env: SUITE=ubuntu
   - rvm: 2.3
-    env: SUITE=windows-server-2012r2
-  # - rvm: 2.3
-  #   env: SUITE=windows-nano
+    env: SUITE=windows-server
 
 before_script:
   - ci/before-script.sh

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-# Change Log
+# Mixlib::Install Changes
+
+<!-- latest_release -->
+## [v3.3.3](https://github.com/chef/mixlib-install/tree/v3.3.3) (2017-08-02)
+
+#### Merged Pull Requests
+- mixlib-versioning backwards compatability for PartialSemVer support [#229](https://github.com/chef/mixlib-install/pull/229) ([wrightp](https://github.com/wrightp))
+<!-- latest_release -->
+
+
 
 ## [3.3.2]
 - Fix bug where calling `products_available_on_downloads_site` would corrupt the product map.
@@ -171,4 +180,4 @@
 
 ## [1.0.0]
 - Ability to query product artifacts from multiple channels
-- Ability to generate installation scripts for `sh` and `ps1`
+- Ability to generate installation scripts for `sh` and `ps1`

data/VERSION

@@ -0,0 +1 @@
+3.3.3

data/acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/.gitignore

@@ -0,0 +1,2 @@
+nodes/
+tmp/

data/acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/metadata.rb

@@ -0,0 +1 @@
+name 'acceptance-cookbook'

data/acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -0,0 +1,3 @@
+execute "terraform destroy -force" do
+  cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+end

data/acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -0,0 +1,11 @@
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_ps1, 'install'\" > ../.acceptance_data/powershell_install_fips.ps1" do
+  cwd node['chef-acceptance']['suite-dir']
+end
+
+execute "terraform plan" do
+  cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+end
+
+execute "terraform apply" do
+  cwd "#{node['chef-acceptance']['suite-dir']}/terraform"
+end

data/acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -0,0 +1,14 @@
+ruby_block "get ip" do
+  block do
+    tf_state = JSON.parse(File.read("#{node['chef-acceptance']['suite-dir']}/terraform/terraform.tfstate"))
+    node.default["ip"] = tf_state["modules"].first["resources"]["aws_instance.mixlib_install_ps1"]["primary"]["attributes"]["public_ip"]
+  end
+end
+
+execute "run inspec" do
+  command lazy { "inspec exec verify.rb -t winrm://Administrator@#{node['ip']} --password $WINDOWS_PASSWORD" }
+  cwd "#{node['chef-acceptance']['suite-dir']}/inspec"
+  environment(
+    "WINDOWS_PASSWORD" => ENV["TF_VAR_admin_password"] || "Pas5w0rD"
+  )
+end

data/acceptance/windows-server-2012r2-fips/inspec/verify.rb

@@ -0,0 +1,3 @@
+describe package("Chef Client v13*") do
+  it { should be_installed }
+end

data/acceptance/windows-server-2012r2-fips/terraform/application.tf

@@ -0,0 +1,90 @@
+data "aws_ami" "windows_ami" {
+  most_recent = true
+
+  filter {
+    name   = "owner-alias"
+    values = ["amazon"]
+  }
+
+  filter {
+    name   = "name"
+    values = ["Windows_Server-2012-R2*-English-*-Base-*"]
+  }
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "block-device-mapping.volume-type"
+    values = ["gp2"]
+  }
+
+  filter {
+    name   = "image-type"
+    values = ["machine"]
+  }
+}
+
+resource "aws_instance" "mixlib_install_ps1" {
+  count = 1
+
+  ami           = "${data.aws_ami.windows_ami.id}"
+  instance_type = "${var.aws_instance_type}"
+  key_name      = "es-infrastructure"
+
+  associate_public_ip_address = true
+
+  subnet_id         = "subnet-11ac0174" # Planet Releng Public Subnet
+  source_dest_check = false
+
+  vpc_security_group_ids = [
+    "sg-96274af3",
+  ]
+
+  connection {
+    type     = "winrm"
+    user     = "Administrator"
+    password = "${var.admin_password}"
+    timeout  = "10m"
+  }
+
+  user_data = <<EOF
+<script>
+  winrm quickconfig -q & winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"} & winrm set winrm/config @{MaxTimeoutms="1800000"} & winrm set winrm/config/service @{AllowUnencrypted="true"} & winrm set winrm/config/service/auth @{Basic="true"}
+</script>
+<powershell>
+  Set-ExecutionPolicy -ExecutionPolicy Bypass
+  netsh advfirewall firewall add rule name="WinRM in" protocol=TCP dir=in profile=any localport=5985 remoteip=any localip=any action=allow
+  $admin = [adsi]("WinNT://./administrator, user")
+  $admin.psbase.invoke("SetPassword", "${var.admin_password}")
+  Set-ItemProperty -path HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy -name Enabled -value 1
+</powershell>
+EOF
+
+  tags {
+    # ChefOps's AWS standard tags:
+    X-Dept        = "EngServ"
+    X-Contact     = "pwright"
+    X-Production  = "false"
+    X-Environment = "acceptance"
+    X-Application = "mixlib-install"
+  }
+
+  provisioner "file" {
+    source      = "../../.acceptance_data/powershell_install_fips.ps1"
+    destination = "/tmp/install.ps1"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "powershell.exe -file /tmp/install.ps1",
+    ]
+  }
+}

data/acceptance/windows-server-2012r2-fips/terraform/aws.tf

@@ -0,0 +1,8 @@
+# Restrict operation of terraform to chef-es profile so that
+# we do not create resources in other aws profiles.
+# We assume user has configured standard aws credentials
+# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
+provider "aws" {
+  region  = "${var.aws_region}"
+  profile = "chef-aws"
+}

data/acceptance/windows-server-2012r2-fips/terraform/variables.tf

@@ -0,0 +1,16 @@
+# Region to create infrastructure in
+variable "aws_region" {
+  type    = "string"
+  default = "us-west-2"
+}
+
+variable "aws_instance_type" {
+  type    = "string"
+  default = "t2.micro"
+}
+
+variable "admin_password" {
+  description = "Set Windows Administrator password"
+  type        = "string"
+  default     = "Pas5w0rD"
+}

data/lib/mixlib/install/generator/powershell/scripts/helpers.ps1.erb

@@ -1,7 +1,7 @@
 [Console]::OutputEncoding = New-Object -typename System.Text.ASCIIEncoding
 
 function Get-PlatformVersion {
-  switch -regex ((Get-WMIQuery win32_operatingsystem).version) {
+  switch -regex ((Get-Win32OS).version) {
     '10\.0\.\d+' {$platform_version = '2016'}
     '6\.3\.\d+'  {$platform_version = '2012r2'}
     '6\.2\.\d+'  {$platform_version = '2012'}
@@ -18,7 +18,7 @@ function Get-PlatformVersion {
 }
 
 function Get-PlatformArchitecture {
-  if ((Get-WMIQuery win32_operatingsystem).osarchitecture -like '64-bit') {
+  if ((Get-Win32OS).osarchitecture -like '64-bit') {
     $architecture = 'x86_64'
   } else {
     $architecture = 'i386'
@@ -26,6 +26,14 @@ function Get-PlatformArchitecture {
   return $architecture
 }
 
+function Get-Win32OS {
+  if(!$env:win32OS)
+  {
+    $env:win32OS = Get-WMIQuery win32_operatingsystem
+  }
+  $env:win32OS
+}
+
 function New-Uri {
   param ($baseuri, $newuri)
 
@@ -110,20 +118,21 @@ function Get-WebContentOnCore {
 function Test-ProjectPackage {
   [cmdletbinding()]
   param ($Path, $Algorithm = 'SHA256', $Hash)
-
-  Write-Verbose "Testing the $Algorithm hash for $path."
-  $ActualHash = (Get-FileHash -Algorithm $Algorithm -Path $Path).Hash.ToLower()
-
-  Write-Verbose "`tDesired Hash - '$Hash'"
-  Write-Verbose "`tActual Hash  - '$ActualHash'"
-  $Valid = $ActualHash -eq $Hash
-  if (-not $Valid) {
-    Write-Error "Failed to validate the downloaded installer.  The expected $Algorithm hash was '$Hash' and the actual hash was '$ActualHash' for $path"
+  if (!$env:Valid_ProjectPackage){
+    Write-Verbose "Testing the $Algorithm hash for $path."
+    $ActualHash = (Custom-GetFileHash -Algorithm $Algorithm -Path $Path).Hash.ToLower()
+
+    Write-Verbose "`tDesired Hash - '$Hash'"
+    Write-Verbose "`tActual Hash  - '$ActualHash'"
+    $env:Valid_ProjectPackage = $ActualHash -eq $Hash
+    if (-not $env:Valid_ProjectPackage) {
+      Write-Error "Failed to validate the downloaded installer.  The expected $Algorithm hash was '$Hash' and the actual hash was '$ActualHash' for $path"
+    }
   }
-  return $Valid
+  return $env:Valid_ProjectPackage
 }
 
-function Get-FileHash ($Path, $Algorithm) {
+function Custom-GetFileHash ($Path, $Algorithm) {
   function disposable($o){($o -is [IDisposable]) -and (($o | get-member | foreach-object {$_.name}) -contains 'Dispose')}
   function use($obj, [scriptblock]$sb){try {& $sb} catch [exception]{throw $_} finally {if (disposable $obj) {$obj.Dispose()}} }
   $Path = (resolve-path $Path).providerpath
@@ -137,7 +146,7 @@ function Get-FileHash ($Path, $Algorithm) {
 }
 
 function Get-SHA256Converter {
-  if (Is-FIPS) {
+  if ($(Is-FIPS) -ge 1) {
     New-Object -TypeName Security.Cryptography.SHA256Cng
   } else {
     if($PSVersionTable.PSEdition -eq 'Core') {
@@ -150,7 +159,10 @@ function Get-SHA256Converter {
 }
 
 function Is-FIPS {
-  (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
+  if (!$env:fips){
+    $env:fips = (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
+  }
+  return $env:fips
 }
 
 function Get-WMIQuery {

data/lib/mixlib/install/generator/powershell/scripts/install_project.ps1

@@ -58,8 +58,10 @@ function Install-Project {
   )
 
   # Set http_proxy as env var
-  $env:http_proxy = $http_proxy
-
+  if(-not [string]::IsNullOrEmpty($http_proxy)) {
+    $env:http_proxy = $http_proxy
+  }
+  
   if (-not [string]::IsNullOrEmpty($download_url_override)) {
     $download_url = $download_url_override
     $sha256 = $checksum
@@ -126,18 +128,18 @@ set-alias install -value Install-Project
 
 Function Install-ChefMsi($msi, $addlocal) {
   if ($addlocal -eq "service") {
-    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefClientFeature,ChefServiceFeature`"" -Passthru -Wait
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefClientFeature,ChefServiceFeature`"" -Passthru -Wait -NoNewWindow
   }
   ElseIf ($addlocal -eq "task") {
-    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefClientFeature,ChefSchTaskFeature`"" -Passthru -Wait
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefClientFeature,ChefSchTaskFeature`"" -Passthru -Wait -NoNewWindow
   }
   ElseIf ($addlocal -eq "auto") {
-    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait -NoNewWindow
   }
 
   $p.WaitForExit()
   if ($p.ExitCode -eq 1618) {
-    Write-Host "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
+    Write-Host "$((Get-Date).ToString()) - Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
     return $false
   } elseif ($p.ExitCode -ne 0) {
     throw "msiexec was not successful. Received exit code $($p.ExitCode)"

data/lib/mixlib/install/options.rb

@@ -112,7 +112,17 @@ module Mixlib
       end
 
       def partial_version?
-        !latest_version? && !Mixlib::Versioning.parse(product_version)
+        # If PartialSemVer is defined than the version of mixlib-versioning loaded can parse partial versions
+        # Otherwise parsing a partial version will return nil
+        is_partial = if defined?(Mixlib::Versioning::Format::PartialSemVer)
+                       # remove if there's a trailing period for mixlib-versioning compatibility
+                       options[:product_version] = product_version.chomp(".") if product_version.is_a? String
+                       Mixlib::Versioning.parse(product_version).is_a?(Mixlib::Versioning::Format::PartialSemVer)
+                     else
+                       !Mixlib::Versioning.parse(product_version)
+                     end
+
+        !latest_version? && is_partial
       end
 
       def include_metadata?

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.3.2"
+    VERSION = "3.3.3"
   end
 end

data/support/install_command.ps1

@@ -29,7 +29,7 @@ Function Get-SHA256($src) {
 }
 
 function Get-SHA256Converter {
-  if (Is-FIPS) {
+  if ($(Is-FIPS) -ge 1) {
     New-Object -TypeName Security.Cryptography.SHA256Cng
   } else {
     if($PSVersionTable.PSEdition -eq 'Core') {
@@ -42,7 +42,10 @@ function Get-SHA256Converter {
 }
 
 function Is-FIPS {
-  (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
+  if (!$env:fips){
+    $env:fips = (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
+  }
+  return $env:fips
 }
 
 Function Download-Chef($url, $sha256, $dst) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -62,7 +62,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".expeditor/config.yml"
+- ".expeditor/update_version.sh"
 - ".gitattributes"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -74,6 +77,7 @@ files:
 - PRODUCT_MATRIX.md
 - README.md
 - Rakefile
+- VERSION
 - acceptance/.gitignore
 - acceptance/Gemfile
 - acceptance/README.md
@@ -105,6 +109,15 @@ files:
 - acceptance/windows-nano/terraform/application.tf
 - acceptance/windows-nano/terraform/aws.tf
 - acceptance/windows-nano/terraform/variables.tf
+- acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/windows-server-2012r2-fips/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/windows-server-2012r2-fips/inspec/verify.rb
+- acceptance/windows-server-2012r2-fips/terraform/application.tf
+- acceptance/windows-server-2012r2-fips/terraform/aws.tf
+- acceptance/windows-server-2012r2-fips/terraform/variables.tf
 - acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/windows-server-2012r2/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -166,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Chef Software Inc's software distribution