fix: Create project using server SA

.github/workflows/build-pr-check.yml

@@ -45,8 +45,6 @@ jobs:
         registry: quay.io
     - name: Build with Maven
       run: mvn -B clean install -U -Pintegration
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
     - name: Build and push images
       if: ${{ github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork }}
       run: ./build/build.sh --tag:${{ env.PR_IMAGE_TAG }} --build-platforms:linux/amd64,linux/ppc64le,linux/arm64,linux/s390x --builder:podman --push-image

.github/workflows/next-build.yml

@@ -44,8 +44,6 @@ jobs:
         registry: quay.io
     - name: Build with Maven
       run: mvn -B clean install -U -Pintegration
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
     - name: Build and push images
       id: build
       run: |

.gitignore

@@ -99,8 +99,5 @@ tests/e2e/load-test-folder
 */.lock-wscript
 */cypress-tests/dist
 
-# Develocity
-.mvn/.develocity/develocity-workspace-id
-
 # typescript-dto
 /typescript-dto/.pnp.cjs

README.md

@@ -39,20 +39,6 @@ See the Eclipse Che Documentation about [how you can join our community](https:/
 
 * [![release latest stable](https://github.com/eclipse-che/che-server/actions/workflows/release.yml/badge.svg)](https://github.com/eclipse-che/che-server/actions/workflows/release.yml)
 
-### Develocity
-
-[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://develocity-staging.eclipse.org/)
-
-The `che-server` builds are revved up by [Develocity](https://develocity-staging.eclipse.org/scans), which enhances developer productivity through features such as Build Scan for build insights and collaborative troubleshooting, and remote Build Cache for build acceleration. Develocity also provides comprehensive reporting and visualization of build data.
-
-To view the Build Scan produced by a build, click on the generated link at the end of the build. Build Scans are available locally and on GitHub Action CI (limited to users authenticated to publish local scans). You can access all scans published by the `che-server` builds on the [Eclipse Develocity dashboard](https://develocity-staging.eclipse.org) by [searching](https://develocity-staging.eclipse.org/scans?search.rootProjectNames=che%20server) for the `che server` project.
-
-Here are additional useful links with the `che-server` builds data:
-- [Build Scans](https://develocity-staging.eclipse.org/scans?search.rootProjectNames=che%20server)
-- [Trends dashboard](https://develocity-staging.eclipse.org/scans/trends?search.rootProjectNames=che%20server)
-- [Failures dashboard](https://develocity-staging.eclipse.org/scans/failures?search.rootProjectNames=che%20server)
-- Failed and flaky [Tests dashboard](https://develocity-staging.eclipse.org/scans/tests?search.rootProjectNames=che%20server)
-
 ## SBOM
 
 To enhance supply chain security and offer users clear insight into project  components, Eclipse Che now generates a Software Bill of Materials (SBOM) for every release. These are published to the Eclipse Foundation SBOM registry, with access instructions and usage details available in this [documentation](https://eclipse-csi.github.io/security-handbook/sbom/registry.html).

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/multiuser.properties

@@ -64,17 +64,6 @@ che.limits.user.workspaces.count=-1
 # stop a running workspace to activate another.
 che.limits.user.workspaces.run.count=1
 
-
-### Multi-user-specific OpenShift infrastructure configuration
-
-# Alias of the OpenShift identity provider registered in Keycloak
-# that should be used to create workspace OpenShift resources in
-# OpenShift namespaces owned by the current Che user.
-# Set it to `NULL` if `che.infra.openshift.project`
-# is set to a non-empty value.
-# See: link:https://www.keycloak.org/docs/latest/server_admin/#openshift-4[OpenShift identity provider]
-che.infra.openshift.oauth_identity_provider=NULL
-
 ### OIDC configuration
 
 # Url to OIDC identity provider server.

infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactory.java

@@ -11,7 +11,6 @@
  */
 package org.eclipse.che.workspace.infrastructure.openshift.project;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
@@ -66,8 +65,6 @@ public class OpenShiftProjectFactory extends KubernetesNamespaceFactory {
 
   private final CheServerKubernetesClientFactory cheServerKubernetesClientFactory;
 
-  private final String oAuthIdentityProvider;
-
   @Inject
   public OpenShiftProjectFactory(
       @Nullable @Named("che.infra.kubernetes.namespace.default") String defaultNamespaceName,
@@ -84,9 +81,7 @@ public OpenShiftProjectFactory(
       PreferenceManager preferenceManager,
       KubernetesSharedPool sharedPool,
       AuthorizationChecker authorizationChecker,
-      PermissionsCleaner permissionsCleaner,
-      @Nullable @Named("che.infra.openshift.oauth_identity_provider")
-          String oAuthIdentityProvider) {
+      PermissionsCleaner permissionsCleaner) {
     super(
         defaultNamespaceName,
         namespaceCreationAllowed,
@@ -104,7 +99,6 @@ public OpenShiftProjectFactory(
     this.cheServerKubernetesClientFactory = cheServerKubernetesClientFactory;
     this.cheServerOpenshiftClientFactory = cheServerOpenshiftClientFactory;
     this.openShiftClientFactory = openShiftClientFactory;
-    this.oAuthIdentityProvider = oAuthIdentityProvider;
   }
 
   public OpenShiftProject getOrCreate(RuntimeIdentity identity) throws InfrastructureException {
@@ -121,7 +115,7 @@ public OpenShiftProject getOrCreate(RuntimeIdentity identity) throws Infrastruct
 
     osProject.prepare(
         canCreateNamespace(),
-        initWithCheServerSa && !isNullOrEmpty(oAuthIdentityProvider),
+        initWithCheServerSa,
         labelNamespaces ? namespaceLabels : emptyMap(),
         annotateNamespaces ? namespaceAnnotationsEvaluated : emptyMap());
 

infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactoryTest.java

@@ -103,8 +103,6 @@ public class OpenShiftProjectFactoryTest {
 
   private static final String USER_ID = "2342-2559-234";
   private static final String USER_NAME = "johndoe";
-  private static final String NO_OAUTH_IDENTITY_PROVIDER = null;
-  private static final String OAUTH_IDENTITY_PROVIDER = "openshift-v4";
   private static final String NAMESPACE_LABEL_NAME = "component";
   private static final String NAMESPACE_LABELS = NAMESPACE_LABEL_NAME + "=workspace";
   private static final String NAMESPACE_ANNOTATION_NAME = "owner";
@@ -184,8 +182,7 @@ public void shouldNotThrowExceptionIfDefaultNamespaceIsSpecifiedOnCheckingIfName
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     projectFactory.checkIfNamespaceIsAllowed(USER_NAME + "-che");
   }
@@ -216,8 +213,7 @@ public void shouldNotThrowExceptionIfDefaultNamespaceIsSpecifiedOnCheckingIfName
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
     try {
       projectFactory.checkIfNamespaceIsAllowed("any-namespace");
     } catch (ValidationException e) {
@@ -248,8 +244,7 @@ public void shouldNotThrowExceptionIfDefaultNamespaceIsSpecifiedOnCheckingIfName
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
   }
 
   @Test
@@ -285,8 +280,7 @@ public void shouldReturnPreparedNamespacesWhenFound() throws InfrastructureExcep
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
     EnvironmentContext.getCurrent()
         .setSubject(new SubjectImpl("jondoe", Collections.emptyList(), "123", null, false));
 
@@ -324,8 +318,7 @@ public void shouldNotThrowAnExceptionWhenNotAllowedToListNamespaces() throws Exc
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
     EnvironmentContext.getCurrent()
         .setSubject(new SubjectImpl("jondoe", Collections.emptyList(), "u123", null, false));
 
@@ -359,8 +352,7 @@ public void throwAnExceptionWhenErrorListingNamespaces() throws Exception {
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     // when
     projectFactory.list();
@@ -403,8 +395,7 @@ public void shouldReturnDefaultProjectWhenItExistsAndUserDefinedIsNotAllowed() t
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     List<KubernetesNamespaceMeta> availableNamespaces = projectFactory.list();
     assertEquals(availableNamespaces.size(), 1);
@@ -441,8 +432,7 @@ public void shouldReturnDefaultProjectWhenItDoesNotExistAndUserDefinedIsNotAllow
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     List<KubernetesNamespaceMeta> availableNamespaces = projectFactory.list();
     assertEquals(availableNamespaces.size(), 1);
@@ -479,8 +469,7 @@ public void shouldThrowExceptionWhenFailedToGetInfoAboutDefaultNamespace() throw
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     projectFactory.list();
   }
@@ -507,8 +496,7 @@ public void shouldThrowExceptionWhenFailedToGetNamespaces() throws Exception {
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     projectFactory.list();
   }
@@ -540,8 +528,7 @@ public void shouldRequireNamespacePriorExistenceIfDifferentFromDefaultAndUserDef
                 preferenceManager,
                 pool,
                 authorizationChecker,
-                permissionsCleaner,
-                NO_OAUTH_IDENTITY_PROVIDER));
+                permissionsCleaner));
     OpenShiftProject toReturnProject = mock(OpenShiftProject.class);
     prepareProject(toReturnProject);
     doReturn(toReturnProject).when(projectFactory).doCreateProjectAccess(any(), any());
@@ -553,7 +540,7 @@ public void shouldRequireNamespacePriorExistenceIfDifferentFromDefaultAndUserDef
 
     // then
     assertEquals(toReturnProject, project);
-    verify(toReturnProject).prepare(eq(true), eq(false), any(), any());
+    verify(toReturnProject).prepare(eq(true), eq(true), any(), any());
   }
 
   @Test
@@ -576,8 +563,7 @@ public void shouldCreatePreferencesConfigmapIfNotExists() throws Exception {
                 preferenceManager,
                 pool,
                 authorizationChecker,
-                permissionsCleaner,
-                NO_OAUTH_IDENTITY_PROVIDER));
+                permissionsCleaner));
     OpenShiftProject toReturnProject = mock(OpenShiftProject.class);
     doReturn(toReturnProject).when(projectFactory).doCreateProjectAccess(any(), any());
     when(toReturnProject.getName()).thenReturn("namespace123");
@@ -620,8 +606,7 @@ public void shouldNotCreatePreferencesConfigmapIfExist() throws Exception {
                 preferenceManager,
                 pool,
                 authorizationChecker,
-                permissionsCleaner,
-                NO_OAUTH_IDENTITY_PROVIDER));
+                permissionsCleaner));
     OpenShiftProject toReturnProject = mock(OpenShiftProject.class);
     prepareProject(toReturnProject);
     doReturn(toReturnProject).when(projectFactory).doCreateProjectAccess(any(), any());
@@ -666,8 +651,7 @@ public void shouldCallStopWorkspaceRoleProvisionWhenIdentityProviderIsDefined()
                 preferenceManager,
                 pool,
                 authorizationChecker,
-                permissionsCleaner,
-                OAUTH_IDENTITY_PROVIDER));
+                permissionsCleaner));
     OpenShiftProject toReturnProject = mock(OpenShiftProject.class);
     when(toReturnProject.getName()).thenReturn("workspace123");
     prepareProject(toReturnProject);
@@ -718,8 +702,7 @@ public void testEvalNamespaceNameWhenPreparedNamespacesFound() throws Infrastruc
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
 
     String namespace =
         projectFactory.evaluateNamespaceName(
@@ -752,8 +735,7 @@ public void testUsernamePlaceholderInLabelsIsNotEvaluated() throws Infrastructur
             preferenceManager,
             pool,
             authorizationChecker,
-            permissionsCleaner,
-            NO_OAUTH_IDENTITY_PROVIDER);
+            permissionsCleaner);
     EnvironmentContext.getCurrent()
         .setSubject(new SubjectImpl("jondoe", Collections.emptyList(), "123", null, false));
     projectFactory.list();
@@ -781,8 +763,7 @@ public void testUsernamePlaceholderInAnnotationsIsEvaluated() throws Infrastruct
                 preferenceManager,
                 pool,
                 authorizationChecker,
-                permissionsCleaner,
-                NO_OAUTH_IDENTITY_PROVIDER));
+                permissionsCleaner));
     EnvironmentContext.getCurrent()
         .setSubject(new SubjectImpl("jondoe", Collections.emptyList(), "123", null, false));
     OpenShiftProject toReturnProject = mock(OpenShiftProject.class);
@@ -796,7 +777,7 @@ public void testUsernamePlaceholderInAnnotationsIsEvaluated() throws Infrastruct
     // then
     assertEquals(toReturnProject, project);
     verify(toReturnProject)
-        .prepare(eq(true), eq(false), any(), eq(Map.of("try_placeholder_here", "jondoe")));
+        .prepare(eq(true), eq(true), any(), eq(Map.of("try_placeholder_here", "jondoe")));
   }
 
   @Test
@@ -824,8 +805,7 @@ public void testAllConfiguratorsAreCalledWhenCreatingProject() throws Infrastruc
                 preferenceManager,
                 pool,
                 authorizationChecker,
-                permissionsCleaner,
-                NO_OAUTH_IDENTITY_PROVIDER));
+                permissionsCleaner));
     EnvironmentContext.getCurrent()
         .setSubject(new SubjectImpl("jondoe", Collections.emptyList(), "123", null, false));