Merge pull request #9644 from habitat-sh/agadgil/no-install-deps-fix

Fixes failure when `NO_INSTALL_DEPS` is set

Author: agadgil-progress

components/plan-build/bin/hab-plan-build.sh

@@ -606,7 +606,7 @@ _ensure_origin_key_present() {
 # If the commands are not found, `exit_with` is called and the program is
 # terminated.
 _find_system_commands() {
-  if exists stat; then    
+  if exists stat; then
     if stat -f '%Su:%g' . 2>/dev/null 1>/dev/null; then
       _stat_variant="bsd"
     elif stat -c '%u:%g' . 2>/dev/null 1>/dev/null; then
@@ -675,6 +675,66 @@ _find_system_commands() {
   fi
 }
 
+# **Internal** Return the path to the latest release of a package on stdout.
+#
+# ```
+# _latest_installed_package acme/nginx
+# # /hab/pkgs/acme/nginx/1.8.0/20150911120000
+# _latest_installed_package acme/nginx/1.8.0
+# # /hab/pkgs/acme/nginx/1.8.0/20150911120000
+# _latest_installed_package acme/nginx/1.8.0/20150911120000
+# # /hab/pkgs/acme/nginx/1.8.0/20150911120000
+# ```
+#
+# Will return 0 if a package was found on disk, and 1 if a package cannot be
+# found. A message will be printed to stderr explaining that no package was
+# found.
+_latest_installed_package() {
+  local result
+  if result="$($HAB_BIN pkg path "$1" 2> /dev/null)"; then
+    echo "$result"
+    return 0
+  else
+    warn "Could not find a suitable installed package for '$1'"
+    return 1
+  fi
+}
+
+# **Internal** Returns the path to the desired package on stdout, using the
+# constraints specified in `$pkg_deps` or `$pkg_build_deps`. If a package
+# cannot be found locally on disk, and the `hab` CLI package is present,
+# this program will attempt to install the package from a remote repository.
+#
+# ```
+# _resolve_dependency acme/zlib
+# # /hab/pkgs/acme/zlib/1.2.8/20151216221001
+# _resolve_dependency acme/zlib/1.2.8
+# # /hab/pkgs/acme/zlib/1.2.8/20151216221001
+# _resolve_dependency acme/zlib/1.2.8/20151216221001
+# # /hab/pkgs/acme/zlib/1.2.8/20151216221001
+# ```
+#
+# Will return 0 if a package was found or installed on disk, and 1 if a package
+# cannot be found or remotely installed. A message will be printed to stderr to
+# provide context.
+_resolve_dependency() {
+  local dep="$1"
+  local dep_path
+  if ! echo "$dep" | grep -q '\/' > /dev/null; then
+    warn "Origin required for '$dep' in plan '$pkg_origin/$pkg_name' (example: acme/$dep)"
+    return 1
+  fi
+
+  if dep_path=$(_latest_installed_package "$dep"); then
+    echo "${dep_path}"
+    return 0
+  else
+    return 1
+  fi
+}
+
+# **Internal** Attempts to download a package dependency. If the value of the
+
 # **Internal** Attempts to download a package dependency. If the value of the
 # `$NO_INSTALL_DEPS` variable is set, then no package installation will occur.
 # If an installation is attempted but there is an error, this function will
@@ -689,22 +749,29 @@ _install_dependency() {
     local dep="${1}"
     local origin
     local channel="$HAB_BLDR_CHANNEL"
-    if [[ -z "${NO_INSTALL_DEPS:-}" ]]; then
-    origin="$(echo "$dep" | cut -d "/" -f 1)"
-    if [[ $origin == "core" ]]; then
-      channel="$HAB_REFRESH_CHANNEL"
-      if [[ $HAB_PREFER_LOCAL_CHEF_DEPS == "false" ]]; then
-        IGNORE_LOCAL="--ignore-local"
-      fi
-    fi
+    if [[ -z "${NO_INSTALL_DEPS:-}" || ${NO_INSTALL_DEPS} == "false" ]]; then
+        origin="$(echo "$dep" | cut -d "/" -f 1)"
+        if [[ $origin == "core" ]]; then
+            channel="$HAB_REFRESH_CHANNEL"
+            if [[ $HAB_PREFER_LOCAL_CHEF_DEPS == "false" ]]; then
+                IGNORE_LOCAL="--ignore-local"
+            fi
+        fi
 
-    $HAB_BIN pkg install -u $HAB_BLDR_URL --channel $channel ${IGNORE_LOCAL:-} "$@" || {
-      if [[ "$channel" != "$HAB_FALLBACK_CHANNEL" ]]; then
-        build_line "Trying to install '$dep' from '$HAB_FALLBACK_CHANNEL'"
-        $HAB_BIN pkg install -u $HAB_BLDR_URL --channel "$HAB_FALLBACK_CHANNEL" ${IGNORE_LOCAL:-} "$@" || true
-      fi
-    }
-  fi
+        $HAB_BIN pkg install -u $HAB_BLDR_URL --channel $channel ${IGNORE_LOCAL:-} "$@" || {
+            if [[ "$channel" != "$HAB_FALLBACK_CHANNEL" ]]; then
+                build_line "Trying to install '$dep' from '$HAB_FALLBACK_CHANNEL'"
+                $HAB_BIN pkg install -u $HAB_BLDR_URL --channel "$HAB_FALLBACK_CHANNEL" ${IGNORE_LOCAL:-} "$@" || true
+            fi
+        }
+    else
+        if resolved=$(_resolve_dependency "${dep}" |  sed "s|${HAB_PKG_PATH}[/]\?||g"); then
+            echo "${resolved}"
+            return 0
+        else
+            return 1
+        fi
+    fi
   return 0
 }
 
@@ -921,7 +988,7 @@ _attach_whereami() {
 # * Otherwise `$_hab_cmd` is used, set in the `_find_system_commands()`
 #   function
 _determine_hab_bin() {
-  if [[ -n "${NO_INSTALL_DEPS:-}" ]]; then
+  if [[ -n "${NO_INSTALL_DEPS:-}" && "${NO_INSTALL_DEPS}" != "false" ]]; then
     build_line "NO_INSTALL_DEPS set: no package dependencies will be installed"
   fi
 

test/end-to-end/test_studio_can_build_packages_no_package_install_env.ps1

@@ -0,0 +1,48 @@
+hab origin key generate $env:HAB_ORIGIN
+
+Context "NO_INSTALL_DEPS env variable is set" {
+    BeforeEach {
+        hab pkg uninstall core/redis
+    }
+
+    Describe "NO_INSTALL_DEPS Environment is Set to True"  {
+        $env:HAB_STUDIO_SECRET_NO_INSTALL_DEPS = "true"
+
+        It "When Package Dependency is already installed" {
+            hab pkg install core/redis
+
+            hab pkg build test/fixtures/no-install-deps
+            $LASTEXITCODE | Should -Be 0
+        }
+
+        It "When Package Dependency is not installed" {
+
+            hab pkg build test/fixtures/no-install-deps
+            $LASTEXITCODE | Should -Not -Be 0
+        }
+    }
+
+    Describe "NO_INSTALL_DEPS Environment is set to False" {
+        $env:HAB_STUDIO_SECRET_NO_INSTALL_DEPS = "false"
+
+        It "When Package Dependency is already installed" {
+            hab pkg install core/redis
+            hab pkg build test/fixtures/no-install-deps
+            $LASTEXITCODE | Should -Be 0
+        }
+
+        It "When Package Dependency is not installed" {
+            hab pkg build test/fixtures/no-install-deps
+            $LASTEXITCODE | Should -Be 0
+        }
+    }
+
+    Describe "NO_INSTALL_DEPS Environment is not set" {
+        $env:HAB_STUDIO_SECRET_NO_INSTALL_DEPS = ""
+
+        It "When Package Dependency is not installed" {
+            hab pkg build test/fixtures/no-install-deps
+            $LASTEXITCODE | Should -Be 0
+        }
+    }
+}