From 622f6d232cd5e5d737e98bb9bb71137219e652c1 Mon Sep 17 00:00:00 2001
From: Deepak Bhatt <deepak.bhatt@harness.io>
Date: Wed, 13 Nov 2024 09:11:26 +0000
Subject: [PATCH] fix: [CDE-483]: modify remove gitspace func (#2989)

* add debug log
* capture error
* modify remove gitspace func
---
 app/api/controller/gitspace/delete.go  |  7 ++++++-
 app/services/gitspace/action_delete.go | 19 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/gitspace/delete.go b/app/api/controller/gitspace/delete.go
index 103534fad..b1374d58f 100644
--- a/app/api/controller/gitspace/delete.go
+++ b/app/api/controller/gitspace/delete.go
@@ -69,6 +69,11 @@ func (c *Controller) Delete(
 	}
 
 	ctxWithoutCancel := context.WithoutCancel(ctx)
-	go c.gitspaceSvc.RemoveGitspace(ctxWithoutCancel, *gitspaceConfig, true)
+	go func() {
+		err2 := c.gitspaceSvc.RemoveGitspace(ctxWithoutCancel, *gitspaceConfig, true)
+		if err2 != nil {
+			log.Debug().Err(err2).Msgf("unable to Delete gitspace: " + identifier)
+		}
+	}()
 	return nil
 }
diff --git a/app/services/gitspace/action_delete.go b/app/services/gitspace/action_delete.go
index a90dafaf9..2a1b71a71 100644
--- a/app/services/gitspace/action_delete.go
+++ b/app/services/gitspace/action_delete.go
@@ -16,6 +16,7 @@ package gitspace
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/harness/gitness/types"
@@ -27,13 +28,13 @@ import (
 // gitspaceInstanceCleaningTimedOutMins is timeout for which a gitspace instance can be in cleaning state.
 const gitspaceInstanceCleaningTimedOutMins = 15
 
-func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfig, canDeleteUserData bool) {
+func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfig, canDeleteUserData bool) error {
 	if config.GitspaceInstance.State == enum.GitSpaceInstanceStateCleaning &&
 		time.Since(time.UnixMilli(config.GitspaceInstance.Updated)).Milliseconds() <=
 			(gitspaceInstanceCleaningTimedOutMins*60*1000) {
 		log.Ctx(ctx).Warn().Msgf("gitspace start/stop is already pending for : %q",
 			config.GitspaceInstance.Identifier)
-		return
+		return fmt.Errorf("gitspace is already pending for : %q", config.GitspaceInstance.Identifier)
 	}
 
 	if config.GitspaceInstance.State == enum.GitspaceInstanceStateRunning {
@@ -50,7 +51,10 @@ func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfi
 	if err != nil {
 		log.Ctx(ctx).Err(err).Msgf("failed to update instance %s before triggering delete",
 			config.GitspaceInstance.Identifier)
-		return
+		return fmt.Errorf("failed to update instance %s before triggering delete: %w",
+			config.GitspaceInstance.Identifier,
+			err,
+		)
 	}
 
 	if err := c.TriggerDelete(ctx, config, canDeleteUserData); err != nil {
@@ -61,10 +65,17 @@ func (c *Service) RemoveGitspace(ctx context.Context, config types.GitspaceConfi
 			log.Ctx(ctx).Err(updateErr).Msgf("failed to update instance %s after error in triggering delete",
 				config.GitspaceInstance.Identifier)
 		}
-		return
+
+		return fmt.Errorf("failed to trigger delete for gitspace instance %s: %w",
+			config.GitspaceInstance.Identifier,
+			err,
+		)
 	}
+
 	log.Ctx(ctx).Debug().Msgf("successfully triggered delete for gitspace instance %s",
 		config.GitspaceInstance.Identifier)
+
+	return nil
 }
 
 func (c *Service) TriggerDelete(