mixlib-install 3.15.0 → 3.16.0

data/lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb

@@ -62,10 +62,10 @@ unable_to_retrieve_package() {
   echo "Unable to retrieve a valid package!"
   report_bug
   echo "Metadata URL: $metadata_url"
-  if test "x$download_url" != "x"; then
+  if [ -n "$download_url" ]; then
     echo "Download URL: $download_url"
   fi
-  if test "x$stderr_results" != "x"; then
+  if [ -n "$stderr_results" ]; then
     echo "\nDEBUG OUTPUT FOLLOWS:\n$stderr_results"
   fi
   exit 1
@@ -94,10 +94,10 @@ http_404_error() {
   echo ""
   # deliberately do not call report_bug to suppress bug report noise.
   echo "Metadata URL: $metadata_url"
-  if test "x$download_url" != "x"; then
+  if [ -n "$download_url" ]; then
     echo "Download URL: $download_url"
   fi
-  if test "x$stderr_results" != "x"; then
+  if [ -n "$stderr_results" ]; then
     echo "\nDEBUG OUTPUT FOLLOWS:\n$stderr_results"
   fi
   exit 1
@@ -105,7 +105,7 @@ http_404_error() {
 
 capture_tmp_stderr() {
   # spool up /tmp/stderr from all the commands we called
-  if test -f "$tmp_dir/stderr"; then
+  if [ -f "$tmp_dir/stderr" ]; then
     output=`cat $tmp_dir/stderr`
     stderr_results="${stderr_results}\nSTDERR from $1:\n\n$output\n"
     rm $tmp_dir/stderr
@@ -116,27 +116,26 @@ capture_tmp_stderr() {
 do_wget() {
   echo "trying wget..."
   # If filename is empty, use --content-disposition to get filename from server
-  if test "x$2" = "x"; then
+  if [ -z "$2" ]; then
     wget --user-agent="User-Agent: <%= user_agent_string %>" --content-disposition "$1" 2>$tmp_dir/stderr
   else
     wget --user-agent="User-Agent: <%= user_agent_string %>" -O "$2" "$1" 2>$tmp_dir/stderr
   fi
   rc=$?
   # check for 404
-  grep "ERROR 404" $tmp_dir/stderr 2>&1 >/dev/null
-  if test $? -eq 0; then
+  if grep "ERROR 404" $tmp_dir/stderr 2>&1 >/dev/null; then
     echo "ERROR 404"
     http_404_error
   fi
 
   # check for bad return status (skip empty output check if using content-disposition)
-  if test $rc -ne 0; then
+  if [ $rc -ne 0 ]; then
     capture_tmp_stderr "wget"
     return 1
   fi
-  
+
   # Only check for empty output if we specified a filename
-  if test "x$2" != "x" && test ! -s "$2"; then
+  if [ -n "$2" ] && [ ! -s "$2" ]; then
     capture_tmp_stderr "wget"
     return 1
   fi
@@ -148,29 +147,28 @@ do_wget() {
 do_curl() {
   echo "trying curl..."
   # If filename is empty, use -O and -J to get filename from Content-Disposition header
-  if test "x$2" = "x"; then
+  if [ -z "$2" ]; then
     curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -D $tmp_dir/stderr -O -J "$1"
     rc=$?
   else
     curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
     rc=$?
   fi
-  
+
   # check for 404
-  grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
-  if test $? -eq 0; then
+  if grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null; then
     echo "ERROR 404"
     http_404_error
   fi
 
   # check for bad return status
-  if test $rc -ne 0; then
+  if [ $rc -ne 0 ]; then
     capture_tmp_stderr "curl"
     return 1
   fi
-  
+
   # Only check for empty output if we specified a filename
-  if test "x$2" != "x" && test ! -s "$2"; then
+  if [ -n "$2" ] && [ ! -s "$2" ]; then
     capture_tmp_stderr "curl"
     return 1
   fi
@@ -183,7 +181,7 @@ do_fetch() {
   echo "trying fetch..."
   fetch --user-agent="User-Agent: <%= user_agent_string %>" -o "$2" "$1" 2>$tmp_dir/stderr
   # check for bad return status
-  test $? -ne 0 && return 1
+  [ $? -ne 0 ] && return 1
   return 0
 }
 
@@ -193,14 +191,13 @@ do_perl() {
   perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
-  grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
-  if test $? -eq 0; then
+  if grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null; then
     echo "ERROR 404"
     http_404_error
   fi
 
   # check for bad return status or empty output
-  if test $rc -ne 0 || test ! -s "$2"; then
+  if [ $rc -ne 0 ] || [ ! -s "$2" ]; then
     capture_tmp_stderr "perl"
     return 1
   fi
@@ -214,14 +211,13 @@ do_python() {
   python -c "import sys,urllib2; sys.stdout.write(urllib2.urlopen(urllib2.Request(sys.argv[1], headers={ 'User-Agent': '<%= user_agent_string %>' })).read())" "$1" > "$2" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
-  grep "HTTP Error 404" $tmp_dir/stderr 2>&1 >/dev/null
-  if test $? -eq 0; then
+  if grep "HTTP Error 404" $tmp_dir/stderr 2>&1 >/dev/null; then
     echo "ERROR 404"
     http_404_error
   fi
 
   # check for bad return status or empty output
-  if test $rc -ne 0 || test ! -s "$2"; then
+  if [ $rc -ne 0 ] || [ ! -s "$2" ]; then
     capture_tmp_stderr "python"
     return 1
   fi
@@ -233,11 +229,13 @@ do_checksum() {
   if exists sha256sum; then
     echo "Comparing checksum with sha256sum..."
     checksum=`sha256sum $1 | awk '{ print $1 }'`
-    return `test "x$checksum" = "x$2"`
+    [ "$checksum" = "$2" ]
+    return $?
   elif exists shasum; then
     echo "Comparing checksum with shasum..."
     checksum=`shasum -a 256 $1 | awk '{ print $1 }'`
-    return `test "x$checksum" = "x$2"`
+    [ "$checksum" = "$2" ]
+    return $?
   else
     echo "WARNING: could not find a valid checksum program, pre-install shasum or sha256sum in your O/S image to get validation..."
     return 0
@@ -250,8 +248,8 @@ do_download() {
   echo "  to file $2"
 
   url=`echo $1`
-  if test "x$platform" = "xsolaris2"; then
-    if test "x$platform_version" = "x5.9" -o "x$platform_version" = "x5.10"; then
+  if [ "$platform" = "solaris2" ]; then
+    if [ "$platform_version" = "5.9" ] || [ "$platform_version" = "5.10" ]; then
       # solaris 9 lacks openssl, solaris 10 lacks recent enough credentials - your base O/S is completely insecure, please upgrade
       url=`echo $url | sed -e 's/https/http/'`
     fi
@@ -289,7 +287,7 @@ install_file() {
   echo "Installing $project $version"
   case "$1" in
     "rpm")
-      if test "x$platform" = "xnexus" || test "x$platform" = "xios_xr"; then
+      if [ "$platform" = "nexus" ] || [ "$platform" = "ios_xr" ]; then
         echo "installing with yum..."
         yum install -yv "$2"
       else
@@ -338,14 +336,14 @@ install_file() {
       exit 1
       ;;
   esac
-  if test $? -ne 0; then
+  if [ $? -ne 0 ]; then
     echo "Installation failed"
     report_bug
     exit 1
   fi
 }
 
-if test "x$TMPDIR" = "x"; then
+if [ -z "$TMPDIR" ]; then
   tmp="/tmp"
 else
   tmp=$TMPDIR

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

@@ -8,7 +8,7 @@
 # $version: The version requested. Used only for warning user if not set.
 ############
 
-if test "x$version" = "x" -a "x$CI" != "xtrue"; then
+if [ -z "$version" ] && [ "$CI" != "true" ]; then
   echo
   echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
   echo
@@ -24,7 +24,7 @@ fi
 
 install_file $filetype "$download_filename"
 
-if test "x$tmp_dir" != "x"; then
+if [ -n "$tmp_dir" ]; then
   rm -r "$tmp_dir"
 fi
 

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

@@ -25,35 +25,35 @@
 machine=`uname -m`
 os=`uname -s`
 
-if test -f "/etc/lsb-release" && grep DISTRIB_ID /etc/lsb-release >/dev/null && ! grep wrlinux /etc/lsb-release >/dev/null; then
+if [ -f "/etc/lsb-release" ] && grep DISTRIB_ID /etc/lsb-release >/dev/null && ! grep wrlinux /etc/lsb-release >/dev/null; then
   platform=`grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]'`
   platform_version=`grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2`
 
-  if test "$platform" = "\"cumulus linux\""; then
+  if [ "$platform" = '"cumulus linux"' ]; then
     platform="cumulus_linux"
-  elif test "$platform" = "\"cumulus networks\""; then
+  elif [ "$platform" = '"cumulus networks"' ]; then
     platform="cumulus_networks"
   fi
 
-elif test -f "/etc/debian_version"; then
+elif [ -f "/etc/debian_version" ]; then
   platform="debian"
   platform_version=`cat /etc/debian_version`
-elif test -f "/etc/Eos-release"; then
+elif [ -f "/etc/Eos-release" ]; then
   # EOS may also contain /etc/redhat-release so this check must come first.
   platform=arista_eos
   platform_version=`awk '{print $4}' /etc/Eos-release`
   machine="i386"
-elif test -f "/etc/redhat-release"; then
+elif [ -f "/etc/redhat-release" ]; then
   platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]'`
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
-  
-  if test "$platform" = "rocky linux"; then
+
+  if [ "$platform" = "rocky linux" ]; then
   	source /etc/os-release
  	os="${REDHAT_SUPPORT_PRODUCT}"
   	platform_version="${ROCKY_SUPPORT_PRODUCT_VERSION}"
         platform=$ID
 
-  elif test "$platform" = "xenserver"; then
+  elif [ "$platform" = "xenserver" ]; then
     # Current XenServer 6.2 is based on CentOS 5, platform is not reset to "el" server should handle response
     platform="xenserver"
   else
@@ -61,7 +61,7 @@ elif test -f "/etc/redhat-release"; then
     platform="el"
   fi
 
-elif test -f "/etc/system-release"; then
+elif [ -f "/etc/system-release" ]; then
   platform=`sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
   case $platform in amazon*) # sh compat method of checking for a substring
@@ -88,11 +88,11 @@ elif test -f "/etc/system-release"; then
 
 
 # Apple macOS
-elif test -f "/usr/bin/sw_vers"; then
+elif [ -f "/usr/bin/sw_vers" ]; then
   platform="mac_os_x"
   # Matching the tab-space with sed is error-prone
   platform_version=`sw_vers | awk '/^ProductVersion:/ { print $2 }' | cut -d. -f1,2`
-elif test -f "/etc/release"; then
+elif [ -f "/etc/release" ]; then
   machine=`/usr/bin/uname -p`
   if grep SmartOS /etc/release >/dev/null; then
     platform="smartos"
@@ -101,7 +101,7 @@ elif test -f "/etc/release"; then
     platform="solaris2"
     platform_version=`/usr/bin/uname -r`
   fi
-elif test -f "/etc/SuSE-release"; then
+elif [ -f "/etc/SuSE-release" ]; then
   if grep 'Enterprise' /etc/SuSE-release >/dev/null;
   then
       platform="sles"
@@ -110,16 +110,16 @@ elif test -f "/etc/SuSE-release"; then
       platform="opensuseleap"
       platform_version=`awk '/^VERSION =/ { print $3 }' /etc/SuSE-release`
   fi
-elif test "x$os" = "xFreeBSD"; then
+elif [ "$os" = "FreeBSD" ]; then
   platform="freebsd"
   platform_version=`uname -r | sed 's/-.*//'`
-elif test "x$os" = "xAIX"; then
+elif [ "$os" = "AIX" ]; then
   platform="aix"
   platform_version="`uname -v`.`uname -r`"
   machine="powerpc"
-elif test -f "/etc/os-release"; then
+elif [ -f "/etc/os-release" ]; then
   . /etc/os-release
-  if test "x$CISCO_RELEASE_INFO" != "x"; then
+  if [ -n "$CISCO_RELEASE_INFO" ]; then
     . $CISCO_RELEASE_INFO
   fi
 
@@ -127,14 +127,14 @@ elif test -f "/etc/os-release"; then
 
   # VERSION_ID is always the preferred variable to use, but not
   # every distro has it so fallback to VERSION
-  if test "x$VERSION_ID" != "x"; then
+  if [ -n "$VERSION_ID" ]; then
     platform_version=$VERSION_ID
   else
     platform_version=$VERSION
   fi
 fi
 
-if test "x$platform" = "x"; then
+if [ -z "$platform" ]; then
   echo "Unable to determine platform version!"
   report_bug
   exit 1
@@ -158,7 +158,7 @@ case $platform in
     platform_version=$major_version
     ;;
   "debian")
-    if test "x$major_version" = "x5"; then
+    if [ "$major_version" = "5" ]; then
       # This is here for potential back-compat.
       # We do not have 5 in versions we publish for anymore but we
       # might have it for earlier versions.
@@ -194,13 +194,13 @@ case $machine in
     ;;
 esac
 
-if test "x$platform_version" = "x"; then
+if [ -z "$platform_version" ]; then
   echo "Unable to determine platform version!"
   report_bug
   exit 1
 fi
 
-if test "x$platform" = "xsolaris2"; then
+if [ "$platform" = "solaris2" ]; then
   # hack up the path on Solaris to find wget, pkgadd
   PATH=/usr/sfw/bin:/usr/sbin:$PATH
   export PATH

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

@@ -3,7 +3,7 @@
 # Otherwise, default proxy env vars will be loaded by the respective
 # download utility.
 
-if test "x$https_proxy" != "x"; then
+if [ -n "$https_proxy" ]; then
   echo "setting https_proxy: $https_proxy"
   HTTPS_PROXY=$https_proxy
   https_proxy=$https_proxy
@@ -11,7 +11,7 @@ if test "x$https_proxy" != "x"; then
   export https_proxy
 fi
 
-if test "x$http_proxy" != "x"; then
+if [ -n "$http_proxy" ]; then
   echo "setting http_proxy: $http_proxy"
   HTTP_PROXY=$http_proxy
   http_proxy=$http_proxy
@@ -19,7 +19,7 @@ if test "x$http_proxy" != "x"; then
   export http_proxy
 fi
 
-if test "x$ftp_proxy" != "x"; then
+if [ -n "$ftp_proxy" ]; then
   echo "setting ftp_proxy: $ftp_proxy"
   FTP_PROXY=$ftp_proxy
   ftp_proxy=$ftp_proxy
@@ -27,7 +27,7 @@ if test "x$ftp_proxy" != "x"; then
   export ftp_proxy
 fi
 
-if test "x$no_proxy" != "x"; then
+if [ -n "$no_proxy" ]; then
   echo "setting no_proxy: $no_proxy"
   NO_PROXY=$no_proxy
   no_proxy=$no_proxy

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

@@ -18,12 +18,14 @@
 # Defaults
 channel="stable"
 project="<%= default_product %>"
+<%= "license_id=\"#{license_id}\"" if license_id && !license_id.to_s.empty? %>
 
-while getopts pnv:c:f:P:d:s:l:a:L: opt
+while getopts pnv:b:c:f:P:d:s:l:a:L: opt
 do
   case "$opt" in
 
     v)  version="$OPTARG";;
+    b)  base_api_url="$OPTARG";;
     c)  channel="$OPTARG";;
     p)  channel="current";; # compat for prerelease option
     n)  channel="current";; # compat for nightlies option
@@ -36,7 +38,7 @@ do
     L)  license_id="$OPTARG";;
     \?)   # unknown flag
       echo >&2 \
-      "usage: $0 [-P project] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum] [-L license_id]"
+      "usage: $0 [-P project] [-b base_api_url] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum] [-L license_id]"
       exit 1;;
   esac
 done
@@ -44,6 +46,6 @@ done
 shift `expr $OPTIND - 1`
 
 # Use CHEF_LICENSE_KEY environment variable if license_id not provided via CLI
-if [ -z "$license_id" ] && [ -n "${CHEF_LICENSE_KEY:-}" ]; then
+if [ -z "$license_id" ] && [ -n "$CHEF_LICENSE_KEY" ]; then
   license_id="$CHEF_LICENSE_KEY"
 fi

data/lib/mixlib/install/generator/bourne.rb

@@ -24,19 +24,7 @@ module Mixlib
         def self.install_sh(context)
           install_command = []
           install_command << get_script("helpers.sh", context)
-          # If license_id is provided in context, pre-set it as a variable
-          if context[:license_id] && !context[:license_id].to_s.empty?
-            install_command << "# License ID provided via context"
-            install_command << "license_id='#{context[:license_id]}'"
-          end
-          install_command << get_script("script_cli_parameters.sh")
-          # Check for CHEF_LICENSE_KEY in execution environment if not already set
-          install_command << <<~BASH.chomp
-            # Use CHEF_LICENSE_KEY from execution environment if license_id not set
-            if [ -z "${license_id:-}" ] && [ -n "${CHEF_LICENSE_KEY:-}" ]; then
-              license_id="$CHEF_LICENSE_KEY"
-            fi
-          BASH
+          install_command << get_script("script_cli_parameters.sh", context)
           install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
           install_command << get_script("proxy_env.sh")
@@ -61,7 +49,7 @@ module Mixlib
           install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
           install_command << get_script("proxy_env.sh")
-          install_command << get_script("fetch_metadata.sh")
+          install_command << get_script("fetch_metadata.sh", license_id: options.license_id, base_url: options.base_url)
           install_command << get_script("fetch_package.sh")
           install_command << get_script("install_package.sh")
 
@@ -73,16 +61,13 @@ module Mixlib
 project=#{options.product_name}
 version=#{options.product_version}
 channel=#{options.channel}
+#{"license_id=#{options.license_id}" if options.license_id && !options.license_id.to_s.empty?}
+#{"base_api_url=#{options.base_url}" if options.base_url && !options.base_url.to_s.empty?}
 EOS
-          # Add license_id if provided, otherwise use CHEF_LICENSE_KEY env var
-          license_id_value = options.license_id || ENV["CHEF_LICENSE_KEY"]
-          if license_id_value && !license_id_value.to_s.empty?
-            vars += "license_id=#{license_id_value}\n"
-          end
           # Check for CHEF_LICENSE_KEY in execution environment if not already set
           vars += <<EOS
 # Use CHEF_LICENSE_KEY from execution environment if license_id not set
-if [ -z "${license_id:-}" ] && [ -n "${CHEF_LICENSE_KEY:-}" ]; then
+if [ -z "$license_id" ] && [ -n "$CHEF_LICENSE_KEY" ]; then
   license_id="$CHEF_LICENSE_KEY"
 fi
 EOS

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

@@ -1,3 +1,4 @@
+################ get_project_metadata.ps1
 function Get-ProjectMetadata {
   <#
     .SYNOPSIS
@@ -5,22 +6,21 @@ function Get-ProjectMetadata {
     .DESCRIPTION
     Get metadata for project
     .EXAMPLE
-    iex (new-object net.webclient).downloadstring('<%= base_url %>/install.ps1'); Get-ProjectMetadata -project chef -channel stable
+    iex (new-object net.webclient).downloadstring('<%= base_url || "https://chefdownload-commercial.chef.io" %>/install.ps1<%= base_url && base_url.include?("chefdownload") ? "?license_id=$env:CHEF_LICENSE_KEY" : "" %>'); Get-ProjectMetadata -project chef -channel stable
 
     Gets the download url and SHA256 checksum for the latest stable release of Chef.
     .EXAMPLE
-    iex (irm '<%= base_url %>/install.ps1'); Get-ProjectMetadata -project chefdk -channel stable -version 0.8.0
-
-    Gets the download url and SHA256 checksum for ChefDK 0.8.0.
+    iex (irm '<%= base_url || "https://chefdownload-commercial.chef.io" %>/install.ps1<%= base_url && base_url.include?("chefdownload") ? "?license_id=$env:CHEF_LICENSE_KEY" : "" %>'); Get-ProjectMetadata -project chef-workstation -channel stable
   #>
   [cmdletbinding()]
   param (
     # Base url to retrieve metadata from.
-    [uri]$base_server_uri = '<%= base_url %>',
+    [uri]
+    $base_server_uri,
     [string]
     # Project to install
     [string]
-    $project = 'chef',
+    $project = '<%= default_product %>',
     # Version of the application to install
     # This parameter is optional, if not supplied it will provide the latest version,
     # and if an iteration number is not specified, it will grab the latest available iteration.
@@ -42,7 +42,7 @@ function Get-ProjectMetadata {
     $architecture = 'auto',
     # License ID for commercial API access
     [string]
-    $license_id
+    $license_id <%= "= '#{license_id}'" if license_id && !license_id.to_s.empty? %>
   )
 
   # The following legacy switches are just aliases for the current channel
@@ -51,47 +51,63 @@ function Get-ProjectMetadata {
 
   # PowerShell is only on Windows ATM
   $platform = 'windows'
-  Write-Verbose "Platform: $platform"
+  Write-Host "Platform: $platform"
 
   $platform_version = Get-PlatformVersion
-  Write-Verbose "Platform Version: $platform_version"
+  Write-Host "Platform Version: $platform_version"
 
   if ($architecture -eq 'auto') {
     $architecture = Get-PlatformArchitecture
   }
 
-  Write-Verbose "Architecture: $architecture"
-  Write-Verbose "Project: $project"
+  Write-Host "Architecture: $architecture"
+  Write-Host "Project: $project"
 
-  # Use commercial API if license_id is provided, otherwise use omnitruck
-  if ($license_id) {
-    # Check if license_id starts with 'free-' or 'trial-' for trial API
-    if ($license_id -match '^(free-|trial-)') {
-      $base_server_uri = 'https://chefdownload-trial.chef.io'
-      Write-Verbose "Using Trial API with license ID"
-    } else {
-      $base_server_uri = 'https://chefdownload-commercial.chef.io'
-      Write-Verbose "Using Commercial API with license ID"
+<% if base_url && !base_url.to_s.empty? %>
+  # Set base_server_uri from option if not already set via parameter
+  if ([string]::IsNullOrEmpty($base_server_uri)) {
+    $base_server_uri = "<%= base_url %>"
+  }
+<% end %>
+
+  if ([string]::IsNullOrEmpty($base_server_uri)) {
+    if (-not [string]::IsNullOrEmpty($license_id)) {
+      # Check if license_id starts with 'free-' or 'trial-' for trial API
+      if ($license_id -match '^(free-|trial-)') {
+        # Trial API endpoint
+        $base_server_uri = "<%= Mixlib::Install::Dist::TRIAL_API_ENDPOINT %>"
+      }
+      else {
+        # Commercial API endpoint
+        $base_server_uri = "<%= Mixlib::Install::Dist::COMMERCIAL_API_ENDPOINT %>"
+      }
+    }
+    else {
+      # Omnitruck endpoint
+      $base_server_uri = "<%= Mixlib::Install::Dist::OMNITRUCK_ENDPOINT %>"
     }
   }
 
-  $metadata_base_url = "/$($channel)/$($project)/metadata"
-  $metadata_array = ("?v=$($version)",
-    "p=$platform",
-    "pv=$platform_version",
-    "m=$architecture")
-  
-  # Add license_id to query parameters if provided
-  if ($license_id) {
-    $metadata_array += "license_id=$license_id"
+  # For chef-ice product, add platform (p), machine (m), and package_manager (pm) parameters
+  if (-not [string]::IsNullOrEmpty($license_id)) {
+    if ($project -eq "chef-ice") {
+      $package_manager = "msi"
+      $platform_param = "windows"
+      $metadata_url = "$base_server_uri$channel/$project/metadata?license_id=$license_id&v=$version&m=$architecture&p=$platform_param&pm=$package_manager"
+    }
+    else {
+      # For other products, use standard parameters
+      $metadata_url = "$base_server_uri$channel/$project/metadata?license_id=$license_id&v=$version&p=$platform&pv=$platform_version&m=$architecture"
+    }
+  }
+  else {
+    # Omnitruck URL parameters without license_id
+    $metadata_url = "$base_server_uri$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$architecture"
   }
-  
-  $metadata_base_url += [string]::join('&', $metadata_array)
-  $metadata_url = new-uri $base_server_uri $metadata_base_url
 
-  Write-Verbose "Downloading $project details from $metadata_url"
+  Write-Host "Downloading $project details from $metadata_url"
   $response = (Get-WebContent $metadata_url).trim()
-  
+
   # Commercial and trial APIs return JSON, omnitruck returns text format
   if ($license_id) {
     # Parse JSON response from commercial/trial API
@@ -114,9 +130,9 @@ function Get-ProjectMetadata {
       foreach { $hash = @{} } {$key, $value = $_ -split '\s+'; $hash.Add($key, $value)} {$hash}
   }
 
-  Write-Verbose "Project details: "
+  Write-Host "Project details: "
   foreach ($key in $package_metadata.keys) {
-    Write-Verbose "`t$key = $($package_metadata[$key])"
+    Write-Host "`t$key = $($package_metadata[$key])"
   }
   $package_metadata
 }

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

@@ -1,4 +1,8 @@
-[Console]::OutputEncoding = New-Object -typename System.Text.ASCIIEncoding
+################ helpers.ps1
+# Set strict error handling to ensure errors cause script failures
+$ErrorActionPreference = 'Stop'
+
+try { [Console]::OutputEncoding = New-Object -typename System.Text.ASCIIEncoding } catch { }
 [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'
 
 function Get-PlatformVersion {
@@ -168,11 +172,11 @@ function Test-ProjectPackage {
   [cmdletbinding()]
   param ($Path, $Algorithm = 'SHA256', $Hash)
   if (!$env:Valid_ProjectPackage){
-    Write-Verbose "Testing the $Algorithm hash for $path."
+    Write-Host "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'"
+    Write-Host "`tDesired Hash - '$Hash'"
+    Write-Host "`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"