From c54b82706e1b8639af5ed48caa83013cb4d0f148 Mon Sep 17 00:00:00 2001 From: Deepak Bhatt Date: Thu, 16 Jan 2025 07:23:26 +0000 Subject: [PATCH] feat: [CDE-577]: fix jetbrains ide issues (#3281) * feat: [CDE-577]: fix jetbrains ide issues --- .../container/embedded_docker_container_orchestrator.go | 5 ++++- app/gitspace/orchestrator/ide/jetbrains.go | 4 ++-- .../orchestrator/utils/script_templates/run_jetbrains_ide.sh | 4 ++-- cli/operations/server/config.go | 1 + types/jetbrains.go | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/gitspace/orchestrator/container/embedded_docker_container_orchestrator.go b/app/gitspace/orchestrator/container/embedded_docker_container_orchestrator.go index e53c8e417..d36de656d 100644 --- a/app/gitspace/orchestrator/container/embedded_docker_container_orchestrator.go +++ b/app/gitspace/orchestrator/container/embedded_docker_container_orchestrator.go @@ -220,7 +220,10 @@ func (e *EmbeddedDockerOrchestrator) startStoppedGitspace( } // Run IDE setup - if err = ideService.Run(ctx, exec, nil, logStreamInstance); err != nil { + runIDEArgs := make(map[gitspaceTypes.IDEArg]interface{}) + runIDEArgs[gitspaceTypes.IDERepoNameArg] = resolvedRepoDetails.RepoName + runIDEArgs = AddIDEDirNameArg(ideService, runIDEArgs) + if err = ideService.Run(ctx, exec, runIDEArgs, logStreamInstance); err != nil { return err } diff --git a/app/gitspace/orchestrator/ide/jetbrains.go b/app/gitspace/orchestrator/ide/jetbrains.go index b915607c9..ccc6ae09d 100644 --- a/app/gitspace/orchestrator/ide/jetbrains.go +++ b/app/gitspace/orchestrator/ide/jetbrains.go @@ -197,12 +197,12 @@ func (jb *JetBrainsIDE) Run( return err } gitspaceLogger.Info("Successfully run ssh-server") - gitspaceLogger.Info("Run Remote IntelliJ IdeType...") + gitspaceLogger.Info(fmt.Sprintf("Remote %s ide run output...", jb.ideType)) err = jb.runRemoteIDE(ctx, exec, args, gitspaceLogger) if err != nil { return err } - gitspaceLogger.Info("Successfully Run Remote IntelliJ IdeType") + gitspaceLogger.Info(fmt.Sprintf("Successfully run %s ide", jb.ideType)) return nil } diff --git a/app/gitspace/orchestrator/utils/script_templates/run_jetbrains_ide.sh b/app/gitspace/orchestrator/utils/script_templates/run_jetbrains_ide.sh index b82075cc0..0184b8c72 100644 --- a/app/gitspace/orchestrator/utils/script_templates/run_jetbrains_ide.sh +++ b/app/gitspace/orchestrator/utils/script_templates/run_jetbrains_ide.sh @@ -41,8 +41,8 @@ is_ide_running(){ echo "waiting for ide to run..." if is_ide_running; then - echo "intellij ide is running" + echo "ide is running" else - echo "intellij ide is not running" + echo "ide is not running" exit 1 fi \ No newline at end of file diff --git a/cli/operations/server/config.go b/cli/operations/server/config.go index 63e4bb176..22eecdb53 100644 --- a/cli/operations/server/config.go +++ b/cli/operations/server/config.go @@ -452,6 +452,7 @@ func ProvideIDEJetBrainsConfig(config *types.Config) *ide.JetBrainsIDEConfig { PHPStormPort: config.IDE.PHPStorm.Port, CLionPort: config.IDE.CLion.Port, RubyMinePort: config.IDE.RubyMine.Port, + RiderPort: config.IDE.Rider.Port, } } diff --git a/types/jetbrains.go b/types/jetbrains.go index 2d0f1b607..9dbaa2e98 100644 --- a/types/jetbrains.go +++ b/types/jetbrains.go @@ -69,7 +69,7 @@ var JetBrainsIDEDownloadURLTemplateMap = map[enum.IDEType]JetBrainsIDEDownloadUR }, enum.IDETypeRider: { // list of versions: https://www.jetbrains.com/ruby/download/other.html - Version: "2024.3.1.1", + Version: "2024.3.3", Amd64: "https://download.jetbrains.com/rider/JetBrains.Rider-%s.tar.gz", Arm64: "https://download.jetbrains.com/rider/JetBrains.Rider-%s-aarch64.tar.gz", },