feat(package-service): make envsubst variables availables in scripts …

…instructions
yunielrc · Sep 22, 2023 · 32e89c2 · 32e89c2
1 parent 6d0d1ea
commit 32e89c2
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 6 deletions.
diff --git a/src/usr/lib/ydf/components/package/ydf-package-service.bash b/src/usr/lib/ydf/components/package/ydf-package-service.bash
@@ -108,9 +108,13 @@ ydf::package_service::get_instructions_names() {
 # Returns:
 #   0 on success, non-zero on error.
 #
-ydf::package_service::__instruction_preinstall() {
+ydf::package_service::__instruction_preinstall() (
+  set -o allexport
+  # shellcheck disable=SC1090
+  source "$__YDF_PACKAGE_SERVICE_ENVSUBST_FILE"
+
   bash ./preinstall
-}
+)
 
 #
 # Execute install script
@@ -119,9 +123,13 @@ ydf::package_service::__instruction_preinstall() {
 # Returns:
 #   0 on success, non-zero on error.
 #
-ydf::package_service::__instruction_install() {
+ydf::package_service::__instruction_install() (
+  set -o allexport
+  # shellcheck disable=SC1090
+  source "$__YDF_PACKAGE_SERVICE_ENVSUBST_FILE"
+
   bash ./install
-}
+)
 
 #
 # Execute postinstall script
@@ -130,9 +138,13 @@ ydf::package_service::__instruction_install() {
 # Returns:
 #   0 on success, non-zero on error.
 #
-ydf::package_service::__instruction_postinstall() {
+ydf::package_service::__instruction_postinstall() (
+  set -o allexport
+  # shellcheck disable=SC1090
+  source "$__YDF_PACKAGE_SERVICE_ENVSUBST_FILE"
+
   bash ./postinstall
-}
+)
 
 #
 # Execute @pacman instruction

diff --git a/tests/fixtures/packages/23scriptvars/install b/tests/fixtures/packages/23scriptvars/install
@@ -0,0 +1,2 @@
+echo "install: MY_CONFIG1: ${MY_CONFIG1}"
+echo "install: HOME: ${HOME}"
diff --git a/tests/fixtures/packages/23scriptvars/postinstall b/tests/fixtures/packages/23scriptvars/postinstall
@@ -0,0 +1 @@
+echo "postinstall: MY_CONFIG2: ${MY_CONFIG2}"
diff --git a/tests/fixtures/packages/23scriptvars/preinstall b/tests/fixtures/packages/23scriptvars/preinstall
@@ -0,0 +1 @@
+echo "preinstall: FILE11_1: ${FILE11_1}"
diff --git a/tests/usr/lib/ydf/components/package/ydf-package-service.i.bats b/tests/usr/lib/ydf/components/package/ydf-package-service.i.bats
@@ -1140,3 +1140,37 @@ line 11
 > FAILED. INSTALLING packages
 ERROR> Installing packages"
 }
+
+# Tests for ydf::package_service::__instruction_preinstall()
+@test "ydf::package_service::__instruction_preinstall() Should succeed With variables" {
+
+  cd "${TEST_FIXTURES_DIR}/packages/23scriptvars"
+
+  run ydf::package_service::__instruction_preinstall
+
+  assert_success
+  assert_output "preinstall: FILE11_1: file11_1"
+}
+
+# Tests for ydf::package_service::__instruction_install()
+@test "ydf::package_service::__instruction_install() Should succeed With variables" {
+
+  cd "${TEST_FIXTURES_DIR}/packages/23scriptvars"
+
+  run ydf::package_service::__instruction_install
+
+  assert_success
+  assert_output "install: MY_CONFIG1: my_config1
+install: HOME: /home/vedv"
+}
+
+# Tests for ydf::package_service::__instruction_postinstall()
+@test "ydf::package_service::__instruction_postinstall() Should succeed With variables" {
+
+  cd "${TEST_FIXTURES_DIR}/packages/23scriptvars"
+
+  run ydf::package_service::__instruction_postinstall
+
+  assert_success
+  assert_output "postinstall: MY_CONFIG2: my config2"
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		echo "install: MY_CONFIG1: ${MY_CONFIG1}"
		echo "install: HOME: ${HOME}"