From 0bfff44f450dcbc867933991ff9bf857772d5965 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 20 Oct 2026 00:40:07 -0600 Subject: [PATCH] refactor(ide): share jetbrains option definitions via factory --- pkg/ide/jetbrains/clion.go | 17 +---------------- pkg/ide/jetbrains/dataspell.go | 17 +---------------- pkg/ide/jetbrains/generic.go | 18 ++++++++++++++++++ pkg/ide/jetbrains/goland.go | 17 +---------------- pkg/ide/jetbrains/intellij.go | 17 +---------------- pkg/ide/jetbrains/phpstorm.go | 17 +---------------- pkg/ide/jetbrains/pycharm.go | 17 +---------------- pkg/ide/jetbrains/rider.go | 17 +---------------- pkg/ide/jetbrains/rubymine.go | 17 +---------------- pkg/ide/jetbrains/rustrover.go | 17 +---------------- pkg/ide/jetbrains/webstorm.go | 17 +---------------- 11 files changed, 28 insertions(+), 160 deletions(-) diff --git a/pkg/ide/jetbrains/clion.go b/pkg/ide/jetbrains/clion.go index ae7b950fa8..39d22d75ba 100644 --- a/pkg/ide/jetbrains/clion.go +++ b/pkg/ide/jetbrains/clion.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( CLionDownloadArm64Template = "https://download.jetbrains.com/cpp/CLion-%s-aarch64.tar.gz" ) -var CLionOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var CLionOptions = newProductOptions() func NewCLionServer( userName string, diff --git a/pkg/ide/jetbrains/dataspell.go b/pkg/ide/jetbrains/dataspell.go index 2e1a85e104..a62624d505 100644 --- a/pkg/ide/jetbrains/dataspell.go +++ b/pkg/ide/jetbrains/dataspell.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( DataSpellDownloadArm64Template = "https://download.jetbrains.com/ds/dataspell-%s-aarch64.tar.gz" ) -var DataSpellOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var DataSpellOptions = newProductOptions() func NewDataSpellServer( userName string, diff --git a/pkg/ide/jetbrains/generic.go b/pkg/ide/jetbrains/generic.go index fe3eb3366f..c96b387b14 100644 --- a/pkg/ide/jetbrains/generic.go +++ b/pkg/ide/jetbrains/generic.go @@ -34,6 +34,24 @@ const ( downloadAmd64OptionDescription = "The download url for the amd64 server binary" ) +func newProductOptions() ide.Options { + return ide.Options{ + VersionOption: { + Name: VersionOption, + Description: versionOptionDescription, + Default: versionOptionDefault, + }, + DownloadArm64Option: { + Name: DownloadArm64Option, + Description: downloadArm64OptionDescription, + }, + DownloadAmd64Option: { + Name: DownloadAmd64Option, + Description: downloadAmd64OptionDescription, + }, + } +} + func getLatestDownloadURL(code string, platform string) string { return fmt.Sprintf("https://download.jetbrains.com/product?code=%s&platform=%s", code, platform) } diff --git a/pkg/ide/jetbrains/goland.go b/pkg/ide/jetbrains/goland.go index 27ed2e4a07..9d0dc81fd7 100644 --- a/pkg/ide/jetbrains/goland.go +++ b/pkg/ide/jetbrains/goland.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( GolandDownloadArm64Template = "https://download.jetbrains.com/go/goland-%s-aarch64.tar.gz" ) -var GolandOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var GolandOptions = newProductOptions() func NewGolandServer( userName string, diff --git a/pkg/ide/jetbrains/intellij.go b/pkg/ide/jetbrains/intellij.go index 11c83793ef..302cb592bc 100644 --- a/pkg/ide/jetbrains/intellij.go +++ b/pkg/ide/jetbrains/intellij.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( IntellijDownloadArm64Template = "https://download.jetbrains.com/idea/ideaIU-%s-aarch64.tar.gz" ) -var IntellijOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var IntellijOptions = newProductOptions() func NewIntellij( userName string, diff --git a/pkg/ide/jetbrains/phpstorm.go b/pkg/ide/jetbrains/phpstorm.go index aeb59faa39..f28a94d229 100644 --- a/pkg/ide/jetbrains/phpstorm.go +++ b/pkg/ide/jetbrains/phpstorm.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( PhpStormDownloadArm64Template = "https://download.jetbrains.com/webide/PhpStorm-%s-aarch64.tar.gz" ) -var PhpStormOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var PhpStormOptions = newProductOptions() func NewPhpStorm( userName string, diff --git a/pkg/ide/jetbrains/pycharm.go b/pkg/ide/jetbrains/pycharm.go index 99aec3b6ff..21d4176dc6 100644 --- a/pkg/ide/jetbrains/pycharm.go +++ b/pkg/ide/jetbrains/pycharm.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( PycharmDownloadArm64Template = "https://download.jetbrains.com/python/pycharm-professional-%s-aarch64.tar.gz" ) -var PyCharmOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var PyCharmOptions = newProductOptions() func NewPyCharmServer( userName string, diff --git a/pkg/ide/jetbrains/rider.go b/pkg/ide/jetbrains/rider.go index 7fa6117cb8..1eab4a0e6c 100644 --- a/pkg/ide/jetbrains/rider.go +++ b/pkg/ide/jetbrains/rider.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( RiderDownloadArm64Template = "https://download.jetbrains.com/rider/JetBrains.Rider-%s-aarch64.tar.gz" ) -var RiderOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var RiderOptions = newProductOptions() func NewRiderServer( userName string, diff --git a/pkg/ide/jetbrains/rubymine.go b/pkg/ide/jetbrains/rubymine.go index c3f825750d..e62d949c56 100644 --- a/pkg/ide/jetbrains/rubymine.go +++ b/pkg/ide/jetbrains/rubymine.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( RubyMineDownloadArm64Template = "https://download.jetbrains.com/ruby/RubyMine-%s-aarch64.tar.gz" ) -var RubyMineOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var RubyMineOptions = newProductOptions() func NewRubyMineServer( userName string, diff --git a/pkg/ide/jetbrains/rustrover.go b/pkg/ide/jetbrains/rustrover.go index 798fffe63b..a8d5161383 100644 --- a/pkg/ide/jetbrains/rustrover.go +++ b/pkg/ide/jetbrains/rustrover.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( RustRoverDownloadArm64Template = "https://download.jetbrains.com/rust/rustrover-%s-aarch64.tar.gz" ) -var RustRoverOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var RustRoverOptions = newProductOptions() func NewRustRoverServer( userName string, diff --git a/pkg/ide/jetbrains/webstorm.go b/pkg/ide/jetbrains/webstorm.go index dfce6cce06..e359097e69 100644 --- a/pkg/ide/jetbrains/webstorm.go +++ b/pkg/ide/jetbrains/webstorm.go @@ -2,7 +2,6 @@ package jetbrains import ( "github.com/devsy-org/devsy/pkg/config" - "github.com/devsy-org/devsy/pkg/ide" ) const ( @@ -11,21 +10,7 @@ const ( WebStormDownloadArm64Template = "https://download.jetbrains.com/webstorm/WebStorm-%s-aarch64.tar.gz" ) -var WebStormOptions = ide.Options{ - VersionOption: { - Name: VersionOption, - Description: versionOptionDescription, - Default: versionOptionDefault, - }, - DownloadArm64Option: { - Name: DownloadArm64Option, - Description: downloadArm64OptionDescription, - }, - DownloadAmd64Option: { - Name: DownloadAmd64Option, - Description: downloadAmd64OptionDescription, - }, -} +var WebStormOptions = newProductOptions() func NewWebStormServer( userName string,