fix conflicts

SalmaElsoly · SalmaElsoly · commit 8d6cea35027f · 2025-11-10T16:31:51.000+02:00
diff --git a/backend/internal/activities/deployer_activities.go b/backend/internal/activities/deployer_activities.go
@@ -830,11 +830,11 @@ func retrieveKubeconfig(ctx context.Context, state ewf.State, db models.DB, file
 		return existingCluster.Kubeconfig, nil
 	}
 
-		if existingCluster.ID != 0 {
-			if data, err := fileStorage.ReadKubeconfigFile(config.UserID, existingCluster.ID, existingCluster.ProjectName); err == nil && len(data) > 0 {
-				return string(data), nil
-			}
+	if existingCluster.ID != 0 {
+		if data, err := fileStorage.ReadKubeconfigFile(config.UserID, existingCluster.ID, existingCluster.ProjectName); err == nil && len(data) > 0 {
+			return string(data), nil
 		}
+	}
 
 	privateKeyBytes, err := os.ReadFile(privateKeyPath)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -830,11 +830,11 @@ func retrieveKubeconfig(ctx context.Context, state ewf.State, db models.DB, file`
`830`	`830`	`return existingCluster.Kubeconfig, nil`
`831`	`831`	`}`
`832`	`832`
`833`		`- if existingCluster.ID != 0 {`
`834`		`- if data, err := fileStorage.ReadKubeconfigFile(config.UserID, existingCluster.ID, existingCluster.ProjectName); err == nil && len(data) > 0 {`
`835`		`- return string(data), nil`
`836`		`- }`
	`833`	`+ if existingCluster.ID != 0 {`
	`834`	`+ if data, err := fileStorage.ReadKubeconfigFile(config.UserID, existingCluster.ID, existingCluster.ProjectName); err == nil && len(data) > 0 {`
	`835`	`+ return string(data), nil`
`837`	`836`	`}`
	`837`	`+ }`
`838`	`838`
`839`	`839`	`privateKeyBytes, err := os.ReadFile(privateKeyPath)`
`840`	`840`	`if err != nil {`