Skip to content

Add missing Gitpod configurations for RubyMine and WebStorm #13612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Add missing Gitpod configurations for RubyMine and WebStorm #13612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions components/gitpod-protocol/data/gitpod-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,14 @@
"phpstorm": {
"$ref": "#/definitions/jetbrainsProduct",
"description": "Configure PhpStorm integration"
},
"rubymine": {
"$ref": "#/definitions/jetbrainsProduct",
"description": "Configure RubyMine integration"
},
"webstorm": {
"$ref": "#/definitions/jetbrainsProduct",
"description": "Configure WebStorm integration"
}
}
},
Expand Down
36 changes: 36 additions & 0 deletions components/gitpod-protocol/go/gitpod-config-types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions components/gitpod-protocol/src/protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,8 @@ export interface JetBrainsConfig {
goland?: JetBrainsProductConfig;
pycharm?: JetBrainsProductConfig;
phpstorm?: JetBrainsProductConfig;
rubymine?: JetBrainsProductConfig;
webstorm?: JetBrainsProductConfig;
}
export interface JetBrainsProductConfig {
prebuilds?: JetBrainsPrebuilds;
Expand Down
8 changes: 6 additions & 2 deletions components/ide/jetbrains/backend-plugin/hot-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ else
prop="pluginLatestImage"
fi

cf_patch=$(kubectl get cm server-ide-config -o=json | jq '.data."config.json"' |jq -r)
cf_patch=$(kubectl get cm ide-config -o=json | jq '.data."config.json"' |jq -r)
cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.intellij.$prop = \"$dev_image\"")
cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.goland.$prop = \"$dev_image\"")
cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.pycharm.$prop = \"$dev_image\"")
cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.phpstorm.$prop = \"$dev_image\"")
cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.rubymine.$prop = \"$dev_image\"")
cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.webstorm.$prop = \"$dev_image\"")
cf_patch=$(echo "$cf_patch" |jq tostring)
cf_patch="{\"data\": {\"config.json\": $cf_patch}}"

kubectl patch cm server-ide-config --type=merge -p "$cf_patch"
kubectl patch cm ide-config --type=merge -p "$cf_patch"

kubectl rollout restart deployment ide-service
4 changes: 4 additions & 0 deletions components/server/src/ide-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ export class IDEService {
productCode = "PCP";
} else if (key === "phpstorm") {
productCode = "PS";
} else if (key === "rubymine") {
productCode = "RM";
} else if (key === "webstorm") {
productCode = "WS";
}
const prebuilds = productCode && ws.config.jetbrains[key as keyof JetBrainsConfig]?.prebuilds;
if (prebuilds) {
Expand Down
2 changes: 2 additions & 0 deletions test/tests/ide/jetbrains/gateway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ func init() {
ideProjectMap["intellij"] = "https://github.com/gitpod-io/spring-petclinic"
ideProjectMap["phpstorm"] = "https://github.com/gitpod-io/template-php-laravel-mysql"
ideProjectMap["pycharm"] = "https://github.com/gitpod-io/template-python-django"
ideProjectMap["rubymine"] = "https://github.com/gitpod-io/template-ruby-on-rails-postgres"
ideProjectMap["webstorm"] = "https://github.com/gitpod-io/template-typescript-react"
}

func GetHttpContent(url string) ([]byte, error) {
Expand Down