fix: Use proper startTime for validate commands

Instead of using the project load time, which is misleading if deploy+validate is happening in one go.
kluctl · Jul 14, 2023 · 27370d0 · 27370d0
1 parent 1950b54
commit 27370d0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/pkg/deployment/commands/delete.go b/pkg/deployment/commands/delete.go
@@ -80,7 +80,7 @@ func (cmd *DeleteCommand) Run(ctx context.Context, k *k8s.K8sCluster, confirmCb
 		Warnings: dew.GetWarningsList(),
 	}
 	if cmd.targetCtx != nil {
-		err = addBaseCommandInfoToResult(cmd.targetCtx, r, "delete")
+		err = addBaseCommandInfoToResult(cmd.targetCtx, cmd.targetCtx.KluctlProject.LoadTime, r, "delete")
 		if err != nil {
 			return r, err
 		}

diff --git a/pkg/deployment/commands/deploy.go b/pkg/deployment/commands/deploy.go
@@ -127,7 +127,7 @@ func (cmd *DeployCommand) Run(diffResultCb func(diffResult *result.CommandResult
 	r.Command.ForceReplaceOnError = cmd.ForceReplaceOnError
 	r.Command.AbortOnError = cmd.AbortOnError
 	r.Command.NoWait = cmd.NoWait
-	err = addBaseCommandInfoToResult(cmd.targetCtx, r, "deploy")
+	err = addBaseCommandInfoToResult(cmd.targetCtx, cmd.targetCtx.KluctlProject.LoadTime, r, "deploy")
 	if err != nil {
 		return r, err
 	}

diff --git a/pkg/deployment/commands/diff.go b/pkg/deployment/commands/diff.go
@@ -72,7 +72,7 @@ func (cmd *DiffCommand) Run() (*result.CommandResult, error) {
 	r.Command.ForceApply = cmd.ForceApply
 	r.Command.ReplaceOnError = cmd.ReplaceOnError
 	r.Command.ForceReplaceOnError = cmd.ForceReplaceOnError
-	err = addBaseCommandInfoToResult(cmd.targetCtx, r, "diff")
+	err = addBaseCommandInfoToResult(cmd.targetCtx, cmd.targetCtx.KluctlProject.LoadTime, r, "diff")
 	if err != nil {
 		return r, err
 	}

diff --git a/pkg/deployment/commands/poke_images.go b/pkg/deployment/commands/poke_images.go
@@ -106,7 +106,7 @@ func (cmd *PokeImagesCommand) Run() (*result.CommandResult, error) {
 		Warnings:   dew.GetWarningsList(),
 		SeenImages: cmd.targetCtx.DeploymentCollection.Images.SeenImages(false),
 	}
-	err = addBaseCommandInfoToResult(cmd.targetCtx, r, "deploy")
+	err = addBaseCommandInfoToResult(cmd.targetCtx, cmd.targetCtx.KluctlProject.LoadTime, r, "deploy")
 	if err != nil {
 		return r, err
 	}

diff --git a/pkg/deployment/commands/prune.go b/pkg/deployment/commands/prune.go
@@ -61,7 +61,7 @@ func (cmd *PruneCommand) Run(confirmCb func(refs []k8s2.ObjectRef) error) (*resu
 		Objects:  collectObjects(cmd.targetCtx.DeploymentCollection, ru, nil, nil, nil, deleted),
 		Warnings: dew.GetWarningsList(),
 	}
-	err = addBaseCommandInfoToResult(cmd.targetCtx, r, "prune")
+	err = addBaseCommandInfoToResult(cmd.targetCtx, cmd.targetCtx.KluctlProject.LoadTime, r, "prune")
 	if err != nil {
 		return r, err
 	}

diff --git a/pkg/deployment/commands/result_utils.go b/pkg/deployment/commands/result_utils.go
@@ -13,10 +13,10 @@ import (
 	"time"
 )
 
-func addBaseCommandInfoToResult(targetCtx *kluctl_project.TargetContext, r *result.CommandResult, command string) error {
+func addBaseCommandInfoToResult(targetCtx *kluctl_project.TargetContext, startTime time.Time, r *result.CommandResult, command string) error {
 	r.Target = targetCtx.Target
 	r.Command = result.CommandInfo{
-		StartTime: metav1.NewTime(targetCtx.KluctlProject.LoadTime),
+		StartTime: metav1.NewTime(startTime),
 		EndTime:   metav1.Now(),
 		Command:   command,
 		Args:      targetCtx.KluctlProject.LoadArgs.ExternalArgs,
@@ -50,8 +50,8 @@ func addBaseCommandInfoToResult(targetCtx *kluctl_project.TargetContext, r *resu
 	return nil
 }
 
-func addValidateCommandInfoToResult(targetCtx *kluctl_project.TargetContext, r *result.ValidateResult) error {
-	r.StartTime = metav1.NewTime(targetCtx.KluctlProject.LoadTime)
+func addValidateCommandInfoToResult(targetCtx *kluctl_project.TargetContext, startTime time.Time, r *result.ValidateResult) error {
+	r.StartTime = metav1.NewTime(startTime)
 	r.EndTime = metav1.Now()
 	var err error
 	_, r.ProjectKey, err = buildGitInfo(targetCtx)

diff --git a/pkg/deployment/commands/validate.go b/pkg/deployment/commands/validate.go
@@ -11,6 +11,7 @@ import (
 	"github.com/kluctl/kluctl/v2/pkg/utils"
 	"github.com/kluctl/kluctl/v2/pkg/utils/uo"
 	"github.com/kluctl/kluctl/v2/pkg/validation"
+	"time"
 )
 
 type ValidateCommand struct {
@@ -39,6 +40,11 @@ func (cmd *ValidateCommand) Run(ctx context.Context) (*result.ValidateResult, er
 		Ready: true,
 	}
 
+	startTime := time.Now()
+	if cmd.r == nil {
+		startTime = cmd.targetCtx.KluctlProject.LoadTime
+	}
+
 	cmd.dew.Init()
 
 	var refs []k8s2.ObjectRef
@@ -115,7 +121,7 @@ func (cmd *ValidateCommand) Run(ctx context.Context) (*result.ValidateResult, er
 	ret.Warnings = append(ret.Warnings, cmd.dew.GetWarningsList()...)
 	ret.Errors = append(ret.Errors, cmd.dew.GetErrorsList()...)
 
-	err = addValidateCommandInfoToResult(cmd.targetCtx, &ret)
+	err = addValidateCommandInfoToResult(cmd.targetCtx, startTime, &ret)
 	if err != nil {
 		return nil, err
 	}