From 37785cfeb9a8b4cebd79e404750b74c2d8ec30a1 Mon Sep 17 00:00:00 2001 From: Simon Graband Date: Fri, 19 Jul 2024 14:18:22 +0200 Subject: [PATCH] Standardize & apply standard formatting (#325) * Move launch configs to tasks & debug configs * Remove settings, classpath & project files * Add java formatter and format files * Set default formatter to prettier & format markdown * Format yaml files * Format json files * Format tf, ts, js, html and css files * Add formatter for xml files and format files Co-authored-by: Johannes Faltermeier --- .vscode/extensions.json | 13 +- .vscode/java-formatter.xml | 787 ++++++++ .vscode/launch.json | 28 + .vscode/settings.json | 40 +- .vscode/tasks.json | 73 + .../templateDeploymentWithoutOAuthProxy.yaml | 2 +- .../demo-theia-docker/package.json | 168 +- .../project/.vscode/settings.json | 26 +- .../project/files/template.json | 16 +- .../project/files/template.schema.json | 51 +- .../project/files/template.xml | 3 +- .../demo-theia-docker/project/java/pom.xml | 4 +- .../demo-theia-docker/project/web/README.md | 2 +- .../project/web/package-lock.json | 1646 ++++++++--------- .../project/web/package.json | 20 +- .../project/web/src/contentgenerator.ts | 20 +- .../project/web/src/index.html | 11 +- .../project/web/src/styles.css | 19 +- .../project/web/src/updatecontents.js | 4 +- .../project/web/tsconfig.json | 57 +- .../demo-theia-docker/settings.json | 4 +- .../demo-theia-monitor-theia/package.json | 172 +- .../demo-theia-monitor-vscode/package.json | 168 +- .../project/.vscode/settings.json | 26 +- .../project/files/template.json | 16 +- .../project/files/template.schema.json | 51 +- .../project/files/template.xml | 3 +- .../project/java/pom.xml | 4 +- .../project/web/README.md | 2 +- .../project/web/package-lock.json | 1646 ++++++++--------- .../project/web/package.json | 20 +- .../project/web/src/contentgenerator.ts | 20 +- .../project/web/src/index.html | 11 +- .../project/web/src/styles.css | 19 +- .../project/web/src/updatecontents.js | 4 +- .../project/web/tsconfig.json | 57 +- .../demo-theia-monitor-vscode/settings.json | 4 +- documentation/Architecture.md | 88 +- documentation/Keycloak.md | 52 +- documentation/openapi.json | 1156 ++++++------ .../platforms/global-certificate.yaml | 34 +- java/common/maven-conf/.project | 28 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../maven-conf/Install maven-conf.launch | 21 - java/common/maven-conf/pom.xml | 146 +- .../org.eclipse.theia.cloud.common/.classpath | 65 - .../org.eclipse.theia.cloud.common/.project | 34 - .../org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.apt.core.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 576 ------ .../.settings/org.eclipse.jdt.ui.prefs | 123 -- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../Build and install common.launch | 21 - .../Theia Cloud.launch | 13 - .../org.eclipse.theia.cloud.common/pom.xml | 86 +- .../client/AppDefinitionResourceClient.java | 2 +- .../common/k8s/client/BaseResourceClient.java | 58 +- .../k8s/client/CustomResourceClient.java | 30 +- .../DefaultAppDefinitionResourceClient.java | 20 +- .../client/DefaultSessionResourceClient.java | 108 +- .../k8s/client/DefaultTheiaCloudClient.java | 22 +- .../DefaultWorkspaceResourceClient.java | 90 +- .../common/k8s/client/ResourceClient.java | 72 +- .../k8s/client/SessionResourceClient.java | 4 +- .../common/k8s/client/TheiaCloudClient.java | 40 +- .../k8s/client/WorkspaceResourceClient.java | 4 +- .../common/k8s/resource/OperatorStatus.java | 3 +- .../common/k8s/resource/ResourceEdit.java | 24 +- .../common/k8s/resource/ResourceStatus.java | 8 +- .../cloud/common/k8s/resource/StatusStep.java | 16 +- .../common/k8s/resource/UserScopedSpec.java | 2 +- .../resource/appdefinition/AppDefinition.java | 14 +- .../appdefinition/AppDefinitionSpec.java | 204 +- .../appdefinition/AppDefinitionStatus.java | 16 +- .../appdefinition/hub/AppDefinitionHub.java | 350 ++-- .../v1beta8/AppDefinitionV1beta8.java | 16 +- .../v1beta8/AppDefinitionV1beta8Spec.java | 244 +-- .../v1beta8/AppDefinitionV1beta8Status.java | 16 +- .../v1beta9/AppDefinitionV1beta9.java | 16 +- .../v1beta9/AppDefinitionV1beta9Spec.java | 194 +- .../v1beta9/AppDefinitionV1beta9Status.java | 16 +- .../common/k8s/resource/session/Session.java | 14 +- .../k8s/resource/session/SessionSpec.java | 174 +- .../k8s/resource/session/SessionStatus.java | 42 +- .../k8s/resource/session/hub/SessionHub.java | 168 +- .../session/v1beta6/SessionV1beta6.java | 14 +- .../session/v1beta6/SessionV1beta6Spec.java | 196 +- .../session/v1beta6/SessionV1beta6Status.java | 16 +- .../session/v1beta7/SessionV1beta7.java | 14 +- .../session/v1beta7/SessionV1beta7Spec.java | 172 +- .../session/v1beta7/SessionV1beta7Status.java | 42 +- .../k8s/resource/workspace/Workspace.java | 14 +- .../k8s/resource/workspace/WorkspaceSpec.java | 42 +- .../resource/workspace/WorkspaceStatus.java | 56 +- .../resource/workspace/hub/WorkspaceHub.java | 236 +-- .../workspace/v1beta3/WorkspaceV1beta3.java | 16 +- .../v1beta3/WorkspaceV1beta3Spec.java | 48 +- .../v1beta3/WorkspaceV1beta3Status.java | 46 +- .../workspace/v1beta4/WorkspaceV1beta4.java | 16 +- .../v1beta4/WorkspaceV1beta4Spec.java | 38 +- .../v1beta4/WorkspaceV1beta4Status.java | 56 +- .../cloud/common/util/CustomResourceUtil.java | 20 +- .../theia/cloud/common/util/JavaUtil.java | 10 +- .../cloud/common/util/LogMessageUtil.java | 8 +- .../theia/cloud/common/util/NamingUtil.java | 195 +- .../theia/cloud/common/util/SessionUtil.java | 2 +- .../cloud/common/util/TheiaCloudError.java | 90 +- .../util/TheiaCloudExtensionAdapter.java | 4 +- .../cloud/common/util/WatcherAdapter.java | 20 +- .../cloud/common/util/WorkspaceUtil.java | 24 +- .../.classpath | 68 - .../.mvn/wrapper/MavenWrapperDownloader.java | 81 +- .../.project | 34 - .../org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.apt.core.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 576 ------ .../.settings/org.eclipse.jdt.ui.prefs | 127 -- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../README.md | 13 +- .../Run Theia Cloud Conversion Hook.launch | 21 - .../pom.xml | 258 +-- .../cloud/conversion/ConversionEndpoint.java | 60 +- .../AppDefinitionV1beta10Mapper.java | 4 +- .../AppDefinitionV1beta8Mapper.java | 4 +- .../AppDefinitionV1beta9Mapper.java | 4 +- .../mappers/session/SessionV1beta6Mapper.java | 4 +- .../mappers/session/SessionV1beta7Mapper.java | 4 +- .../mappers/session/SessionV1beta8Mapper.java | 4 +- .../workspace/WorkspaceV1beta3Mapper.java | 4 +- .../workspace/WorkspaceV1beta4Mapper.java | 4 +- .../workspace/WorkspaceV1beta5Mapper.java | 4 +- .../.classpath | 68 - .../.project | 34 - .../org.eclipse.core.resources.prefs | 4 - .../.settings/org.eclipse.jdt.apt.core.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 576 ------ .../.settings/org.eclipse.jdt.ui.prefs | 123 -- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../Run Operator.launch | 21 - .../log4j2.xml | 106 +- .../pom.xml | 207 +-- .../DefaultTheiaCloudOperatorLauncher.java | 4 +- .../DefaultTheiaCloudOperatorModule.java | 4 +- .../.classpath | 65 - .../org.eclipse.theia.cloud.operator/.project | 34 - .../org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.apt.core.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 576 ------ .../.settings/org.eclipse.jdt.ui.prefs | 123 -- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../Install operator.launch | 21 - .../org.eclipse.theia.cloud.operator/pom.xml | 152 +- .../operator/BasicTheiaCloudOperator.java | 7 +- ...derElectionTheiaCloudOperatorLauncher.java | 82 +- .../operator/TheiaCloudOperatorArguments.java | 364 ++-- .../operator/TheiaCloudOperatorLauncher.java | 26 +- .../bandwidth/BandwidthLimiterImpl.java | 109 +- .../di/AbstractTheiaCloudOperatorModule.java | 94 +- .../theia/cloud/operator/di/MultiBinding.java | 44 +- .../operator/handler/AddedHandlerUtil.java | 371 ++-- .../handler/appdef/AppDefinitionHandler.java | 10 +- .../EagerStartAppDefinitionAddedHandler.java | 314 ++-- .../appdef/LazyStartAppDefinitionHandler.java | 132 +- .../session/EagerStartSessionHandler.java | 314 ++-- .../handler/session/LazySessionHandler.java | 806 ++++---- .../handler/session/SessionHandler.java | 10 +- .../handler/ws/LazyWorkspaceHandler.java | 168 +- .../operator/handler/ws/WorkspaceHandler.java | 10 +- .../ingress/IngressPathProviderImpl.java | 18 +- .../MonitorMessagingServiceImpl.java | 84 +- .../plugins/MonitorActivityTracker.java | 206 +-- .../pv/DefaultPersistentVolumeCreator.java | 35 +- .../pv/MinikubePersistentVolumeCreator.java | 58 +- ...DefaultDeploymentTemplateReplacements.java | 180 +- ...tPersistentVolumeTemplateReplacements.java | 30 +- .../replacements/TemplateReplacements.java | 4 +- .../cloud/operator/util/JavaResourceUtil.java | 44 +- .../theia/cloud/operator/util/K8sUtil.java | 180 +- .../theia/cloud/operator/util/SpecWatch.java | 129 +- .../util/TheiaCloudConfigMapUtil.java | 86 +- .../util/TheiaCloudDeploymentUtil.java | 34 +- .../operator/util/TheiaCloudHandlerUtil.java | 38 +- .../operator/util/TheiaCloudIngressUtil.java | 88 +- .../operator/util/TheiaCloudK8sUtil.java | 62 +- .../util/TheiaCloudPersistentVolumeUtil.java | 30 +- .../operator/util/TheiaCloudServiceUtil.java | 128 +- .../resources/templateConfigmapEmails.yaml | 2 +- ...templatePersistentVolumeClaimMinikube.yaml | 2 +- .../templatePersistentVolumeMinikube.yaml | 2 +- .../.classpath | 65 - .../.mvn/wrapper/MavenWrapperDownloader.java | 113 +- .../org.eclipse.theia.cloud.service/.project | 34 - .../org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.apt.core.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 576 ------ .../.settings/org.eclipse.jdt.ui.prefs | 123 -- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.theia.cloud.service/README.md | 4 +- .../Run Theia Cloud Service.launch | 21 - .../TheiaCloud Service Tests.launch | 23 - .../org.eclipse.theia.cloud.service/pom.xml | 328 ++-- .../cloud/service/AnonymousPrincipal.java | 14 +- .../service/ApplicationLifecycleListener.java | 32 +- .../cloud/service/ApplicationProperties.java | 25 +- .../theia/cloud/service/BaseResource.java | 96 +- ...ConfigurableAnonymousIdentityProvider.java | 40 +- .../theia/cloud/service/EnvironmentVars.java | 10 +- .../theia/cloud/service/EvaluatedRequest.java | 8 +- .../eclipse/theia/cloud/service/K8sUtil.java | 162 +- .../theia/cloud/service/LaunchRequest.java | 14 +- .../cloud/service/NoAnonymousAccess.java | 15 +- .../service/NoAnonymousAccessInterceptor.java | 41 +- .../theia/cloud/service/PingRequest.java | 6 +- .../theia/cloud/service/RootResource.java | 90 +- .../theia/cloud/service/ServiceRequest.java | 8 +- .../theia/cloud/service/TheiaCloudUser.java | 34 +- .../cloud/service/TheiaCloudUserProducer.java | 58 +- .../service/UserScopedServiceRequest.java | 4 +- .../session/SessionActivityRequest.java | 8 +- .../service/session/SessionListRequest.java | 8 +- .../service/session/SessionPerformance.java | 10 +- .../session/SessionPerformanceRequest.java | 8 +- .../service/session/SessionResource.java | 184 +- .../service/session/SessionStartRequest.java | 32 +- .../service/session/SessionStopRequest.java | 12 +- .../service/workspace/UserWorkspace.java | 24 +- .../workspace/WorkspaceCreationRequest.java | 14 +- .../workspace/WorkspaceDeletionRequest.java | 12 +- .../workspace/WorkspaceListRequest.java | 8 +- .../service/workspace/WorkspaceResource.java | 86 +- .../resources/META-INF/resources/index.html | 676 ++++--- .../service/ApplicationPropertiesTests.java | 25 +- ...gurableAnonymousIdentityProviderTests.java | 35 +- .../NoAnonymousAccessInterceptorTests.java | 79 +- .../cloud/service/RootResourceTests.java | 36 +- .../service/TheiaCloudUserProducerTests.java | 138 +- .../service/session/SessionResourceTests.java | 485 +++-- .../theia/cloud/service/test/TestUtil.java | 40 +- .../workspace/WorkspaceResourceTests.java | 435 +++-- .../modules/cluster_creation/gke/main.tf | 2 +- .../cluster_creation/minikube/versions.tf | 2 +- .../helm/clusterissuer-selfsigned.yaml | 2 +- terraform/modules/helm/keycloak.yaml | 4 +- terraform/modules/keycloak/README.md | 2 +- terraform/terraform.md | 6 +- 246 files changed, 9914 insertions(+), 13204 deletions(-) create mode 100644 .vscode/java-formatter.xml create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json delete mode 100644 java/common/maven-conf/.project delete mode 100644 java/common/maven-conf/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/common/maven-conf/.settings/org.eclipse.m2e.core.prefs delete mode 100644 java/common/maven-conf/Install maven-conf.launch delete mode 100644 java/common/org.eclipse.theia.cloud.common/.classpath delete mode 100644 java/common/org.eclipse.theia.cloud.common/.project delete mode 100644 java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.jdt.apt.core.prefs delete mode 100644 java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.jdt.core.prefs delete mode 100644 java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.m2e.core.prefs delete mode 100644 java/common/org.eclipse.theia.cloud.common/Build and install common.launch delete mode 100644 java/common/org.eclipse.theia.cloud.common/Theia Cloud.launch delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.classpath delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.project delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.settings/org.eclipse.jdt.apt.core.prefs delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.settings/org.eclipse.jdt.core.prefs delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/.settings/org.eclipse.m2e.core.prefs delete mode 100644 java/conversion/org.eclipse.theia.cloud.conversion/Run Theia Cloud Conversion Hook.launch delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.classpath delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.project delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.settings/org.eclipse.jdt.apt.core.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.settings/org.eclipse.jdt.core.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/.settings/org.eclipse.m2e.core.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.defaultoperator/Run Operator.launch delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.classpath delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.project delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.apt.core.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.core.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/.settings/org.eclipse.m2e.core.prefs delete mode 100644 java/operator/org.eclipse.theia.cloud.operator/Install operator.launch delete mode 100644 java/service/org.eclipse.theia.cloud.service/.classpath delete mode 100644 java/service/org.eclipse.theia.cloud.service/.project delete mode 100644 java/service/org.eclipse.theia.cloud.service/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/service/org.eclipse.theia.cloud.service/.settings/org.eclipse.jdt.apt.core.prefs delete mode 100644 java/service/org.eclipse.theia.cloud.service/.settings/org.eclipse.jdt.core.prefs delete mode 100644 java/service/org.eclipse.theia.cloud.service/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 java/service/org.eclipse.theia.cloud.service/.settings/org.eclipse.m2e.core.prefs delete mode 100644 java/service/org.eclipse.theia.cloud.service/Run Theia Cloud Service.launch delete mode 100644 java/service/org.eclipse.theia.cloud.service/TheiaCloud Service Tests.launch diff --git a/.vscode/extensions.json b/.vscode/extensions.json index cad1a218..286074e2 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,5 +1,10 @@ { - "recommendations": [ - "hashicorp.terraform" - ] -} \ No newline at end of file + "recommendations": [ + "hashicorp.terraform", + "vscjava.vscode-java-pack", + "esbenp.prettier-vscode", + "ms-azuretools.vscode-docker", + "jebbs.plantuml", + "redhat.vscode-xml" + ] +} diff --git a/.vscode/java-formatter.xml b/.vscode/java-formatter.xml new file mode 100644 index 00000000..38e83d7a --- /dev/null +++ b/.vscode/java-formatter.xml @@ -0,0 +1,787 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..75329eca --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,28 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Debug Default Operator", + "request": "launch", + "cwd": "${workspaceFolder}/java/operator/org.eclipse.theia.cloud.defaultoperator", + "mainClass": "org.eclipse.theia.cloud.defaultoperator.DefaultTheiaCloudOperatorLauncher", + "args": [ + "--instancesHost", + "ws.$(minikube.ip).nip.io", + "--cloudProvider", + "MINIKUBE", + "--sessionsPerUser", + "3", + "--appId", + "asdfghjkl", + "--storageClassName", + "default", + "--requestedStorage", + "250Mi" + ], + "vmArgs": "-Dlog4j2.configurationFile=log4j2.xml", + "preLaunchTask": "Build and Install Operator library" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index fa345ecd..b77290c5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,12 +1,30 @@ { - "[terraform]": { - "editor.defaultFormatter": "hashicorp.terraform", - "editor.formatOnSave": true, - }, - "[terraform-vars]": { - "editor.defaultFormatter": "hashicorp.terraform", - "editor.formatOnSave": true, - }, - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file + "[terraform]": { + "editor.defaultFormatter": "hashicorp.terraform", + "editor.formatOnSave": true + }, + "[terraform-vars]": { + "editor.defaultFormatter": "hashicorp.terraform", + "editor.formatOnSave": true + }, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "interactive", + "java.format.settings.url": ".vscode/java-formatter.xml", + "[java]": { + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.defaultFormatter": "redhat.java" + }, + "[dockerfile]": { + "editor.defaultFormatter": "ms-azuretools.vscode-docker" + }, + "[plantuml]": { + "editor.defaultFormatter": "jebbs.plantuml" + }, + "[xml]": { + "editor.defaultFormatter": "redhat.vscode-xml" + } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..eff85040 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,73 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Install Maven config", + "type": "shell", + "command": "mvn", + "args": ["install"], + "options": { + "cwd": "${workspaceFolder}/java/common/maven-conf" + }, + "problemMatcher": [] + }, + { + "label": "Build and Install Common library", + "type": "shell", + "command": "mvn", + "args": ["clean", "install"], + "options": { + "cwd": "${workspaceFolder}/java/common/org.eclipse.theia.cloud.common" + }, + "problemMatcher": [], + "dependsOn": "Install Maven config" + }, + { + "label": "Build and Install Operator library", + "type": "shell", + "command": "mvn", + "args": ["install"], + "options": { + "cwd": "${workspaceFolder}/java/operator/org.eclipse.theia.cloud.operator" + }, + "problemMatcher": [], + "dependsOn": "Build and Install Common library" + }, + { + "label": "Run Service", + "type": "shell", + "command": "mvn", + "args": ["compile", "quarkus:dev"], + "options": { + "cwd": "${workspaceFolder}/java/service/org.eclipse.theia.cloud.service" + }, + "problemMatcher": [], + "dependsOn": "Build and Install Common library" + }, + { + "label": "Run Conversion Hook", + "type": "shell", + "command": "mvn", + "args": ["compile", "quarkus:dev"], + "options": { + "cwd": "${workspaceFolder}/java/conversion/org.eclipse.theia.cloud.conversion" + }, + "problemMatcher": [], + "dependsOn": "Build and Install Common library" + }, + { + "label": "Run Service Tests", + "type": "shell", + "command": "sh", + "args": [ + "-c", + "export JAVA_OPTS='-ea -Djava.util.logging.manager=org.jboss.logmanager.LogManager' && mvn test" + ], + "options": { + "cwd": "${workspaceFolder}/java/service/org.eclipse.theia.cloud.service" + }, + "problemMatcher": [], + "dependsOn": "Build and Install Common library" + } + ] +} diff --git a/demo/dockerfiles/demo-operator-custom-template/templateDeploymentWithoutOAuthProxy.yaml b/demo/dockerfiles/demo-operator-custom-template/templateDeploymentWithoutOAuthProxy.yaml index e54f6cfd..a3437c43 100644 --- a/demo/dockerfiles/demo-operator-custom-template/templateDeploymentWithoutOAuthProxy.yaml +++ b/demo/dockerfiles/demo-operator-custom-template/templateDeploymentWithoutOAuthProxy.yaml @@ -45,4 +45,4 @@ spec: image: nginxdemos/hello securityContext: runAsUser: 0 - runAsGroup: 0 \ No newline at end of file + runAsGroup: 0 diff --git a/demo/dockerfiles/demo-theia-docker/package.json b/demo/dockerfiles/demo-theia-docker/package.json index 0bdd6395..920515cb 100644 --- a/demo/dockerfiles/demo-theia-docker/package.json +++ b/demo/dockerfiles/demo-theia-docker/package.json @@ -1,87 +1,87 @@ { - "private": true, - "theia": { - "frontend": { - "config": { - "applicationName": "Theia Cloud Example", - "warnOnPotentiallyInsecureHostPattern": false, - "preferences": { - "files.enableTrash": false - } - } - }, - "backend": { - "config": { - "warnOnPotentiallyInsecureHostPattern": false - } + "private": true, + "theia": { + "frontend": { + "config": { + "applicationName": "Theia Cloud Example", + "warnOnPotentiallyInsecureHostPattern": false, + "preferences": { + "files.enableTrash": false } + } }, - "dependencies": { - "@theia/bulk-edit": "1.43.1", - "@theia/callhierarchy": "1.43.1", - "@theia/console": "1.43.1", - "@theia/core": "1.43.1", - "@theia/debug": "1.43.1", - "@theia/editor": "1.43.1", - "@theia/editor-preview": "1.43.1", - "@theia/electron": "1.43.1", - "@theia/external-terminal": "1.43.1", - "@theia/file-search": "1.43.1", - "@theia/filesystem": "1.43.1", - "@theia/getting-started": "1.43.1", - "@theia/keymaps": "1.43.1", - "@theia/markers": "1.43.1", - "@theia/messages": "1.43.1", - "@theia/metrics": "1.43.1", - "@theia/mini-browser": "1.43.1", - "@theia/monaco": "1.43.1", - "@theia/navigator": "1.43.1", - "@theia/outline-view": "1.43.1", - "@theia/output": "1.43.1", - "@theia/plugin-dev": "1.43.1", - "@theia/plugin-ext": "1.43.1", - "@theia/plugin-ext-vscode": "1.43.1", - "@theia/preferences": "1.43.1", - "@theia/process": "1.43.1", - "@theia/property-view": "1.43.1", - "@theia/scm": "1.43.1", - "@theia/scm-extra": "1.43.1", - "@theia/search-in-workspace": "1.43.1", - "@theia/task": "1.43.1", - "@theia/terminal": "1.43.1", - "@theia/timeline": "1.43.1", - "@theia/toolbar": "1.43.1", - "@theia/typehierarchy": "1.43.1", - "@theia/userstorage": "1.43.1", - "@theia/variable-resolver": "1.43.1", - "@theia/vsx-registry": "1.43.1", - "@theia/workspace": "1.43.1" - }, - "devDependencies": { - "@theia/cli": "1.43.1" - }, - "scripts": { - "preinstall": "node-gyp install" - }, - "theiaPluginsDir": "plugins", - "theiaPlugins": { - "vscode.git": "https://open-vsx.org/api/vscode/git/1.52.1/file/vscode.git-1.52.1.vsix", - "vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix", - "vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.50.1/file/eclipse-theia.builtin-extension-pack-1.50.1.vsix", - "redhat.java": "https://open-vsx.org/api/redhat/java/0.73.0/file/redhat.java-0.73.0.vsix", - "vscjava.vscode-java-debug": "https://open-vsx.org/api/vscjava/vscode-java-debug/0.30.0/file/vscjava.vscode-java-debug-0.30.0.vsix", - "vscjava.vscode-java-test": "https://open-vsx.org/api/vscjava/vscode-java-test/0.26.1/file/vscjava.vscode-java-test-0.26.1.vsix", - "vscjava.vscode-maven": "https://open-vsx.org/api/vscjava/vscode-maven/0.21.2/file/vscjava.vscode-maven-0.21.2.vsix", - "vscjava.vscode-java-dependency": "https://open-vsx.org/api/vscjava/vscode-java-dependency/0.16.0/file/vscjava.vscode-java-dependency-0.16.0.vsix", - "redhat.vscode-xml": "https://open-vsx.org/api/redhat/vscode-xml/0.20.0/file/redhat.vscode-xml-0.20.0.vsix", - "cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.92/file/eclipse-cdt.cdt-gdb-vscode-0.0.92.vsix", - "vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix", - "vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.15/file/llvm-vs-code-extensions.vscode-clangd-0.1.15.vsix", - "vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.9.2/file/ms-vscode.cmake-tools-1.9.2.vsix" - }, - "theiaPluginsExcludeIds": [ - "vscode.extension-editing", - "vscode.microsoft-authentication", - "vscode.html-language-features" - ] -} \ No newline at end of file + "backend": { + "config": { + "warnOnPotentiallyInsecureHostPattern": false + } + } + }, + "dependencies": { + "@theia/bulk-edit": "1.43.1", + "@theia/callhierarchy": "1.43.1", + "@theia/console": "1.43.1", + "@theia/core": "1.43.1", + "@theia/debug": "1.43.1", + "@theia/editor": "1.43.1", + "@theia/editor-preview": "1.43.1", + "@theia/electron": "1.43.1", + "@theia/external-terminal": "1.43.1", + "@theia/file-search": "1.43.1", + "@theia/filesystem": "1.43.1", + "@theia/getting-started": "1.43.1", + "@theia/keymaps": "1.43.1", + "@theia/markers": "1.43.1", + "@theia/messages": "1.43.1", + "@theia/metrics": "1.43.1", + "@theia/mini-browser": "1.43.1", + "@theia/monaco": "1.43.1", + "@theia/navigator": "1.43.1", + "@theia/outline-view": "1.43.1", + "@theia/output": "1.43.1", + "@theia/plugin-dev": "1.43.1", + "@theia/plugin-ext": "1.43.1", + "@theia/plugin-ext-vscode": "1.43.1", + "@theia/preferences": "1.43.1", + "@theia/process": "1.43.1", + "@theia/property-view": "1.43.1", + "@theia/scm": "1.43.1", + "@theia/scm-extra": "1.43.1", + "@theia/search-in-workspace": "1.43.1", + "@theia/task": "1.43.1", + "@theia/terminal": "1.43.1", + "@theia/timeline": "1.43.1", + "@theia/toolbar": "1.43.1", + "@theia/typehierarchy": "1.43.1", + "@theia/userstorage": "1.43.1", + "@theia/variable-resolver": "1.43.1", + "@theia/vsx-registry": "1.43.1", + "@theia/workspace": "1.43.1" + }, + "devDependencies": { + "@theia/cli": "1.43.1" + }, + "scripts": { + "preinstall": "node-gyp install" + }, + "theiaPluginsDir": "plugins", + "theiaPlugins": { + "vscode.git": "https://open-vsx.org/api/vscode/git/1.52.1/file/vscode.git-1.52.1.vsix", + "vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix", + "vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.50.1/file/eclipse-theia.builtin-extension-pack-1.50.1.vsix", + "redhat.java": "https://open-vsx.org/api/redhat/java/0.73.0/file/redhat.java-0.73.0.vsix", + "vscjava.vscode-java-debug": "https://open-vsx.org/api/vscjava/vscode-java-debug/0.30.0/file/vscjava.vscode-java-debug-0.30.0.vsix", + "vscjava.vscode-java-test": "https://open-vsx.org/api/vscjava/vscode-java-test/0.26.1/file/vscjava.vscode-java-test-0.26.1.vsix", + "vscjava.vscode-maven": "https://open-vsx.org/api/vscjava/vscode-maven/0.21.2/file/vscjava.vscode-maven-0.21.2.vsix", + "vscjava.vscode-java-dependency": "https://open-vsx.org/api/vscjava/vscode-java-dependency/0.16.0/file/vscjava.vscode-java-dependency-0.16.0.vsix", + "redhat.vscode-xml": "https://open-vsx.org/api/redhat/vscode-xml/0.20.0/file/redhat.vscode-xml-0.20.0.vsix", + "cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.92/file/eclipse-cdt.cdt-gdb-vscode-0.0.92.vsix", + "vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix", + "vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.15/file/llvm-vs-code-extensions.vscode-clangd-0.1.15.vsix", + "vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.9.2/file/ms-vscode.cmake-tools-1.9.2.vsix" + }, + "theiaPluginsExcludeIds": [ + "vscode.extension-editing", + "vscode.microsoft-authentication", + "vscode.html-language-features" + ] +} diff --git a/demo/dockerfiles/demo-theia-docker/project/.vscode/settings.json b/demo/dockerfiles/demo-theia-docker/project/.vscode/settings.json index 61bdcd69..8aa63df4 100644 --- a/demo/dockerfiles/demo-theia-docker/project/.vscode/settings.json +++ b/demo/dockerfiles/demo-theia-docker/project/.vscode/settings.json @@ -1,14 +1,14 @@ { - "files.exclude": { - "**/.classpath": true, - "**/.project": true, - "**/.settings": true, - "**/.factorypath": true - }, - "java.configuration.updateBuildConfiguration": "automatic", - "xml.downloadExternalResources.enabled": true, - "cmake.sourceDirectory": "${workspaceFolder}/cpp", - "cmake.buildDirectory": "${workspaceFolder}/cpp/build", - "java.project.importOnFirstTimeStartup": "automatic", - "cmake.configureOnOpen": true, -} \ No newline at end of file + "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true + }, + "java.configuration.updateBuildConfiguration": "automatic", + "xml.downloadExternalResources.enabled": true, + "cmake.sourceDirectory": "${workspaceFolder}/cpp", + "cmake.buildDirectory": "${workspaceFolder}/cpp/build", + "java.project.importOnFirstTimeStartup": "automatic", + "cmake.configureOnOpen": true +} diff --git a/demo/dockerfiles/demo-theia-docker/project/files/template.json b/demo/dockerfiles/demo-theia-docker/project/files/template.json index 6f606f76..18937714 100644 --- a/demo/dockerfiles/demo-theia-docker/project/files/template.json +++ b/demo/dockerfiles/demo-theia-docker/project/files/template.json @@ -1,9 +1,9 @@ { - "$schema": "./template.schema.json", - "name": "theia-cloud.demo", - "image": "my.docker.registry/theia-cloud-demo", - "limits": { - "cpu": "1", - "memory": "2000M" - } -} \ No newline at end of file + "$schema": "./template.schema.json", + "name": "theia-cloud.demo", + "image": "my.docker.registry/theia-cloud-demo", + "limits": { + "cpu": "1", + "memory": "2000M" + } +} diff --git a/demo/dockerfiles/demo-theia-docker/project/files/template.schema.json b/demo/dockerfiles/demo-theia-docker/project/files/template.schema.json index 18452a48..5aa28de3 100644 --- a/demo/dockerfiles/demo-theia-docker/project/files/template.schema.json +++ b/demo/dockerfiles/demo-theia-docker/project/files/template.schema.json @@ -1,32 +1,25 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "image": { - "type": "string" + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "image": { + "type": "string" + }, + "limits": { + "type": "object", + "properties": { + "cpu": { + "type": "string" }, - "limits": { - "type": "object", - "properties": { - "cpu": { - "type": "string" - }, - "memory": { - "type": "string" - } - }, - "required": [ - "cpu", - "memory" - ] + "memory": { + "type": "string" } - }, - "required": [ - "name", - "image", - "limits" - ] -} \ No newline at end of file + }, + "required": ["cpu", "memory"] + } + }, + "required": ["name", "image", "limits"] +} diff --git a/demo/dockerfiles/demo-theia-docker/project/files/template.xml b/demo/dockerfiles/demo-theia-docker/project/files/template.xml index 52ce82f2..4dff323e 100644 --- a/demo/dockerfiles/demo-theia-docker/project/files/template.xml +++ b/demo/dockerfiles/demo-theia-docker/project/files/template.xml @@ -1,5 +1,6 @@ -