From d50945fd607be677a12f5bdbe44773b55bac5bf9 Mon Sep 17 00:00:00 2001
From: Dhruv Dhruv <dhruv@harness.io>
Date: Thu, 29 Aug 2024 13:38:54 +0000
Subject: [PATCH] feat: [CDE-278]: Ensure infra is in provisioned state before
 triggering stop or delete, or before fectching logs. (#2616)

* feat: [CDE-278]: Ensure infra is in provisioned state before triggering stop or delete, or before fectching logs.
---
 .../orchestrator/orchestrator_impl.go         | 77 +++++++++++--------
 cmd/gitness/wire.go                           |  1 +
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/app/gitspace/orchestrator/orchestrator_impl.go b/app/gitspace/orchestrator/orchestrator_impl.go
index f179f406f..aaad90f79 100644
--- a/app/gitspace/orchestrator/orchestrator_impl.go
+++ b/app/gitspace/orchestrator/orchestrator_impl.go
@@ -120,17 +120,11 @@ func (o orchestrator) TriggerStopGitspace(
 			"cannot get the infraProviderResource with ID %d: %w", gitspaceConfig.InfraProviderResourceID, err)
 	}
 
-	requiredGitspacePorts, err := o.getPortsRequiredForGitspace(gitspaceConfig)
+	infra, err := o.getProvisionedInfra(ctx, infraProviderResource, gitspaceConfig)
 	if err != nil {
-		return fmt.Errorf("cannot get the ports required for gitspace during start: %w", err)
-	}
-
-	infra, err := o.infraProvisioner.Find(ctx, *infraProviderResource, gitspaceConfig, requiredGitspacePorts)
-	if infra.Storage == "" {
-		log.Warn().Msgf("couldn't find the storage for resource ID %d", gitspaceConfig.InfraProviderResourceID)
-	}
-	if err != nil {
-		return fmt.Errorf("cannot find the provisioned infra: %w", err)
+		return fmt.Errorf(
+			"unable to find provisioned infra while triggering stop for gitspace instance %s: %w",
+			gitspaceConfig.GitspaceInstance.Identifier, err)
 	}
 
 	err = o.stopGitspaceContainer(ctx, gitspaceConfig, *infra)
@@ -225,14 +219,11 @@ func (o orchestrator) TriggerDeleteGitspace(
 			"cannot get the infraProviderResource with ID %d: %w", gitspaceConfig.InfraProviderResourceID, err)
 	}
 
-	requiredGitspacePorts, err := o.getPortsRequiredForGitspace(gitspaceConfig)
+	infra, err := o.getProvisionedInfra(ctx, infraProviderResource, gitspaceConfig)
 	if err != nil {
-		return fmt.Errorf("cannot get the ports required for gitspace during start: %w", err)
-	}
-
-	infra, err := o.infraProvisioner.Find(ctx, *infraProviderResource, gitspaceConfig, requiredGitspacePorts)
-	if err != nil {
-		return fmt.Errorf("cannot find the provisioned infra: %w", err)
+		return fmt.Errorf(
+			"unable to find provisioned infra while triggering delete for gitspace instance %s: %w",
+			gitspaceConfig.GitspaceInstance.Identifier, err)
 	}
 
 	err = o.stopAndRemoveGitspaceContainer(ctx, gitspaceConfig, *infra)
@@ -529,24 +520,13 @@ func (o orchestrator) getPortsRequiredForGitspace(
 }
 
 func (o orchestrator) GetGitspaceLogs(ctx context.Context, gitspaceConfig types.GitspaceConfig) (string, error) {
-	infraProviderResource, err := o.infraProviderResourceStore.Find(ctx, gitspaceConfig.InfraProviderResourceID)
+	infra, err := o.getProvisionedInfra(ctx, nil, gitspaceConfig)
 	if err != nil {
 		return "", fmt.Errorf(
-			"cannot get the infraProviderResource with ID %d: %w", gitspaceConfig.InfraProviderResourceID, err)
+			"unable to find provisioned infra while fetching logs for gitspace instance %s: %w",
+			gitspaceConfig.GitspaceInstance.Identifier, err)
 	}
 
-	requiredGitspacePorts, err := o.getPortsRequiredForGitspace(gitspaceConfig)
-	if err != nil {
-		return "", fmt.Errorf("cannot get the ports required for gitspace during get logs: %w", err)
-	}
-
-	infra, err := o.infraProvisioner.Find(ctx, *infraProviderResource, gitspaceConfig, requiredGitspacePorts)
-	if infra.Storage == "" {
-		return "", fmt.Errorf("couldn't find the storage for resource ID %d", gitspaceConfig.InfraProviderResourceID)
-	}
-	if err != nil {
-		return "", fmt.Errorf("cannot find the provisioned infra: %w", err)
-	}
 	// NOTE: Currently we use a static identifier as the Gitspace user.
 	gitspaceConfig.GitspaceUser.Identifier = harnessUser
 	logs, err := o.containerOrchestrator.StreamLogs(ctx, gitspaceConfig, *infra)
@@ -556,3 +536,38 @@ func (o orchestrator) GetGitspaceLogs(ctx context.Context, gitspaceConfig types.
 
 	return logs, nil
 }
+
+func (o orchestrator) getProvisionedInfra(
+	ctx context.Context,
+	infraProviderResource *types.InfraProviderResource,
+	gitspaceConfig types.GitspaceConfig,
+) (*types.Infrastructure, error) {
+	if infraProviderResource == nil {
+		var err error
+		infraProviderResource, err = o.infraProviderResourceStore.Find(ctx, gitspaceConfig.InfraProviderResourceID)
+		if err != nil {
+			return nil, fmt.Errorf(
+				"cannot get the infraProviderResource with ID %d: %w", gitspaceConfig.InfraProviderResourceID, err)
+		}
+	}
+
+	requiredGitspacePorts, err := o.getPortsRequiredForGitspace(gitspaceConfig)
+	if err != nil {
+		return nil, fmt.Errorf("cannot get the ports required for gitspace: %w", err)
+	}
+
+	infra, err := o.infraProvisioner.Find(ctx, *infraProviderResource, gitspaceConfig, requiredGitspacePorts)
+	if err != nil {
+		return nil, fmt.Errorf("cannot find the provisioned infra: %w", err)
+	}
+
+	if infra.Status != enum.InfraStatusProvisioned {
+		return nil, fmt.Errorf("expected infra state is provisioned, actual state is: %s", infra.Status)
+	}
+
+	if infra.Storage == "" {
+		log.Warn().Msgf("couldn't find the storage for resource ID %d", gitspaceConfig.InfraProviderResourceID)
+	}
+
+	return infra, nil
+}
diff --git a/cmd/gitness/wire.go b/cmd/gitness/wire.go
index 8fddd3e10..b1288d055 100644
--- a/cmd/gitness/wire.go
+++ b/cmd/gitness/wire.go
@@ -19,6 +19,7 @@ package main
 
 import (
 	"context"
+
 	"github.com/harness/gitness/app/api/controller/aiagent"
 	"github.com/harness/gitness/app/api/controller/capabilities"
 	checkcontroller "github.com/harness/gitness/app/api/controller/check"