mixlib-install 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3530b8664a5c5ba44ac1abd9440de49a4b76f4fa
-  data.tar.gz: 503decdbfb121675d4dbdd0375af88072ff1ffb7
+  metadata.gz: 330f993cfb69a22e018ecffd2993b74619945cb9
+  data.tar.gz: d80c5194651fb543c57cdec4a8c3366b290842ee
 SHA512:
-  metadata.gz: eb353ccde502f830a12fede76487cf0cebf42bd2a871cc3b602b24e6ce4bfb8658970c8bc6262b2396fbf461453a46a7324c276d1d11385b5d13734351d39f45
-  data.tar.gz: 611490147bcd15b961965c29b75f5b9fada9fc39508b5938f4fd0645f5d25618093e56f3a70982fc2da6afbca9afa088d18fb51cff87ee6729e78d78c2f3b289
+  metadata.gz: fa96263fded01b16629164a336182234331bfa905a80bf16bd91aa40f0efd1c6b3ba1c6e68a576fb5657a48821107e308dc1da66a1efef8b3d77226e83bc8fde
+  data.tar.gz: 86c5bf3ff6611fbd1282c50e2998b5c43efecbb6752c7eb29f2703d1f7dc366c06e6c34e03e013c9d53d3882424eacd4a45f14dfacd6c3d0ac041eab98ffa772

data/.expeditor/config.yml

@@ -1,14 +1,18 @@
 slack:
-  notify_channel: eng-services-alerts
+  notify_channel: eng-services-notify
 
 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"
+  - built_in:bump_version:
+      ignore_labels:
+        - "Version: Skip Bump"
+        - "Expeditor: Skip All"
+  - bash:.expeditor/update_version.sh:
+      only_if: built_in:bump_version
+  - built_in:update_changelog:
+      ignore_labels:
+        - "Changelog: Skip Update"
+        - "Expeditor: Skip All"

data/CHANGELOG.md

@@ -1,11 +1,16 @@
 # Mixlib::Install Changes
 
-<!-- latest_release 3.3.4 -->
+<!-- latest_release 3.4.0 -->
+## [v3.4.0](https://github.com/chef/mixlib-install/tree/v3.4.0) (2017-08-22)
+
+#### Merged Pull Requests
+- Add install_strategy option to bootstrap install scripts [#232](https://github.com/chef/mixlib-install/pull/232) ([wrightp](https://github.com/wrightp))
+<!-- latest_release -->
+
 ## [v3.3.4](https://github.com/chef/mixlib-install/tree/v3.3.4) (2017-08-10)
 
 #### Merged Pull Requests
 - Fix Windows architecture detection [#231](https://github.com/chef/mixlib-install/pull/231) ([rlaveycal](https://github.com/rlaveycal))
-<!-- latest_release -->
 
 ## [v3.3.3](https://github.com/chef/mixlib-install/tree/v3.3.3) (2017-08-02)
 
@@ -185,4 +190,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

@@ -1 +1 @@
-3.3.4
+3.4.0

data/acceptance/ubuntu_install_command/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1,3 +1,4 @@
+# Generate install script then write to disk for terraform to copy to the instance for execution
 execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.new(product_name: 'omnibus-toolchain', product_version: :latest, channel: :stable).install_command\" > ../.acceptance_data/ubuntu_install_command.sh" do
   cwd node['chef-acceptance']['suite-dir']
 end

data/acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/.gitignore

@@ -0,0 +1,8 @@
+nodes/
+tmp/
+
+# Terraform
+*.tfstate
+*.tfstate.backup
+*_override.tf
+

data/acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/metadata.rb

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

data/acceptance/ubuntu_install_command_once/.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/ubuntu_install_command_once/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -0,0 +1,12 @@
+# Generate install script then write to disk for terraform to copy to the instance for execution
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.new(product_name: 'chef', product_version: :latest, channel: :stable, install_command_options: {install_strategy: 'once'}).install_command\" > ../.acceptance_data/ubuntu_install_command_once.sh" 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/ubuntu_install_command_once/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -0,0 +1,11 @@
+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_sh"]["primary"]["attributes"]["public_ip"]
+  end
+end
+
+execute "run inspec" do
+  command lazy { "inspec exec verify.rb -t ssh://ubuntu@#{node['ip']} -i ~/.ssh/es-infrastructure.pem" }
+  cwd "#{node['chef-acceptance']['suite-dir']}/inspec"
+end

data/acceptance/ubuntu_install_command_once/inspec/verify.rb

@@ -0,0 +1,7 @@
+describe package("chef") do
+  it { should be_installed }
+end
+
+describe command("/tmp/install.sh") do
+  its("stdout") { should match "Nothing to install" }
+end

data/acceptance/ubuntu_install_command_once/terraform/application.tf

@@ -0,0 +1,78 @@
+data "aws_ami" "ubuntu_14_ami" {
+  most_recent = true
+
+  filter {
+    name   = "owner-id"
+    values = ["099720109477"]
+  }
+
+  filter {
+    name   = "name"
+    values = ["ubuntu/images/*/ubuntu-*-14.04-*-server-*"]
+  }
+
+  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_sh" {
+  count = 1
+
+  ami           = "${data.aws_ami.ubuntu_14_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 {
+    user        = "ubuntu"
+    private_key = "${file("${var.connection_private_key}")}"
+    agent       = "${var.connection_agent}"
+    timeout  = "10m"
+  }
+
+  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/ubuntu_install_command_once.sh"
+    destination = "/tmp/install.sh"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "chmod +x /tmp/install.sh",
+      "sudo bash /tmp/install.sh",
+    ]
+  }
+}

data/acceptance/ubuntu_install_command_once/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/ubuntu_install_command_once/terraform/variables.tf

@@ -0,0 +1,27 @@
+# Region to create infrastructure in
+variable "aws_region" {
+  type    = "string"
+  default = "us-west-2"
+}
+
+variable "aws_instance_type" {
+  type    = "string"
+  default = "t2.micro"
+}
+
+# Used to indicidate whether the environment should be treated as "prod"
+# This is mainly used for the `X-Production` AWS tag.
+variable "production" {
+  default = "false"
+}
+
+# SSH Connection info used for remote provisioning instances
+variable "connection_agent" {
+  description = "Set to false to disable using ssh-agent to authenticate"
+  default     = false
+}
+
+variable "connection_private_key" {
+  description = "File path to AWS keypair private key to provision with"
+  default     = "~/.ssh/es-infrastructure.pem"
+}

data/acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1,3 +1,4 @@
+# Generate install script then write to disk for terraform to copy to the instance for execution
 execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_sh\" > ../.acceptance_data/ubuntu_install.sh" do
   cwd node['chef-acceptance']['suite-dir']
 end

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

@@ -1,3 +1,4 @@
+# Generate install script then write to disk for terraform to copy to the instance for execution
 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

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

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

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

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

data/acceptance/windows-server-2012r2-once/.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-once/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -0,0 +1,13 @@
+# Generate install script then write to disk for terraform to copy to the instance for execution
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_ps1, 'install -install_strategy once'\" > ../.acceptance_data/powershell_install_once.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-once/.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-once/inspec/verify.rb

@@ -0,0 +1,7 @@
+describe package("Chef Client v13*") do
+  it { should be_installed }
+end
+
+describe command("powershell.exe -file /tmp/install.ps1") do
+  its("stdout") { should match "Nothing to install" }
+end

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

@@ -0,0 +1,89 @@
+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}")
+</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_once.ps1"
+    destination = "/tmp/install.ps1"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "powershell.exe -file /tmp/install.ps1",
+    ]
+  }
+}

data/acceptance/windows-server-2012r2-once/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-once/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/bourne.rb

@@ -25,6 +25,7 @@ module Mixlib
           install_command = []
           install_command << get_script("helpers.sh", context)
           install_command << get_script("script_cli_parameters.sh")
+          install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
           install_command << get_script("fetch_metadata.sh", context)
           install_command << get_script("fetch_package.sh")
@@ -44,6 +45,7 @@ module Mixlib
           install_command = []
           install_command << get_script("helpers.sh", user_agent_headers: options.user_agent_headers)
           install_command << render_variables
+          install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
           install_command << get_script("fetch_metadata.sh")
           install_command << get_script("fetch_package.sh")

data/lib/mixlib/install/generator/bourne/scripts/check_product.sh

@@ -0,0 +1,6 @@
+if test -d "/opt/$project" && test "x$install_strategy" = "xonce"; then
+  echo "$project installation detected"
+  echo "install_strategy set to 'once'"
+  echo "Nothing to install"
+  exit
+fi

data/lib/mixlib/install/generator/bourne/scripts/script_cli_parameters.sh

@@ -9,13 +9,14 @@
 # $project: Project to be installed
 # $cmdline_filename: Name of the package downloaded on local disk.
 # $cmdline_dl_dir: Name of the directory downloaded package will be saved to on local disk.
+# $install_strategy: Method of package installations. default strategy is to always install upon exec. Set to "once" to skip if project is installed
 ############
 
 # Defaults
 channel="stable"
 project="chef"
 
-while getopts pnv:c:f:P:d: opt
+while getopts pnv:c:f:P:d:s opt
 do
   case "$opt" in
 
@@ -26,9 +27,10 @@ do
     f)  cmdline_filename="$OPTARG";;
     P)  project="$OPTARG";;
     d)  cmdline_dl_dir="$OPTARG";;
+    s)  install_strategy="$OPTARG";;
     \?)   # unknown flag
       echo >&2 \
-      "usage: $0 [-P project] [-c release_channel] [-v version] [-f filename | -d download_dir]"
+      "usage: $0 [-P project] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy]"
       exit 1;;
   esac
 done

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

@@ -174,4 +174,4 @@ function Get-WMIQuery {
   else {
     Get-WmiObject $class
   }
-}
+}

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

@@ -48,15 +48,25 @@ function Install-Project {
     $daemon = 'auto',
     [string]
     $http_proxy,
-    [string]
-    $download_url_override,
     # Specify an alternate download url, must also include checksum
     [string]
-    $checksum
+    $download_url_override,
     # SHA256 checksum of the download file
     # Must be present when using download_url_override
+    [string]
+    $checksum,
+    # Set to 'once' to skip install if project is detected
+    [string]
+    $install_strategy
   )
 
+  if ((Test-Path "$env:systemdrive\opscode\$project\embedded") -and ($install_strategy -eq 'once')) {
+    Write-Host "$project installation detected"
+    Write-Host "install_strategy set to 'once'"
+    Write-Host "Nothing to install"
+    exit
+  }
+
   # Set http_proxy as env var
   if(-not [string]::IsNullOrEmpty($http_proxy)) {
     $env:http_proxy = $http_proxy

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.3.4"
+    VERSION = "3.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -90,6 +90,15 @@ files:
 - acceptance/ubuntu_install_command/terraform/application.tf
 - acceptance/ubuntu_install_command/terraform/aws.tf
 - acceptance/ubuntu_install_command/terraform/variables.tf
+- acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/ubuntu_install_command_once/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/ubuntu_install_command_once/inspec/verify.rb
+- acceptance/ubuntu_install_command_once/terraform/application.tf
+- acceptance/ubuntu_install_command_once/terraform/aws.tf
+- acceptance/ubuntu_install_command_once/terraform/variables.tf
 - acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/ubuntu_install_sh/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -118,6 +127,15 @@ files:
 - 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-once/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/windows-server-2012r2-once/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/windows-server-2012r2-once/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/windows-server-2012r2-once/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/windows-server-2012r2-once/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/windows-server-2012r2-once/inspec/verify.rb
+- acceptance/windows-server-2012r2-once/terraform/application.tf
+- acceptance/windows-server-2012r2-once/terraform/aws.tf
+- acceptance/windows-server-2012r2-once/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
@@ -140,6 +158,7 @@ files:
 - lib/mixlib/install/generator.rb
 - lib/mixlib/install/generator/base.rb
 - lib/mixlib/install/generator/bourne.rb
+- lib/mixlib/install/generator/bourne/scripts/check_product.sh
 - lib/mixlib/install/generator/bourne/scripts/fetch_metadata.sh.erb
 - lib/mixlib/install/generator/bourne/scripts/fetch_package.sh
 - lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb