Skip to content

Commit 9e06317

Browse files
Rename Theia.Cloud to Theia Cloud and Improve Ingress/Host configuration (eclipse-theia#314)
* Update Theia.Cloud to Theia Cloud * regenerate common API using older version of opanapi generator * adjust to helm renames because of Ingress/Host configuration improvements Contributed on behalf of STMicroelectronics Co-authored-by: Simon Graband <[email protected]>
1 parent 5a5538b commit 9e06317

File tree

22 files changed

+118
-103
lines changed

22 files changed

+118
-103
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
- Build the common package as ESM and CJS bundles for extended compatibility
1212
- [common] Add `ingressHostnamePrefixes` list to `AppDefinition.v1beta10` [#298](https://github.com/eclipsesource/theia-cloud/pull/298) | [#57](https://github.com/eclipsesource/theia-cloud-helm/pull/57)
1313

14+
### Breaking Changes in 0.11.0
15+
16+
See the helm chart Changelog for [more details](https://github.com/eclipsesource/theia-cloud-helm/blob/main/CHANGELOG.md).
17+
1418
## [0.10.0] - 2024-04-02
1519

1620
- [.github/workflows] Improve version detection in workflows (do not build release commits, auto-detect version for demo publishing) [#280](https://github.com/eclipsesource/theia-cloud/pull/280) - contributed on behalf of STMicroelectronics

documentation/Install.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ Open `./terraform/values/valuesDemo.yaml` and update the host section to use `su
5757

5858
```yaml
5959
hosts:
60-
service: service.34.141.62.32.nip.io
61-
landing: theia.cloud.34.141.62.32.nip.io
62-
instance: ws.34.141.62.32.nip.io
60+
configuration:
61+
baseHost: 34.141.62.32.nip.io
62+
service: service
63+
landing: theia-cloud
64+
instance: ws
6365
```
6466
6567
### Add & update Theia Cloud helm repo

documentation/OpenAPI.md

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Install the `openapi-generator-cli`:
4040

4141
```bash
4242
npm install @openapitools/openapi-generator-cli -g
43+
openapi-generator-cli version-manager set 6.6.0
4344
```
4445

4546
Use the `openapi-generator-cli` from the root of this repository:

documentation/openapi.json

+24-28
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"openapi" : "3.0.3",
33
"info" : {
4-
"title" : "Theia.cloud API",
5-
"version" : "0.9.0"
4+
"title" : "Theia Cloud API",
5+
"version" : "0.11.0"
66
},
77
"paths" : {
88
"/service" : {
@@ -23,7 +23,7 @@
2323
"200" : {
2424
"description" : "OK",
2525
"content" : {
26-
"application/json" : {
26+
"text/plain" : {
2727
"schema" : {
2828
"type" : "string"
2929
}
@@ -60,7 +60,7 @@
6060
"200" : {
6161
"description" : "OK",
6262
"content" : {
63-
"application/json" : {
63+
"text/plain" : {
6464
"schema" : {
6565
"type" : "string"
6666
}
@@ -95,7 +95,7 @@
9595
"200" : {
9696
"description" : "OK",
9797
"content" : {
98-
"application/json" : {
98+
"text/plain" : {
9999
"schema" : {
100100
"type" : "boolean"
101101
}
@@ -130,7 +130,7 @@
130130
"200" : {
131131
"description" : "OK",
132132
"content" : {
133-
"application/json" : {
133+
"text/plain" : {
134134
"schema" : {
135135
"type" : "boolean"
136136
}
@@ -291,7 +291,7 @@
291291
"200" : {
292292
"description" : "OK",
293293
"content" : {
294-
"application/json" : {
294+
"text/plain" : {
295295
"schema" : {
296296
"type" : "boolean"
297297
}
@@ -373,7 +373,7 @@
373373
"200" : {
374374
"description" : "OK",
375375
"content" : {
376-
"application/json" : {
376+
"text/plain" : {
377377
"schema" : {
378378
"type" : "boolean"
379379
}
@@ -428,7 +428,7 @@
428428
"type" : "object",
429429
"properties" : {
430430
"appId" : {
431-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
431+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
432432
"type" : "string"
433433
},
434434
"user" : {
@@ -471,7 +471,7 @@
471471
"type" : "object",
472472
"properties" : {
473473
"appId" : {
474-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
474+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
475475
"type" : "string"
476476
}
477477
}
@@ -482,7 +482,7 @@
482482
"type" : "object",
483483
"properties" : {
484484
"appId" : {
485-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
485+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
486486
"type" : "string"
487487
},
488488
"sessionName" : {
@@ -497,7 +497,7 @@
497497
"type" : "object",
498498
"properties" : {
499499
"appId" : {
500-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
500+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
501501
"type" : "string"
502502
},
503503
"user" : {
@@ -535,7 +535,7 @@
535535
"type" : "object",
536536
"properties" : {
537537
"appId" : {
538-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
538+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
539539
"type" : "string"
540540
},
541541
"sessionName" : {
@@ -556,22 +556,18 @@
556556
"user" : {
557557
"type" : "string"
558558
},
559-
"url" : {
560-
"type" : "string"
561-
},
562-
"error" : {
563-
"type" : "string"
564-
},
565559
"workspace" : {
566560
"type" : "string"
567561
},
568-
"lastActivity" : {
569-
"format" : "int64",
570-
"type" : "integer"
571-
},
572562
"sessionSecret" : {
573563
"type" : "string"
574564
},
565+
"options" : {
566+
"type" : "object",
567+
"additionalProperties" : {
568+
"type" : "string"
569+
}
570+
},
575571
"envVars" : {
576572
"type" : "object",
577573
"additionalProperties" : {
@@ -598,7 +594,7 @@
598594
"type" : "object",
599595
"properties" : {
600596
"appId" : {
601-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
597+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
602598
"type" : "string"
603599
},
604600
"user" : {
@@ -633,7 +629,7 @@
633629
"type" : "object",
634630
"properties" : {
635631
"appId" : {
636-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
632+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
637633
"type" : "string"
638634
},
639635
"user" : {
@@ -679,7 +675,7 @@
679675
"type" : "object",
680676
"properties" : {
681677
"appId" : {
682-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
678+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
683679
"type" : "string"
684680
},
685681
"user" : {
@@ -702,7 +698,7 @@
702698
"type" : "object",
703699
"properties" : {
704700
"appId" : {
705-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
701+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
706702
"type" : "string"
707703
},
708704
"user" : {
@@ -721,7 +717,7 @@
721717
"type" : "object",
722718
"properties" : {
723719
"appId" : {
724-
"description" : "The App Id of this Theia.cloud instance. Request without a matching Id will be denied.",
720+
"description" : "The App Id of this Theia Cloud instance. Request without a matching Id will be denied.",
725721
"type" : "string"
726722
},
727723
"user" : {

documentation/platforms/Minikube.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In Chrome:
2222
In Firefox:
2323
`Warning: Potential Security Risk Ahead -> Advanced... -> Accept the Risk and Continue`
2424

25-
## Testing local Theia.cloud images
25+
## Testing local Theia Cloud images
2626

2727
You can test locally build images (e.g. of the landing page, service, or operator) by building them in Minikube and then using them in the Minikube Helm chart.
2828

documentation/theiacloud.graphml

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ user: [email protected]<y:LabelModel><y:ErdAttributesNodeLabelModel/></y:LabelModel><y
278278
<y:Geometry height="136.875" width="293.75" x="-51.25" y="513.5895833333336"/>
279279
<y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
280280
<y:BorderStyle color="#000000" type="line" width="1.0"/>
281-
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="118.45703125" x="87.646484375" xml:space="preserve" y="59.453125">Theia.cloud Service<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
281+
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="118.45703125" x="87.646484375" xml:space="preserve" y="59.453125">Theia Cloud Service<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
282282
<y:StyleProperties>
283283
<y:Property class="java.lang.Boolean" name="y.view.ShadowNodePainter.SHADOW_PAINTING" value="true"/>
284284
</y:StyleProperties>

java/service/org.eclipse.theia.cloud.service/src/main/java/org/eclipse/theia/cloud/service/TheiaCloudApiApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020

2121
import jakarta.ws.rs.core.Application;
2222

23-
@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.10.0"))
23+
@OpenAPIDefinition(info = @Info(title = "Theia Cloud API", version = "0.11.0"))
2424
public class TheiaCloudApiApplication extends Application {
2525
}

node/common/src/client/api.ts

+17-29
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* tslint:disable */
22
/* eslint-disable */
33
/**
4-
* Theia.cloud API
4+
* Theia Cloud API
55
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
66
*
7-
* The version of the OpenAPI document: 0.8.0
7+
* The version of the OpenAPI document: 0.11.0
88
*
99
*
1010
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -55,7 +55,7 @@ export interface EnvironmentVars {
5555
*/
5656
export interface LaunchRequest {
5757
/**
58-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
58+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
5959
* @type {string}
6060
* @memberof LaunchRequest
6161
*/
@@ -104,7 +104,7 @@ export interface LaunchRequest {
104104
'env'?: LaunchRequestEnv;
105105
}
106106
/**
107-
*
107+
* Environment variables
108108
* @export
109109
* @interface LaunchRequestEnv
110110
*/
@@ -135,7 +135,7 @@ export interface LaunchRequestEnv {
135135
*/
136136
export interface PingRequest {
137137
/**
138-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
138+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
139139
* @type {string}
140140
* @memberof PingRequest
141141
*/
@@ -148,7 +148,7 @@ export interface PingRequest {
148148
*/
149149
export interface SessionActivityRequest {
150150
/**
151-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
151+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
152152
* @type {string}
153153
* @memberof SessionActivityRequest
154154
*/
@@ -167,7 +167,7 @@ export interface SessionActivityRequest {
167167
*/
168168
export interface SessionListRequest {
169169
/**
170-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
170+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
171171
* @type {string}
172172
* @memberof SessionListRequest
173173
*/
@@ -217,7 +217,7 @@ export interface SessionPerformance {
217217
*/
218218
export interface SessionPerformanceRequest {
219219
/**
220-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
220+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
221221
* @type {string}
222222
* @memberof SessionPerformanceRequest
223223
*/
@@ -253,18 +253,6 @@ export interface SessionSpec {
253253
* @memberof SessionSpec
254254
*/
255255
'user'?: string;
256-
/**
257-
*
258-
* @type {string}
259-
* @memberof SessionSpec
260-
*/
261-
'url'?: string;
262-
/**
263-
*
264-
* @type {string}
265-
* @memberof SessionSpec
266-
*/
267-
'error'?: string;
268256
/**
269257
*
270258
* @type {string}
@@ -273,16 +261,16 @@ export interface SessionSpec {
273261
'workspace'?: string;
274262
/**
275263
*
276-
* @type {number}
264+
* @type {string}
277265
* @memberof SessionSpec
278266
*/
279-
'lastActivity'?: number;
267+
'sessionSecret'?: string;
280268
/**
281269
*
282-
* @type {string}
270+
* @type {{ [key: string]: string; }}
283271
* @memberof SessionSpec
284272
*/
285-
'sessionSecret'?: string;
273+
'options'?: { [key: string]: string; };
286274
/**
287275
*
288276
* @type {{ [key: string]: string; }}
@@ -309,7 +297,7 @@ export interface SessionSpec {
309297
*/
310298
export interface SessionStartRequest {
311299
/**
312-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
300+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
313301
* @type {string}
314302
* @memberof SessionStartRequest
315303
*/
@@ -352,7 +340,7 @@ export interface SessionStartRequest {
352340
*/
353341
export interface SessionStopRequest {
354342
/**
355-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
343+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
356344
* @type {string}
357345
* @memberof SessionStopRequest
358346
*/
@@ -414,7 +402,7 @@ export interface UserWorkspace {
414402
*/
415403
export interface WorkspaceCreationRequest {
416404
/**
417-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
405+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
418406
* @type {string}
419407
* @memberof WorkspaceCreationRequest
420408
*/
@@ -445,7 +433,7 @@ export interface WorkspaceCreationRequest {
445433
*/
446434
export interface WorkspaceDeletionRequest {
447435
/**
448-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
436+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
449437
* @type {string}
450438
* @memberof WorkspaceDeletionRequest
451439
*/
@@ -470,7 +458,7 @@ export interface WorkspaceDeletionRequest {
470458
*/
471459
export interface WorkspaceListRequest {
472460
/**
473-
* The App Id of this Theia.cloud instance. Request without a matching Id will be denied.
461+
* The App Id of this Theia Cloud instance. Request without a matching Id will be denied.
474462
* @type {string}
475463
* @memberof WorkspaceListRequest
476464
*/

0 commit comments

Comments
 (0)