Auto-updates marketplace items from the repo when they are installed.

Author: jdrodjpl

backend/internal/processes/bootstrap.go

@@ -122,7 +122,7 @@ func BootstrapEnv(appconf *config.AppConfig) error {
 	log.Infof("Setting Up Unity UI from Marketplace")
 	err = installUnityUi(store, appconf)
 	if err != nil {
-		log.WithError(err).Error("Error installing unity-ui")
+		log.WithError(err).Error("Error installing unity-portal")
 		err = store.AddToAudit(application.Bootstrap_Unsuccessful, "test")
 		if err != nil {
 			log.WithError(err).Error("Problem writing to auditlog")
@@ -447,10 +447,10 @@ func installHealthStatusLambda(store database.Datastore, appConfig *config.AppCo
 
 func installUnityUi(store database.Datastore, appConfig *config.AppConfig) error {
 
-	// Find the marketplace item for the unity-ui
+	// Find the marketplace item for the unity-portal
 	var name, version string
 	for _, item := range appConfig.MarketplaceItems {
-		if item.Name == "unity-ui" {
+		if item.Name == "unity-portal" {
 			name = item.Name
 			version = item.Version
 			break
@@ -462,8 +462,8 @@ func installUnityUi(store database.Datastore, appConfig *config.AppConfig) error
 
 	// If the item wasn't found, log an error and return
 	if name == "" || version == "" {
-		log.Error("unity-ui not found in MarketplaceItems")
-		return fmt.Errorf("unity-ui not found in MarketplaceItems")
+		log.Error("unity-portal not found in MarketplaceItems")
+		return fmt.Errorf("unity-portal not found in MarketplaceItems")
 	}
 
 	installParams := types.ApplicationInstallParams{

backend/internal/processes/marketplace.go

@@ -90,11 +90,30 @@ func gitClone(url string, basedir string) (string, error) {
 			return "", err
 		}
 
-		// If the repository already exists, open it
+		// If the repository already exists, open it and pull the latest changes
 		repo, err = git.PlainOpen(basedir)
 		if err != nil {
 			return "", err
 		}
+		
+		// Pull the latest changes
+		log.Infof("Repository already exists, pulling latest changes in %s", basedir)
+		w, err := repo.Worktree()
+		if err != nil {
+			log.Errorf("Couldn't get worktree: %v", err)
+			return "", err
+		}
+		
+		err = w.Pull(&git.PullOptions{
+			Progress: os.Stdout,
+		})
+		
+		if err != nil && err != git.NoErrAlreadyUpToDate {
+			log.Errorf("Couldn't pull updates: %v", err)
+			return "", err
+		} else if err == git.NoErrAlreadyUpToDate {
+			log.Infof("Repository already up to date")
+		}
 	}
 
 	// Checkout the specific SHA if provided