Merge pull request #311 from wttech/pkg-deploy-extract-only

Package install extract only when snapshot

Author: krystian-panek-vmltech

examples/docker/src/aem/default/etc/aem.yml

@@ -165,6 +165,8 @@ instance:
     install_dependency_handling: required
     # Controls how 'rep:policy' nodes are handled during import
     install_ac_handling: ''
+    # Determines whether a copy of the package is created during installation (saves disk space but prevents uninstallation)
+    install_extract_only: snapshot
 
   # 'SSL By Default'
   ssl:

pkg/cfg/defaults.go

@@ -6,6 +6,7 @@ import (
 	"github.com/wttech/aemc/pkg/common"
 	"github.com/wttech/aemc/pkg/common/fmtx"
 	"github.com/wttech/aemc/pkg/instance"
+	"github.com/wttech/aemc/pkg/pkg"
 	"time"
 )
 
@@ -104,6 +105,7 @@ func (c *Config) setDefaults() {
 	v.SetDefault("instance.package.install_save_threshold", 1024)
 	v.SetDefault("instance.package.install_ac_handling", "")
 	v.SetDefault("instance.package.install_dependency_handling", "required")
+	v.SetDefault("instance.package.install_extract_only", pkg.InstallExtractOnlySnapshot)
 
 	v.SetDefault("instance.package.install_html.enabled", false)
 	v.SetDefault("instance.package.install_html.strict", true)

pkg/package_manager.go

@@ -40,6 +40,7 @@ type PackageManager struct {
 	InstallSaveThreshold      int
 	InstallACHandling         string
 	InstallDependencyHandling string
+	InstallExtractOnly        string
 	InstallHTMLEnabled        bool
 	InstallHTMLConsole        bool
 	InstallHTMLStrict         bool
@@ -60,6 +61,7 @@ func NewPackageManager(res *Instance) *PackageManager {
 		InstallSaveThreshold:      cv.GetInt("instance.package.install_save_threshold"),
 		InstallACHandling:         cv.GetString("instance.package.install_ac_handling"),
 		InstallDependencyHandling: cv.GetString("instance.package.install_dependency_handling"),
+		InstallExtractOnly:        cv.GetString("instance.package.install_extract_only"),
 		InstallHTMLEnabled:        cv.GetBool("instance.package.install_html.enabled"),
 		InstallHTMLConsole:        cv.GetBool("instance.package.install_html.console"),
 		InstallHTMLStrict:         cv.GetBool("instance.package.install_html.strict"),
@@ -503,7 +505,7 @@ func (pm *PackageManager) Install(remotePath string) error {
 
 func (pm *PackageManager) installJSON(remotePath string) error {
 	log.Infof("%s > installing package '%s'", pm.instance.IDColor(), remotePath)
-	response, err := pm.instance.http.Request().SetFormData(pm.installParams()).Post(ServiceJsonPath + remotePath)
+	response, err := pm.instance.http.Request().SetFormData(pm.installParams(remotePath)).Post(ServiceJsonPath + remotePath)
 	if err != nil {
 		return fmt.Errorf("%s > cannot install package '%s': %w", pm.instance.IDColor(), remotePath, err)
 	} else if response.IsError() {
@@ -523,7 +525,7 @@ func (pm *PackageManager) installJSON(remotePath string) error {
 func (pm *PackageManager) installHTML(remotePath string) error {
 	log.Infof("%s > installing package '%s'", pm.instance.IDColor(), remotePath)
 
-	response, err := pm.instance.http.Request().SetFormData(pm.installParams()).Post(ServiceHtmlPath + remotePath)
+	response, err := pm.instance.http.Request().SetFormData(pm.installParams(remotePath)).Post(ServiceHtmlPath + remotePath)
 	if err != nil {
 		return fmt.Errorf("%s > cannot install package '%s': %w", pm.instance.IDColor(), remotePath, err)
 	} else if response.IsError() {
@@ -586,16 +588,27 @@ func (pm *PackageManager) installHTML(remotePath string) error {
 	return nil
 }
 
-func (pm *PackageManager) installParams() map[string]string {
+func (pm *PackageManager) installParams(remotePath string) map[string]string {
 	return map[string]string{
 		"cmd":                "install",
 		"recursive":          fmt.Sprintf("%v", pm.InstallRecursive),
 		"autosave":           fmt.Sprintf("%d", pm.InstallSaveThreshold),
 		"acHandling":         pm.InstallACHandling,
 		"dependencyHandling": pm.InstallDependencyHandling,
+		"extractOnly":        pm.determineInstallExtractOnly(remotePath),
 	}
 }
 
+func (pm *PackageManager) determineInstallExtractOnly(remotePath string) string {
+	var extractOnly string
+	if pm.InstallExtractOnly == pkg.InstallExtractOnlySnapshot {
+		extractOnly = fmt.Sprintf("%v", pm.IsSnapshot(remotePath))
+	} else {
+		extractOnly = pm.InstallExtractOnly
+	}
+	return extractOnly
+}
+
 func (pm *PackageManager) DeployWithChanged(localPath string) (bool, error) {
 	if pm.IsSnapshot(localPath) {
 		return pm.deploySnapshot(localPath)

pkg/pkg/constants.go

@@ -3,4 +3,6 @@ package pkg
 const (
 	InstallSuccess           = "<span class=\"Package imported.\">"
 	InstallSuccessWithErrors = "<span class=\"Package imported (with errors"
+
+	InstallExtractOnlySnapshot = "snapshot"
 )

pkg/project/app_classic/aem/default/etc/aem.yml

@@ -165,6 +165,8 @@ instance:
     install_dependency_handling: required
     # Controls how 'rep:policy' nodes are handled during import
     install_ac_handling: ''
+    # Determines whether a copy of the package is created during installation (saves disk space but prevents uninstallation)
+    install_extract_only: snapshot
 
   # 'SSL By Default'
   ssl:

pkg/project/app_cloud/aem/default/etc/aem.yml

@@ -165,6 +165,8 @@ instance:
     install_dependency_handling: required
     # Controls how 'rep:policy' nodes are handled during import
     install_ac_handling: ''
+    # Determines whether a copy of the package is created during installation (saves disk space but prevents uninstallation)
+    install_extract_only: snapshot
 
   # 'SSL By Default'
   ssl:

pkg/project/instance/aem/default/etc/aem.yml

@@ -165,6 +165,8 @@ instance:
     install_dependency_handling: required
     # Controls how 'rep:policy' nodes are handled during import
     install_ac_handling: ''
+    # Determines whether a copy of the package is created during installation (saves disk space but prevents uninstallation)
+    install_extract_only: snapshot
 
   # 'SSL By Default'
   ssl: