kitchen-habitat 0.9.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7ed56af416303acdd761c21b1a205b62c8fe3d6d1712a1798dd4e18b7583d4
-  data.tar.gz: 1a8af1c6a8dd062786013157b9b67c2f1c67f2eaece2793fa8bc89dfa96d13bb
+  metadata.gz: 307c3545cbd9d4738778e6d14c02e75929f52c805a7b3cea679af0a185748bb1
+  data.tar.gz: 6a61cb7f38f2074f25cc9b9ce429da766e27b120e1e0c2dcd19dc53e1f9db884
 SHA512:
-  metadata.gz: 97c0905d88a0425a2b2ee7209f02369e00433d859ecaebd3cc18e0b9ad180ae4600acfd8ec185f053628410b2b5b81a542f5d48a1110174ec438d207070e545d
-  data.tar.gz: 7f2c990733bc747a6fb9a7306ff07f3be59814e9aa7a8ca22c74f66b6addcc083b4c29ebefcc33a6589fecaf5b0a59439951f4e4c3024bb436cab26b3b225f33
+  metadata.gz: ee379fa70d6808368dd5d63fe8a5ac0cf172e2524a876a9ab535b32cb98cee7cd59f6fd42252df02cbcf70fa48eff7c7c3ce7d06ceedcc9294f2faa60c578ec9
+  data.tar.gz: d856038e6443e73343fcba7fab4fee84bfffd318feb5b33285421cb7e3ac40db1e1861be1246ccfbf90683e54700c7f6a935bdee3890285ff3404d32dbc3c036

data/README.md

@@ -1,16 +1,21 @@
 [![Gem Version](https://badge.fury.io/rb/kitchen-habitat.svg)](http://badge.fury.io/rb/kitchen-habitat)
+[![Build Status](https://github.com/test-kitchen/kitchen-habitat/workflows/CI/badge.svg?branch=master)](https://github.com/test-kitchen/kitchen-habitat/actions?query=workflow%3ACI+branch%3Amaster)
 
 # kitchen-habitat
+
 A Test Kitchen Provisioner for [Habitat](https://habitat.sh)
 
 ## Requirements
 
-
 ## Installation & Setup
+
 You'll need the test-kitchen & kitchen-habitat gems installed in your system, along with kitchen-vagrant or some other suitable driver for test-kitchen.
 
 ## Configuration Settings
 
+* `hab_license`: Habitat license acceptance type (for more information please read the [chef license documentation](https://docs.chef.io/chef_license_accept.html#habitat)).
+* `hab_version`: The version of habitat to be used in test kitchen.
+
 ### Depot settings
 
 * `depot_url`
@@ -51,6 +56,9 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `hab_sup_peer`
   * IP and port (e.g. `192.168.1.86:9010`) of the supervisor of which to connect to join the ring.
   * Default is `[]`
+* `hab_sup_ring`
+  * Ring key name
+  * Default is `nil`
 
 ### Package Settings
 
@@ -62,7 +70,7 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
   * Defaults to `nil`
 * `results_directory`
   * Directory (relative to the location of the .kitchen.yml) containing package artifacts (harts) to copy to the remote system
-  * Defaults to checking the local directory for a `results` directory, then its parent (`../results`) and grandparent (`../../results`), which should accomodate most studio layouts.
+  * Defaults to checking the local directory for a `results` directory, then its parent (`../results`) and grandparent (`../../results`), which should accommodate most studio layouts.
 * `package_origin`
   * Origin for the package to run.
   * Defaults to `core`, or, if `artifact_name` is supplied, the `package_origin` will be parsed from the filename of the hart file.
@@ -95,6 +103,26 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
   * `package_version` and `package_release` will be ignored
   * Defaults to `false`
 
+### EAS Application Dashboard Settings
+
+* `event_stream_application`
+  * The name of your application.
+  * Defaults to `nil`
+* `event_stream_environment`
+  * The application environment for this supervisor.
+  * Defaults to `nil`
+* `event_stream_site`
+  * Describes the physical (for example, datacenter) or cloud-specific (for example, the AWS region) location where your services are deployed.
+  * Defaults to `nil`
+* `event_stream_url`
+  * The Chef Automate URL with port 4222 specified.
+  * Defaults to `nil`
+* `event_stream_token`
+  * Chef Automate Token
+  * Defaults to `nil`
+
+> NOTE: All 5 EAS settings are required for it to report to Automate.
+
 ## Examples
 
 Run the core-redis package
@@ -117,7 +145,7 @@ suites:
   - name: default
 ```
 
-Two node: elasticsearch and kibana 
+Two node: elasticsearch and kibana
 
 ```yaml
 driver:
@@ -149,5 +177,116 @@ suites:
         - elasticsearch:elasticsearch.default
     driver:
       instance_name: kibana
-      links: elastic:elastic  
+      links: elastic:elastic
+```
+
+EAS Application Dashboard Example
+
+``` yaml
+---
+driver:
+  name: azurerm
+
+driver_config:
+  subscription_id: <%= ENV['subscription_id'] %>
+  location: <%= ENV['region'] %>
+  machine_size: "Standard_DS2_v2"
+
+verifier:
+  name: inspec
+
+provisioner:
+  name: habitat
+  hab_version: 'latest'
+  hab_license: accept
+  event_stream_application: Effortless
+  event_stream_environment: stable
+  event_stream_site: <%= ENV['region'] %>
+  event_stream_url: automate.example.com:4222
+  event_stream_token: <%= ENV['automate_token'] %>
+
+platforms:
+  - name: windows
+    driver:
+      image_urn: MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest
+      vm_name: windows
+    provisioner:
+      package_origin: <%= ENV['package_orgin'] %>
+      package_name: <%= ENV['package_name'] %>
+
+suites:
+  - name: default
+    verifier:
+      inspec_tests:
+        - tests
+```
+
+Latest Artifact example
+
+> This example assumes you've already done a build via hab studio.
+
+```yaml
+driver:
+  name: vagrant
+  customize:
+    memory: 2048
+
+verifier:
+  name: inspec
+
+provisioner:
+  name: habitat
+  hab_version: 'latest'
+  hab_license: accept
+
+platforms:
+  - name: wildfly-local
+    driver:
+      box: bento/ubuntu-16.04
+    provisioner:
+      package_origin: jmassardo
+      package_name: wildfly
+      results_directory: results
+      install_latest_artifact: true
+
+suites:
+  - name: default
+    verifier:
+      inspec_tests:
+        - tests
+```
+
+Apply `user.toml` Example
+
+> This example assumes that you have a `/configs/user.toml` in your project directory.
+
+```yaml
+driver:
+  name: vagrant
+  customize:
+    memory: 2048
+
+verifier:
+  name: inspec
+
+provisioner:
+  name: habitat
+  hab_version: 'latest'
+  hab_license: accept
+
+platforms:
+  - name: wildfly
+    driver:
+      box: bento/ubuntu-16.04
+    provisioner:
+      package_origin: jmassardo
+      package_name: wildfly
+      channel: unstable
+      config_directory: configs
+
+suites:
+  - name: default
+    verifier:
+      inspec_tests:
+        - tests
 ```

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.9.0".freeze
+    VERSION = "0.12.1".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -17,6 +17,9 @@ module Kitchen
       kitchen_provisioner_api_version 2
 
       default_config :depot_url, nil
+      default_config :hab_license, nil
+      default_config :hab_version, "latest"
+      default_config :hab_channel, "stable"
       default_config :hab_sup_origin, "core"
       default_config :hab_sup_name, "hab-sup"
       default_config :hab_sup_version, nil
@@ -30,6 +33,7 @@ module Kitchen
       default_config :hab_sup_peer, []
       default_config :hab_sup_bind, []
       default_config :hab_sup_group, nil
+      default_config :hab_sup_ring, nil
 
       # hab-sup service options
       default_config :install_latest_artifact, false
@@ -41,6 +45,7 @@ module Kitchen
       default_config :service_topology, nil
       default_config :service_update_strategy, nil
       default_config :channel, "stable"
+      default_config :service_load_timeout, 300
 
       # local stuffs to copy
       default_config :results_directory, nil
@@ -48,12 +53,16 @@ module Kitchen
       default_config :user_toml_name, "user.toml"
       default_config :override_package_config, false
 
-      # experimental
-      default_config :use_screen, false
+      # event stream options
+      default_config :event_stream_application, nil
+      default_config :event_stream_environment, nil
+      default_config :event_stream_site, nil
+      default_config :event_stream_url, nil
+      default_config :event_stream_token, nil
 
       def finalize_config!(instance)
         # Check to see if a package ident was specified for package name and be helpful
-        unless config[:package_name].nil? || (config[:package_name] =~ /\//).nil?
+        unless config[:package_name].nil? || (config[:package_name] =~ %r{/}).nil?
           config[:package_origin], config[:package_name], config[:package_version], config[:package_release] = config[:package_name].split("/")
         end
 
@@ -76,25 +85,19 @@ module Kitchen
       end
 
       def install_command
-        raise "Need to fill in some implementation here." if instance.platform == "windows"
-        wrap_shell_code <<-BASH
-        #{export_hab_bldr_url}
-        if command -v hab >/dev/null 2>&1
-        then
-          echo "Habitat CLI already installed."
+        if windows_os?
+          wrap_shell_code(windows_install_cmd)
         else
-          curl 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh' | sudo -E bash
-        fi
-        BASH
+          wrap_shell_code(linux_install_cmd)
+        end
       end
 
       def init_command
-        wrap_shell_code <<-EOH
-          id -u hab >/dev/null 2>&1 || sudo -E useradd hab >/dev/null 2>&1
-          rm -rf /tmp/kitchen
-          mkdir -p /tmp/kitchen/results
-          #{'mkdir -p /tmp/kitchen/config' unless config[:override_package_config]}
-        EOH
+        if windows_os?
+          wrap_shell_code(windows_install_service)
+        else
+          wrap_shell_code(linux_install_service)
+        end
       end
 
       def create_sandbox
@@ -105,78 +108,152 @@ module Kitchen
       end
 
       def prepare_command
-        wrap_shell_code <<-EOH
-          #{export_hab_bldr_url}
-          #{install_supervisor_command}
-          #{binlink_supervisor_command}
-          #{install_service_package}
+        debug("Prepare command is running")
+        wrap_shell_code <<~PREPARE
           #{remove_previous_user_toml}
           #{copy_user_toml_to_service_directory}
-          EOH
+        PREPARE
       end
 
       def run_command
-        run = <<-RUN
-        #{export_hab_bldr_url}
-        #{clean_up_screen_sessions}
-        #{clean_up_previous_supervisor}
-        echo "Running #{package_ident}."
-        #{run_package_in_background}
-        RUN
-
-        wrap_shell_code run
+        # This little bit figures out what package should be loaded
+        if config[:install_latest_artifact] || !config[:artifact_name].nil?
+          # TODO: throw error and bail if there's no artifacts in the results directory
+          target_pkg = get_artifact_name
+          target_ident = "#{config[:package_origin]}/#{config[:package_name]}"
+          # TODO: This is a workaround for windows. The hart file sometimes gets copied to the
+          # %TEMP%\kitchen instead of %TEMP%\kitchen\results.
+          if windows_os?
+            target_pkg = target_pkg.gsub("results/", "") unless File.exist?(target_pkg)
+          end
+        else
+          target_pkg = package_ident
+          target_ident = package_ident
+        end
+
+        if windows_os?
+          wrap_shell_code <<~PWSH
+            if (!($env:Path | Select-String "Habitat")) {
+              $env:Path += ";C:\\ProgramData\\Habitat"
+            }
+            hab pkg install #{target_pkg} --channel #{config[:channel]} --force
+            if (Test-Path -Path "$(hab pkg path #{target_ident})\\hooks\\run") {
+              hab svc load #{target_ident} #{service_options} --force
+              $timer = 0
+              Do {
+                if ($timer -gt #{config[:service_load_timeout]}){exit 1}
+                Start-Sleep -Seconds 1
+                $timer++
+              } until( hab svc status | out-string -stream | select-string #{target_ident})
+            }
+          PWSH
+        else
+          wrap_shell_code <<~BASH
+            until sudo -E hab svc status > /dev/null
+              do
+                echo "Waiting 5 seconds for supervisor to finish loading"
+                sleep 5
+              done
+            sudo hab pkg install #{target_pkg} --channel #{config[:channel]} --force
+            if [ -f $(sudo hab pkg path #{target_ident})/hooks/run ]
+              then
+                sudo -E hab svc load #{target_ident} #{service_options} --force
+                timer=0
+                until sudo -E hab svc status | grep #{target_ident}
+                  do
+                    if [$timer -gt #{config[:service_load_timeout]}]; then exit 1; fi
+                    sleep 1
+                    $timer++
+                  done
+            fi
+          BASH
+        end
       end
 
       private
 
-      def clean_up_screen_sessions
-        return unless config[:use_screen]
-        <<-CLEAN
-        if sudo -E screen -ls | grep -q #{clean_package_name}
-          then
-            echo "Killing previous supervisor session."
-            sudo -E screen -S \"#{clean_package_name}\" -X quit > /dev/null
-            echo "Removing dead session."
-            sudo -E screen -wipe > /dev/null
-        fi
-        CLEAN
+      def windows_install_cmd
+        <<~PWSH
+          if ((Get-Command hab -ErrorAction Ignore).Path) {
+            Write-Output "Habitat CLI already installed."
+          } else {
+            Set-ExecutionPolicy Bypass -Scope Process -Force
+            $InstallScript = ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.ps1'))
+            Invoke-Command -ScriptBlock ([scriptblock]::Create($InstallScript)) -ArgumentList #{config[:hab_channel]}, #{config[:hab_version]}
+          }
+        PWSH
       end
 
-      def clean_up_previous_supervisor
-        return if config[:use_screen]
-        <<-EOH
-        [ -f ./run.pid ] && echo "Removing previous supervisor and unloading package. "
-        [ -f ./run.pid ] && sudo -E hab svc unload #{package_ident}
-        [ -f ./run.pid ] && sleep 5
-        [ -f ./run.pid ] && sudo -E kill $(cat run.pid)
-        [ -f ./run.pid ] && sleep 5
-        EOH
+      def linux_install_cmd
+        version = " -v #{config[:hab_version]}" unless config[:hab_version].eql?("latest")
+        <<~BASH
+          if command -v hab >/dev/null 2>&1
+          then
+            echo "Habitat CLI already installed."
+          else
+            curl -o /tmp/install.sh 'https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh'
+            sudo -E bash /tmp/install.sh#{version}
+          fi
+        BASH
       end
 
-      def run_package_in_background
-        if config[:use_screen]
-          "sudo -E screen -mdS \"#{clean_package_name}\" hab start #{package_ident} #{supervisor_options}"
-        else
-          <<-RUN
-          [ -f ./run.pid ] && rm -f run.pid
-          [ -f ./nohup.out ] && rm -f nohup.out
-          nohup sudo -E hab sup run #{supervisor_options} & echo $! > run.pid
-
-          until sudo -E hab svc status
-          do
-            sleep 1
-          done
-
-          sudo -E hab svc load #{package_ident} #{service_options}
-
-          until sudo -E hab svc status | grep #{package_ident}
-          do
-            sleep 1
-          done
+      def windows_install_service
+        <<~WINDOWS_SERVICE_SETUP
+          New-Item -Path C:\\Windows\\Temp\\kitchen -ItemType Directory -Force | Out-Null
+          #{"New-Item -Path C:\\Windows\\Temp\\kitchen\\config -ItemType Directory -Force | Out-Null" unless config[:override_package_config]}
+          if (!($env:Path | Select-String "Habitat")) {
+            $env:Path += ";C:\\ProgramData\\Habitat"
+          }
+          if (!(Get-Service -Name Habitat -ErrorAction Ignore)) {
+            hab license accept
+            Write-Output "Installing Habitat Windows Service"
+            hab pkg install core/windows-service
+            if ($(Get-Service -Name Habitat).Status -ne "Stopped") {
+              Stop-Service -Name Habitat
+            }
+            $HabSvcConfig = "c:\\hab\\svc\\windows-service\\HabService.dll.config"
+            [xml]$xmlDoc = Get-Content $HabSvcConfig
+            $obj = $xmlDoc.configuration.appSettings.add | where {$_.Key -eq "launcherArgs" }
+            $obj.value = "--no-color#{supervisor_options}"
+            $xmlDoc.Save($HabSvcConfig)
+            Start-Service -Name Habitat
+          }
+        WINDOWS_SERVICE_SETUP
+      end
 
-          [ -f ./nohup.out ] && cat nohup.out || (echo "Failed to start the supervisor." && exit 1)
-          RUN
-        end
+      def linux_install_service
+        <<~LINUX_SERVICE_SETUP
+          id -u hab >/dev/null 2>&1 || sudo -E useradd hab >/dev/null 2>&1
+          rm -rf /tmp/kitchen
+          mkdir -p /tmp/kitchen/results
+          #{"mkdir -p /tmp/kitchen/config" unless config[:override_package_config]}
+          if [ -f /etc/systemd/system/hab-sup.service ]
+          then
+            echo "Hab-sup service already exists"
+          else
+            echo "Starting hab-sup service install"
+            hab license accept
+            if ! id -u hab > /dev/null 2>&1; then
+              echo "Adding hab user"
+              sudo -E groupadd hab
+            fi
+            if ! id -g hab > /dev/null 2>&1; then
+              echo "Adding hab group"
+              sudo -E useradd -g hab hab
+            fi
+            echo [Unit] | sudo tee /etc/systemd/system/hab-sup.service
+            echo Description=The Chef Habitat Supervisor | sudo tee -a /etc/systemd/system/hab-sup.service
+            echo [Service] | sudo tee -a /etc/systemd/system/hab-sup.service
+            echo Environment="HAB_BLDR_URL=#{config[:depot_url]}" | sudo tee -a /etc/systemd/system/hab-sup.service
+            echo Environment="HAB_LICENSE=#{config[:hab_license]}" | sudo tee -a /etc/systemd/system/hab-sup.service
+            echo "ExecStart=/bin/hab sup run #{supervisor_options}" | sudo tee -a /etc/systemd/system/hab-sup.service
+            echo [Install] | sudo tee -a /etc/systemd/system/hab-sup.service
+            echo WantedBy=default.target | sudo tee -a /etc/systemd/system/hab-sup.service
+            sudo -E systemctl daemon-reload
+            sudo -E systemctl start hab-sup
+            sudo -E systemctl enable hab-sup
+          fi
+        LINUX_SERVICE_SETUP
       end
 
       def resolve_results_directory
@@ -198,6 +275,7 @@ module Kitchen
       def copy_package_config_from_override_to_sandbox
         return if config[:config_directory].nil?
         return unless config[:override_package_config]
+
         local_config_dir = File.join(config[:kitchen_root], config[:config_directory])
         return unless Dir.exist?(local_config_dir)
 
@@ -207,8 +285,10 @@ module Kitchen
 
       def copy_results_to_sandbox
         return if config[:artifact_name].nil? && !config[:install_latest_artifact]
+
         results_dir = resolve_results_directory
         return if results_dir.nil?
+
         FileUtils.mkdir_p(File.join(sandbox_path, "results"))
         FileUtils.cp(
           File.join(results_dir, config[:install_latest_artifact] ? latest_artifact_name : config[:artifact_name]),
@@ -228,82 +308,63 @@ module Kitchen
       def copy_user_toml_to_sandbox
         return if config[:config_directory].nil?
         return unless File.exist?(full_user_toml_path)
+
         FileUtils.mkdir_p(File.join(sandbox_path, "config"))
         debug("Copying user.toml from #{full_user_toml_path} to #{sandbox_user_toml_path}")
         FileUtils.cp(full_user_toml_path, sandbox_user_toml_path)
       end
 
-      def install_service_package
-        return unless config[:install_latest_artifact] || !config[:artifact_name].nil?
-
-        artifact_name = ""
-        if config[:install_latest_artifact]
-          artifact_name = latest_artifact_name
-        elsif !config[:install_latest_artifact] && !config[:artifact_name].nil?
-          artifact_name = config[:artifact_name]
-        else
-          return
-        end
-        parsed_name = artifact_name.split("-")
-        config[:package_origin] = parsed_name[0]
-        config[:package_name] = parsed_name[1]
-        config[:package_version] = parsed_name[2]
-        config[:package_release] = parsed_name[3]
-
-        artifact_path = File.join(File.join(config[:root_path], "results"), artifact_name)
-        "sudo -E hab pkg install #{artifact_path}"
-      end
-
       def latest_artifact_name
         results_dir = resolve_results_directory
         return if results_dir.nil?
 
-        artifact_path = Dir.glob(File.join(results_dir, "#{config[:package_origin]}-#{config[:package_name]}-*.hart")).max_by { |f| File.mtime(f) }
+        if config[:install_latest_artifact]
+          if config[:package_origin].nil? || config[:package_name].nil?
+            raise UserError,
+                "You must specify a 'package_origin' and 'package_name' to use the 'install_latest_artifact' option"
+          end
+        end
 
+        artifact_path = Dir.glob(File.join(results_dir, "#{config[:package_origin]}-#{config[:package_name]}-*.hart")).max_by { |f| File.mtime(f) }
         File.basename(artifact_path)
       end
 
       def copy_user_toml_to_service_directory
         return unless !config[:config_directory].nil? && File.exist?(full_user_toml_path)
-        <<-EOH
-          sudo -E mkdir -p /hab/svc/#{config[:package_name]}
-          sudo -E cp #{File.join(File.join(config[:root_path], 'config'), 'user.toml')} /hab/svc/#{config[:package_name]}/user.toml
-        EOH
-      end
-
-      def remove_previous_user_toml
-        <<-REMOVE
-        if [ -d "/hab/svc/#{config[:package_name]}" ]; then
-          sudo -E find /hab/svc/#{config[:package_name]} -name user.toml -delete
-        fi
-        REMOVE
-      end
-
-      def export_hab_bldr_url
-        return if config[:depot_url].nil?
-        "export HAB_BLDR_URL=#{config[:depot_url]}"
-      end
 
-      def install_supervisor_command
-        "sudo -E hab pkg install #{hab_sup_ident}"
+        if windows_os?
+          <<~PWSH
+            New-Item -Path c:\\hab\\user\\#{config[:package_name]}\\config -ItemType Directory -Force  | Out-Null
+            Copy-Item -Path #{File.join(File.join(config[:root_path], "config"), "user.toml")} -Destination c:\\hab\\user\\#{config[:package_name]}\\config\\user.toml -Force
+          PWSH
+        else
+          <<~BASH
+            sudo -E mkdir -p /hab/user/#{config[:package_name]}/config
+            sudo -E cp #{File.join(File.join(config[:root_path], "config"), "user.toml")} /hab/user/#{config[:package_name]}/config/user.toml
+          BASH
+        end
       end
 
-      def binlink_supervisor_command
-        "sudo -E hab pkg binlink #{hab_sup_ident} hab-sup"
+      def remove_previous_user_toml
+        if windows_os?
+          <<~REMOVE
+            if (Test-Path c:\\hab\\user\\#{config[:package_name]}\\config\\user.toml) {
+              Remove-Item -Path c:\\hab\\user\\#{config[:package_name]}\\config\\user.toml -Force
+            }
+          REMOVE
+        else
+          <<~REMOVE
+            if [ -d "/hab/user/#{config[:package_name]}/config" ]; then
+              sudo -E find /hab/user/#{config[:package_name]}/config -name user.toml -delete
+            fi
+          REMOVE
+        end
       end
 
       def artifact_name_to_package_ident_regex
         /(?<origin>\w+)-(?<name>.*)-(?<version>(\d+)?(\.\d+)?(\.\d+)?(\.\d+)?)-(?<release>\d+)-(?<target>.*)\.hart$/
       end
 
-      def hab_sup_ident
-        ident = "#{config[:hab_sup_origin]}/" \
-                "#{config[:hab_sup_name]}/" \
-                "#{config[:hab_sup_version]}/" \
-                "#{config[:hab_sup_release]}".chomp("/").chomp("/")
-        @sup_ident ||= ident
-      end
-
       def package_ident
         ident = "#{config[:package_origin]}/" \
                 "#{config[:package_name]}/" \
@@ -312,21 +373,40 @@ module Kitchen
         @pkg_ident = ident
       end
 
-      def clean_package_name
-        @clean_name ||= "#{config[:package_origin]}-#{config[:package_name]}"
+      def get_artifact_name
+        artifact_name = ""
+        if config[:install_latest_artifact]
+          artifact_name = latest_artifact_name
+        elsif !config[:install_latest_artifact] && !config[:artifact_name].nil?
+          artifact_name = config[:artifact_name]
+        else
+          return
+        end
+        ident = artifact_name_to_package_ident_regex.match(artifact_name)
+        config[:package_origin] = ident["origin"]
+        config[:package_name] = ident["name"]
+        config[:package_version] = ident["version"]
+        config[:package_release] = ident["release"]
+        File.join(File.join(config[:root_path], "results"), artifact_name)
       end
 
       def supervisor_options
         options = ""
         options += " --listen-ctl #{config[:hab_sup_listen_ctl]}" unless config[:hab_sup_listen_ctl].nil?
         options += " --listen-gossip #{config[:hab_sup_listen_gossip]}" unless config[:hab_sup_listen_gossip].nil?
-        options += " --config-from #{File.join(config[:root_path], 'config/')}" if config[:override_package_config]
+        options += " --config-from #{File.join(config[:root_path], "config/")}" if config[:override_package_config]
         options += config[:hab_sup_bind].map { |b| " --bind #{b}" }.join(" ") if config[:hab_sup_bind].any?
         options += config[:hab_sup_peer].map { |p| " --peer #{p}" }.join(" ") if config[:hab_sup_peer].any?
         options += " --group #{config[:hab_sup_group]}" unless config[:hab_sup_group].nil?
+        options += " --ring #{config[:hab_sup_ring]}" unless config[:hab_sup_ring].nil?
         options += " --topology #{config[:service_topology]}" unless config[:service_topology].nil?
         options += " --strategy #{config[:service_update_strategy]}" unless config[:service_update_strategy].nil?
         options += " --channel #{config[:channel]}" unless config[:channel].nil?
+        options += " --event-stream-application #{config[:event_stream_application]}" unless config[:event_stream_application].nil?
+        options += " --event-stream-environment #{config[:event_stream_environment]}" unless config[:event_stream_environment].nil?
+        options += " --event-stream-site #{config[:event_stream_site]}" unless config[:event_stream_site].nil?
+        options += " --event-stream-url #{config[:event_stream_url]}" unless config[:event_stream_url].nil?
+        options += " --event-stream-token #{config[:event_stream_token]}" unless config[:event_stream_token].nil?
 
         options
       end

metadata

@@ -1,29 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Steven Murawski
-autorequire: 
+- Robb Kidd
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -104,20 +111,20 @@ description: |+
   TBD
 
 email:
-- smurawski@chef.io
+- steven.murawski@gmail.com
+- robb@thekidds.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- kitchen-habitat.gemspec
 - lib/kitchen-habitat/version.rb
 - lib/kitchen/provisioner/habitat.rb
 homepage: https://github.com/test-kitchen/kitchen-habitat
 licenses:
-- Apache 2
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,9 +139,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Habitat provisioner for test-kitchen
 test_files: []
+...

data/kitchen-habitat.gemspec

@@ -1,38 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "kitchen-habitat/version"
-
-Gem::Specification.new do |s|
-  s.name              = "kitchen-habitat"
-  s.version           = Kitchen::Habitat::VERSION
-  s.authors           = ["Steven Murawski"]
-  s.email             = ["smurawski@chef.io"]
-  s.homepage          = "https://github.com/test-kitchen/kitchen-habitat"
-  s.summary           = "Habitat provisioner for test-kitchen"
-  candidates          = Dir.glob("lib/**/*") + ["README.md", "kitchen-habitat.gemspec"]
-  s.files             = candidates.sort
-  s.platform          = Gem::Platform::RUBY
-  s.require_paths     = ["lib"]
-  s.rubyforge_project = "[none]"
-  s.license           = "Apache 2"
-  s.description       = <<-EOF
-== DESCRIPTION:
-
-Habitat Provisioner for Test Kitchen
-
-== FEATURES:
-
-TBD
-
-EOF
-  s.add_dependency "test-kitchen", "~> 1.4"
-
-  s.add_development_dependency "countloc", "~> 0.4"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec",     "~> 3.2"
-  s.add_development_dependency "simplecov", "~> 0.9"
-
-  # style and complexity libraries are tightly version pinned as newer releases
-  # may introduce new and undesireable style choices which would be immediately
-  # enforced in CI
-  s.add_development_dependency "chefstyle"
-end