No longer gate using the streaming orchestrator via a feature flag

rust-lang · Oct 20, 2023 · 6059123 · 6059123
1 parent 2b4ffe1
commit 6059123
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -249,16 +249,6 @@ jobs:
         killall -q ui || true
         chmod +x ./server/ui && ./server/ui &
         bundle exec rspec
-    - name: Run tests with feature flags
-      env:
-        PLAYGROUND_UI_ROOT: server/build/
-        PLAYGROUND_CORS_ENABLED: true
-        PLAYGROUND_GITHUB_TOKEN: "${{ secrets.PLAYGROUND_GITHUB_TOKEN }}"
-        PLAYGROUND_EXECUTE_VIA_WEBSOCKET_THRESHOLD: 1.0
-      run: |-
-        killall -q ui || true
-        chmod +x ./server/ui && ./server/ui &
-        bundle exec rspec
     - name: Preserve screenshots
       if: "${{ failure() }}"
       uses: actions/upload-artifact@v3

diff --git a/ci/workflows.yml b/ci/workflows.yml
@@ -357,17 +357,6 @@ workflows:
               chmod +x ./server/ui && ./server/ui &
               bundle exec rspec
 
-          - name: "Run tests with feature flags"
-            env:
-              PLAYGROUND_UI_ROOT: server/build/
-              PLAYGROUND_CORS_ENABLED: true
-              PLAYGROUND_GITHUB_TOKEN: ${{ secrets.PLAYGROUND_GITHUB_TOKEN }}
-              PLAYGROUND_EXECUTE_VIA_WEBSOCKET_THRESHOLD: 1.0
-            run: |-
-              killall -q ui || true
-              chmod +x ./server/ui && ./server/ui &
-              bundle exec rspec
-
           - name: "Preserve screenshots"
             if: ${{ failure() }}
             uses: actions/upload-artifact@v3

diff --git a/ui/frontend/reducers/featureFlags.ts b/ui/frontend/reducers/featureFlags.ts
@@ -6,7 +6,6 @@ import { createWebsocketResponse } from '../websocketActions';
 interface State {
   forced: boolean;
   showGemThreshold: number;
-  executeViaWebsocketThreshold: number;
 }
 
 const ENABLED = 1.0;
@@ -15,14 +14,12 @@ const DISABLED = -1.0;
 const initialState: State = {
   forced: false,
   showGemThreshold: DISABLED,
-  executeViaWebsocketThreshold: DISABLED,
 };
 
 const { action: wsFeatureFlags, schema: wsFeatureFlagsSchema } = createWebsocketResponse(
   'featureFlags',
   z.object({
     showGemThreshold: z.number().nullish(),
-    executeViaWebsocketThreshold: z.number().nullish(),
   }),
 );
 
@@ -33,12 +30,10 @@ const slice = createSlice({
     forceEnableAll: (state) => {
       state.forced = true;
       state.showGemThreshold = ENABLED;
-      state.executeViaWebsocketThreshold = ENABLED;
     },
     forceDisableAll: (state) => {
       state.forced = true;
       state.showGemThreshold = DISABLED;
-      state.executeViaWebsocketThreshold = DISABLED;
     },
   },
   extraReducers: (builder) => {
@@ -47,15 +42,11 @@ const slice = createSlice({
         return;
       }
 
-      const { showGemThreshold, executeViaWebsocketThreshold } = action.payload;
+      const { showGemThreshold } = action.payload;
 
       if (showGemThreshold) {
         state.showGemThreshold = showGemThreshold;
       }
-
-      if (executeViaWebsocketThreshold) {
-        state.executeViaWebsocketThreshold = executeViaWebsocketThreshold;
-      }
     });
   },
 });

diff --git a/ui/frontend/selectors/index.ts b/ui/frontend/selectors/index.ts
@@ -353,18 +353,13 @@ const websocket = (state: State) => state.websocket;
 const clientFeatureFlagThreshold = createSelector(client, (c) => c.featureFlagThreshold);
 
 const showGemThreshold = createSelector(featureFlags, ff => ff.showGemThreshold);
-const executeViaWebsocketThreshold = createSelector(featureFlags, ff => ff.executeViaWebsocketThreshold);
 
 const createFeatureFlagSelector = (ff: (state: State) => number) =>
   createSelector(clientFeatureFlagThreshold, ff, (c, ff) => c <= ff);
 
 export const showGemSelector = createFeatureFlagSelector(showGemThreshold);
-const wsFeatureEnabled = createFeatureFlagSelector(executeViaWebsocketThreshold);
-export const executeViaWebsocketSelector = createSelector(
-  websocket,
-  wsFeatureEnabled,
-  (ws, enabled) => ws.connected && enabled,
-);
+
+export const executeViaWebsocketSelector = createSelector(websocket, (ws) => ws.connected);
 
 export type WebSocketStatus =
   { state: 'disconnected' } |

diff --git a/ui/src/main.rs b/ui/src/main.rs
@@ -36,9 +36,7 @@ fn main() {
 }
 
 #[derive(Copy, Clone)]
-pub(crate) struct FeatureFlags {
-    execute_via_websocket_threshold: Option<f64>,
-}
+pub(crate) struct FeatureFlags {}
 
 struct Config {
     address: String,
@@ -99,14 +97,7 @@ impl Config {
 
         let cors_enabled = env::var_os("PLAYGROUND_CORS_ENABLED").is_some();
 
-        let execute_via_websocket_threshold =
-            env::var("PLAYGROUND_EXECUTE_VIA_WEBSOCKET_THRESHOLD")
-                .ok()
-                .and_then(|v| v.parse().ok());
-
-        let feature_flags = FeatureFlags {
-            execute_via_websocket_threshold,
-        };
+        let feature_flags = FeatureFlags {};
 
         Self {
             address,

diff --git a/ui/src/server_axum/websocket.rs b/ui/src/server_axum/websocket.rs
@@ -136,15 +136,11 @@ struct WSError {
 
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct FeatureFlags {
-    execute_via_websocket_threshold: Option<f64>,
-}
+pub(crate) struct FeatureFlags {}
 
 impl From<crate::FeatureFlags> for FeatureFlags {
-    fn from(value: crate::FeatureFlags) -> Self {
-        Self {
-            execute_via_websocket_threshold: value.execute_via_websocket_threshold,
-        }
+    fn from(_value: crate::FeatureFlags) -> Self {
+        Self {}
     }
 }