From eaeef97f1f6e2fd35dd2c2dbe143530c319f9167 Mon Sep 17 00:00:00 2001
From: Yoona Oh <jyoonaoh@gmail.com>
Date: Mon, 25 Nov 2024 14:10:56 -0800
Subject: [PATCH] [DC] Remove environment from Node and Python FA workflow
 files (#7921)

Co-authored-by: Yoona Oh <yoonaoh@microsoft.com>
---
 .../code/DeploymentCenterCodeSettings.tsx                 | 8 ++++----
 client-react/src/utils/CommonConstants.ts                 | 1 -
 .../2022-10-01/function-app-configs/node-linux.config.yml | 1 -
 .../function-app-configs/node-windows.config.yml          | 1 -
 .../function-app-configs/python-linux.config.yml          | 1 -
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/client-react/src/pages/app/deployment-center/code/DeploymentCenterCodeSettings.tsx b/client-react/src/pages/app/deployment-center/code/DeploymentCenterCodeSettings.tsx
index 8c58c6aef8..2b787da20d 100644
--- a/client-react/src/pages/app/deployment-center/code/DeploymentCenterCodeSettings.tsx
+++ b/client-react/src/pages/app/deployment-center/code/DeploymentCenterCodeSettings.tsx
@@ -78,13 +78,13 @@ const DeploymentCenterCodeSettings: React.FC<DeploymentCenterFieldProps<Deployme
   const [isVstsSetup, setIsVstsSetup] = useState(false);
   const [isTfsOrVsoSetup, setIsTfsOrVsoSetup] = useState(false);
   const [isUsingExistingOrAvailableWorkflowConfig, setIsUsingExistingOrAvailableWorkflowConfig] = useState(false);
-  const [isRemoveEnvEnabled, setIsRemoveEnvEnabled] = useState(false);
+  const [isRemoveEnvWebAppEnabled, setIsRemoveEnvWebAppEnabled] = useState(false);
   useEffect(() => {
     let isSubscribed = true;
 
-    portalContext?.getBooleanFlight(ExperimentationConstants.FlightVariable.removeDeployEnvironment).then(hasFlightEnabled => {
+    portalContext?.getBooleanFlight(ExperimentationConstants.FlightVariable.removeDeployEnvironmentWebApp).then(hasFlightEnabled => {
       if (isSubscribed) {
-        setIsRemoveEnvEnabled(hasFlightEnabled);
+        setIsRemoveEnvWebAppEnabled(hasFlightEnabled);
       }
     });
 
@@ -169,7 +169,7 @@ const DeploymentCenterCodeSettings: React.FC<DeploymentCenterFieldProps<Deployme
       variables['javaContainer'] = formProps.values.javaContainer;
     }
 
-    if (isRemoveEnvEnabled) {
+    if (isRemoveEnvWebAppEnabled) {
       variables['isRemoveEnvEnabled'] = true;
     }
 
diff --git a/client-react/src/utils/CommonConstants.ts b/client-react/src/utils/CommonConstants.ts
index 022eca2c64..e507e1e848 100644
--- a/client-react/src/utils/CommonConstants.ts
+++ b/client-react/src/utils/CommonConstants.ts
@@ -413,7 +413,6 @@ export class ExperimentationConstants {
   };
 
   public static FlightVariable = {
-    removeDeployEnvironment: 'remove-deploy-environment',
     removeDeployEnvironmentWebApp: 'remove-deploy-environment-webapp',
     enableSidecarMigration: 'enable-sidecar-migration',
     showDCReactView: 'show-dc-reactview',
diff --git a/server/src/workflows/2022-10-01/function-app-configs/node-linux.config.yml b/server/src/workflows/2022-10-01/function-app-configs/node-linux.config.yml
index 2aee9228d2..a94a33d792 100644
--- a/server/src/workflows/2022-10-01/function-app-configs/node-linux.config.yml
+++ b/server/src/workflows/2022-10-01/function-app-configs/node-linux.config.yml
@@ -49,7 +49,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
-    __environment__
     __permissions__
     steps:
       - name: Download artifact from build job
diff --git a/server/src/workflows/2022-10-01/function-app-configs/node-windows.config.yml b/server/src/workflows/2022-10-01/function-app-configs/node-windows.config.yml
index 09d17ead5f..c71f57c47a 100644
--- a/server/src/workflows/2022-10-01/function-app-configs/node-windows.config.yml
+++ b/server/src/workflows/2022-10-01/function-app-configs/node-windows.config.yml
@@ -46,7 +46,6 @@ jobs:
   deploy:
     runs-on: windows-latest
     needs: build
-    __environment__
     __permissions__
     steps:
       - name: Download artifact from build job
diff --git a/server/src/workflows/2022-10-01/function-app-configs/python-linux.config.yml b/server/src/workflows/2022-10-01/function-app-configs/python-linux.config.yml
index 30d243e6a3..6352b5f902 100644
--- a/server/src/workflows/2022-10-01/function-app-configs/python-linux.config.yml
+++ b/server/src/workflows/2022-10-01/function-app-configs/python-linux.config.yml
@@ -53,7 +53,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
-    __environment__
     __permissions__
     steps:
       - name: Download artifact from build job