Filter out IDEs on the backend

components/dashboard/src/components/SelectIDEComponent.tsx

@@ -5,11 +5,10 @@
  */
 
 import { IDEOption, IDEOptions } from "@gitpod/gitpod-protocol/lib/ide-protocol";
-import { useCallback, useContext, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { getGitpodService } from "../service/service";
 import { DropDown2, DropDown2Element } from "./DropDown2";
 import Editor from "../icons/Editor.svg";
-import { FeatureFlagContext } from "../contexts/FeatureFlagContext";
 
 interface SelectIDEComponentProps {
     selectedIdeOption?: string;
@@ -18,15 +17,12 @@ interface SelectIDEComponentProps {
     setError?: (error?: string) => void;
 }
 
-function filteredIdeOptions(ideOptions: IDEOptions, experimentalTurnedOn: boolean) {
-    return IDEOptions.asArray(ideOptions)
-        .filter((x) => !x.hidden)
-        .filter((x) => (x.experimental ? experimentalTurnedOn : true));
+function filteredIdeOptions(ideOptions: IDEOptions) {
+    return IDEOptions.asArray(ideOptions).filter((x) => !x.hidden);
 }
 
 export default function SelectIDEComponent(props: SelectIDEComponentProps) {
     const [ideOptions, setIdeOptions] = useState<IDEOptions>();
-    const { experimentalIdes } = useContext(FeatureFlagContext);
 
     useEffect(() => {
         getGitpodService().server.getIDEOptions().then(setIdeOptions);
@@ -36,7 +32,7 @@ export default function SelectIDEComponent(props: SelectIDEComponentProps) {
             if (!ideOptions) {
                 return [];
             }
-            const options = filteredIdeOptions(ideOptions, experimentalIdes);
+            const options = filteredIdeOptions(ideOptions);
             const result: DropDown2Element[] = [];
             for (const ide of options.filter((ide) =>
                 `${ide.label}${ide.title}${ide.notes}${ide.id}`.toLowerCase().includes(search.toLowerCase()),
@@ -57,7 +53,7 @@ export default function SelectIDEComponent(props: SelectIDEComponentProps) {
             }
             return result;
         },
-        [experimentalIdes, ideOptions, props.useLatest],
+        [ideOptions, props.useLatest],
     );
     const internalOnSelectionChange = (id: string) => {
         const { ide, useLatest } = parseId(id);

components/dashboard/src/contexts/FeatureFlagContext.tsx

@@ -29,7 +29,6 @@ const defaultFeatureFlags = {
     userGitAuthProviders: false,
     newSignupFlow: false,
     linkedinConnectionForOnboarding: false,
-    experimentalIdes: false,
 };
 
 const FeatureFlagContext = createContext<FeatureFlagsType>(defaultFeatureFlags);
@@ -48,7 +47,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
     const [userGitAuthProviders, setUserGitAuthProviders] = useState<boolean>(false);
     const [newSignupFlow, setNewSignupFlow] = useState<boolean>(false);
     const [linkedinConnectionForOnboarding, setLinkedinConnectionForOnboarding] = useState<boolean>(false);
-    const [experimentalIdes, setExperimentalIdes] = useState<boolean>(false);
 
     useEffect(() => {
         if (!user) return;
@@ -67,7 +65,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
                 userGitAuthProviders: { defaultValue: false, setter: setUserGitAuthProviders },
                 newSignupFlow: { defaultValue: false, setter: setNewSignupFlow },
                 linkedinConnectionForOnboarding: { defaultValue: false, setter: setLinkedinConnectionForOnboarding },
-                experimentalIdes: { defaultValue: false, setter: setExperimentalIdes },
             };
 
             for (const [flagName, config] of Object.entries(featureFlags)) {
@@ -115,7 +112,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
             userGitAuthProviders,
             newSignupFlow,
             linkedinConnectionForOnboarding,
-            experimentalIdes,
         };
     }, [
         enablePersonalAccessTokens,
@@ -127,7 +123,6 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
         startWithOptions,
         usePublicApiWorkspacesService,
         userGitAuthProviders,
-        experimentalIdes,
     ]);
 
     return <FeatureFlagContext.Provider value={flags}>{children}</FeatureFlagContext.Provider>;

components/ide-service-api/ide.proto

@@ -18,7 +18,9 @@ service IDEService {
     }
 }
 
-message GetConfigRequest {}
+message GetConfigRequest {
+    User user = 1;
+}
 
 message GetConfigResponse {
     string content = 1;

components/ide-service/pkg/server/server.go

@@ -36,7 +36,7 @@ type IDEServiceServer struct {
 	parsedIDEConfigContent string
 	ideConfig              *config.IDEConfig
 	ideConfigFileName      string
-	experiemntsClient      experiments.Client
+	experimentsClient      experiments.Client
 
 	api.UnimplementedIDEServiceServer
 }
@@ -87,7 +87,7 @@ func New(cfg *config.ServiceConfiguration) *IDEServiceServer {
 	s := &IDEServiceServer{
 		config:            cfg,
 		ideConfigFileName: fn,
-		experiemntsClient: experiments.NewClient(),
+		experimentsClient: experiments.NewClient(),
 	}
 	return s
 }
@@ -97,9 +97,37 @@ func (s *IDEServiceServer) register(grpcServer *grpc.Server) {
 }
 
 func (s *IDEServiceServer) GetConfig(ctx context.Context, req *api.GetConfigRequest) (*api.GetConfigResponse, error) {
-	return &api.GetConfigResponse{
-		Content: s.parsedIDEConfigContent,
-	}, nil
+	configCatClient := experiments.NewClient()
+	attributes := experiments.Attributes{
+		UserID:    req.User.Id,
+		UserEmail: req.User.GetEmail(),
+	}
+
+	experimentalIdesEnabled := configCatClient.GetBoolValue(ctx, "experimentalIdes", false, attributes)
+
+	if experimentalIdesEnabled {
+		// We can return everything
+		return &api.GetConfigResponse{
+			Content: s.parsedIDEConfigContent,
+		}, nil
+	} else {
+		for key, ide := range s.ideConfig.IdeOptions.Options {
+			if ide.Experimental && !experimentalIdesEnabled {
+				delete(s.ideConfig.IdeOptions.Options, key)
+			}
+		}
+
+		parsedConfig, err := json.Marshal(s.ideConfig)
+		if err != nil {
+			log.WithError(err).Error("cannot marshal ide config")
+			return nil, err
+		}
+		s.parsedIDEConfigContent = string(parsedConfig)
+
+		return &api.GetConfigResponse{
+			Content: s.parsedIDEConfigContent,
+		}, nil
+	}
 }
 
 func (s *IDEServiceServer) readIDEConfig(ctx context.Context, isInit bool) {

components/server/src/ide-service.ts

@@ -34,10 +34,10 @@ export class IDEService {
 
     private cacheConfig?: IDEConfig;
 
-    async getIDEConfig(): Promise<IDEConfig> {
+    async getIDEConfig(request: { user: { id: string; email?: string } }): Promise<IDEConfig> {
         try {
-            let resp = await this.ideService.getConfig({});
-            let config: IDEConfig = JSON.parse(resp.content);
+            const response = await this.ideService.getConfig(request);
+            const config: IDEConfig = JSON.parse(response.content);
             this.cacheConfig = config;
             return config;
         } catch (e) {

components/server/src/workspace/gitpod-server-impl.ts

@@ -3327,7 +3327,9 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     }
 
     async getIDEOptions(ctx: TraceContext): Promise<IDEOptions> {
-        const ideConfig = await this.ideService.getIDEConfig();
+        const user = this.checkUser("identifyUser");
+        const email = User.getPrimaryEmail(user);
+        const ideConfig = await this.ideService.getIDEConfig({ user: { id: user.id, email } });
         return ideConfig.ideOptions;
     }