Fix #34: Added tests for git apply

Author: akclace

cmd/clace/app_cmds.go

@@ -201,7 +201,7 @@ Examples:
 }
 
 func printCreateResult(cCtx *cli.Context, createResult types.AppCreateResponse) {
-	fmt.Printf("      App: %s\n", createResult.Path)
+	fmt.Printf("      App: %s\n", &createResult.AppPathDomain)
 	if createResult.HttpUrl != "" {
 		fmt.Printf(" HTTP Url: %s\n", createResult.HttpUrl)
 	}

internal/server/app_apis.go

@@ -243,7 +243,7 @@ func (s *Server) createApp(ctx context.Context, currentTx types.Transaction, app
 	}
 
 	ret := &types.AppCreateResponse{
-		Path:           appEntry.String(),
+		AppPathDomain:  appEntry.AppPathDomain(),
 		HttpUrl:        s.getAppHttpUrl(appEntry),
 		HttpsUrl:       s.getAppHttpsUrl(appEntry),
 		DryRun:         dryRun,

internal/server/apply.go

@@ -8,9 +8,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"os"
 	"path/filepath"
 	"reflect"
+	"slices"
 
 	"github.com/BurntSushi/toml"
 	"github.com/claceio/clace/internal/app/appfs"
@@ -336,8 +338,25 @@ func (s *Server) Apply(ctx context.Context, applyPath string, appPathGlob string
 		}
 	}
 
+	// Get list of all updated apps
+	allUpdatedApps := []types.AppPathDomain{}
+	allUpdatedApps = append(allUpdatedApps, updateResults...)
+	allUpdatedApps = append(allUpdatedApps, reloadResults...)
+	allUpdatedApps = append(allUpdatedApps, promoteResults...)
+	for _, app := range approveResults {
+		allUpdatedApps = append(allUpdatedApps, app.AppPathDomain)
+	}
+	for _, app := range createResults {
+		allUpdatedApps = append(allUpdatedApps, app.AppPathDomain)
+	}
+	allAppMap := make(map[types.AppPathDomain]bool)
+	for _, app := range allUpdatedApps {
+		allAppMap[app] = true
+	}
+	allUpdatedApps = slices.Collect(maps.Keys(allAppMap))
+
 	// Commit the transaction if not dry run and update the in memory app store
-	if err := s.CompleteTransaction(ctx, tx, updateResults, dryRun, "apply"); err != nil {
+	if err := s.CompleteTransaction(ctx, tx, allUpdatedApps, dryRun, "apply"); err != nil {
 		return nil, err
 	}
 

internal/server/apps.go

@@ -220,7 +220,7 @@ func (a *AppStore) DeleteAppsAudit(ctx context.Context, pathDomain []types.AppPa
 	for _, pd := range pathDomain {
 		appInfo, ok := appMap[pd.String()]
 		if !ok {
-			return fmt.Errorf("app not found: %s", pd)
+			continue
 		}
 
 		event.Target = pd.String()

internal/types/api.go

@@ -101,7 +101,7 @@ type AppListResponse struct {
 }
 
 type AppCreateResponse struct {
-	Path           string          `json:"path"`
+	AppPathDomain  AppPathDomain   `json:"app_path_domain"`
 	DryRun         bool            `json:"dry_run"`
 	HttpUrl        string          `json:"http_url"`
 	HttpsUrl       string          `json:"https_url"`

tests/apply_files/apply_git.ace

@@ -0,0 +1,3 @@
+app("/applytest/test1", "github.com/claceio/apps/system/disk_usage")
+app("/applytest/test2", "github.com/claceio/apps/system/memory_usage")
+app("/applytest/test3", "github.com/claceio/apps/system/list_files")

tests/apply_files/apply_git2.ace

@@ -0,0 +1,3 @@
+app("/applytest/test1", "github.com/claceio/apps/system/disk_usage", auth="system")
+app("/applytest/test2", "github.com/claceio/apps/system/memory_usage", git_auth="abc")
+app("/applytest/test3", "github.com/claceio/apps/system/list_files", spec="python-flask")

tests/commander/test_apply_git.yaml

@@ -0,0 +1,30 @@
+config:
+  env:
+    CL_CONFIG_FILE: clace.toml
+    GOCOVERDIR: ${GOCOVERDIR}/../client
+    PATH: ${PATH}
+tests:
+  apply0010: ## create all apps
+    command: ../clace apply ./apply_files/apply_git.ace all
+    stdout: "3 app(s) created, 0 app(s) updated, 0 app(s) reloaded, 0 app(s) approved, 0 app(s) promoted."
+  apply0020:
+    command: ../clace apply --approve --promote --reload=all ./apply_files/apply_git.ace all
+    stdout: "0 app(s) created, 0 app(s) updated, 6 app(s) reloaded, 3 app(s) approved, 3 app(s) promoted."
+  apply0030: # check curl after approval
+    command: curl -su "admin:qwerty" localhost:25222/applytest/test1/
+    stdout: "Disk Usage"
+  apply0040: # check curl after approval for stage
+    command: curl -su "admin:qwerty" localhost:25222/applytest/test1_cl_stage/
+    stdout: "Disk Usage"
+
+  apply0050: ## check auth error
+    command: ../clace apply ./apply_files/apply_git2.ace /applytest/test1
+    stderr: "app /applytest/test1 authentication changed, cannot apply changes"
+    exit-code: 1
+  apply0051: ## check git auth error
+    command: ../clace apply ./apply_files/apply_git2.ace /applytest/test2
+    stderr: "app /applytest/test2 git auth changed, cannot apply changes"
+    exit-code: 1
+  apply0052: ## check spec update
+    command: ../clace apply ./apply_files/apply_git2.ace /applytest/test3
+    stdout: "0 app(s) created, 1 app(s) updated, 1 app(s) reloaded, 0 app(s) approved, 0 app(s) promoted"