From 938edd528494babb8508dd34f311396e1869e8fb Mon Sep 17 00:00:00 2001 From: Abhinav Jha Date: Wed, 16 Feb 2022 19:57:58 +0530 Subject: [PATCH] chore: Remove old way of adding feature flags (#11213) * Remove optimizely, as it isn't being used anymore from the frontend codebase * Remove optimizely references form netlify config, vercel config, index.html, docker script, nginx templates and example .env file --- .env.example | 2 - .../templates/nginx-app-http.conf.template | 5 -- .../templates/nginx-app-https.conf.template | 4 -- .../docker/templates/nginx-app.conf.template | 4 -- app/client/jest.config.js | 1 - app/client/netlify.toml | 6 --- app/client/package.json | 1 - app/client/public/index.html | 1 - app/client/src/ce/configs/index.ts | 20 +------ app/client/src/ce/configs/types.ts | 12 ----- app/client/vercel.json | 4 -- app/client/yarn.lock | 53 +------------------ deploy/docker/templates/docker.env.sh | 3 -- .../nginx/nginx-app-http.conf.template.sh | 1 - .../nginx/nginx-app-https.conf.template.sh | 1 - deploy/heroku/default.conf.template | 4 -- deploy/k8s/scripts/nginx-configmap.yaml | 4 -- deploy/template/nginx_app.conf.sh | 9 ---- 18 files changed, 2 insertions(+), 133 deletions(-) diff --git a/.env.example b/.env.example index 56b022b62b..2a18278f83 100644 --- a/.env.example +++ b/.env.example @@ -22,8 +22,6 @@ APPSMITH_SEGMENT_KEY= APPSMITH_RAPID_API_KEY_VALUE= APPSMITH_MARKETPLACE_ENABLED= -# Optimizely -APPSMITH_OPTIMIZELY_KEY= # Algolia Search (Docs) APPSMITH_ALGOLIA_API_ID= diff --git a/app/client/docker/templates/nginx-app-http.conf.template b/app/client/docker/templates/nginx-app-http.conf.template index 71b532c9e9..416dc53bc0 100644 --- a/app/client/docker/templates/nginx-app-http.conf.template +++ b/app/client/docker/templates/nginx-app-http.conf.template @@ -26,7 +26,6 @@ server { sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '${APPSMITH_ALGOLIA_API_KEY}'; @@ -46,10 +45,6 @@ server { sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}'; } - location /f { - proxy_pass https://cdn.optimizely.com/; - } - location /api { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $host; diff --git a/app/client/docker/templates/nginx-app-https.conf.template b/app/client/docker/templates/nginx-app-https.conf.template index a54627465d..272ce0079e 100644 --- a/app/client/docker/templates/nginx-app-https.conf.template +++ b/app/client/docker/templates/nginx-app-https.conf.template @@ -36,7 +36,6 @@ server { sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '${APPSMITH_ALGOLIA_API_KEY}'; @@ -56,9 +55,6 @@ server { sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}'; } - location /f { - proxy_pass https://cdn.optimizely.com/; - } location /api { proxy_set_header X-Forwarded-Proto $scheme; diff --git a/app/client/docker/templates/nginx-app.conf.template b/app/client/docker/templates/nginx-app.conf.template index 3ecd408a6f..cb9fb838b3 100644 --- a/app/client/docker/templates/nginx-app.conf.template +++ b/app/client/docker/templates/nginx-app.conf.template @@ -33,7 +33,6 @@ server { sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '${APPSMITH_ALGOLIA_API_KEY}'; @@ -54,9 +53,6 @@ server { sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}'; } - location /f { - proxy_pass https://cdn.optimizely.com/; - } location /api { proxy_set_header X-Forwarded-Proto $scheme; diff --git a/app/client/jest.config.js b/app/client/jest.config.js index f262c759d7..bae9af532c 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -52,7 +52,6 @@ module.exports = { fusioncharts: { licenseKey: parseConfig("__APPSMITH_FUSIONCHARTS_LICENSE_KEY__"), }, - optimizely: parseConfig("__APPSMITH_OPTIMIZELY_KEY__"), enableMixpanel: parseConfig("__APPSMITH_SEGMENT_KEY__"), algolia: { apiId: parseConfig("__APPSMITH_ALGOLIA_API_ID__"), diff --git a/app/client/netlify.toml b/app/client/netlify.toml index b3a03af061..52d1b5e6cb 100644 --- a/app/client/netlify.toml +++ b/app/client/netlify.toml @@ -2,7 +2,6 @@ [build.environment] REACT_APP_OAUTH2_GOOGLE_CLIENT_ID = "enabled" REACT_APP_OAUTH2_GITHUB_CLIENT_ID = "enabled" - REACT_APP_OPTIMIZELY_KEY = "Jq3K2kVdvuvxecHyHbVYcj" REACT_APP_ALGOLIA_API_ID = "AZ2Z9CJSJ0" REACT_APP_ALGOLIA_API_KEY = "d113611dccb80ac14aaa72a6e3ac6d10" REACT_APP_ALGOLIA_SEARCH_INDEX_NAME = "test_appsmith" @@ -62,11 +61,6 @@ force = true headers = { X-Forwarded-Host = "APP_HOST_PLACEHOLDER", X-Forwarded-Proto = "https" } -[[redirects]] - from = "/f/*" - to = "https://cdn.optimizely.com/:splat" - status = 200 - force = true # This must be the last redirect in the chain because it's a catch-all [[redirects]] diff --git a/app/client/package.json b/app/client/package.json index 8b4184bdd9..5d2961473e 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -20,7 +20,6 @@ "@fusioncharts/powercharts": "^3.16.0", "@github/g-emoji-element": "^1.1.5", "@manaflair/redux-batch": "^1.0.0", - "@optimizely/optimizely-sdk": "^4.8.0", "@sentry/react": "^6.2.4", "@sentry/tracing": "^6.2.4", "@sentry/webpack-plugin": "^1.12.1", diff --git a/app/client/public/index.html b/app/client/public/index.html index 1f59be9ce5..21a9e0d610 100755 --- a/app/client/public/index.html +++ b/app/client/public/index.html @@ -190,7 +190,6 @@ fusioncharts: { licenseKey: parseConfig("__APPSMITH_FUSIONCHARTS_LICENSE_KEY__") }, - optimizely: parseConfig("__APPSMITH_OPTIMIZELY_KEY__"), enableMixpanel: parseConfig("__APPSMITH_SEGMENT_KEY__"), algolia: { apiId: parseConfig("__APPSMITH_ALGOLIA_API_ID__"), diff --git a/app/client/src/ce/configs/index.ts b/app/client/src/ce/configs/index.ts index 7fd3e70a73..6a67ca775f 100644 --- a/app/client/src/ce/configs/index.ts +++ b/app/client/src/ce/configs/index.ts @@ -1,4 +1,4 @@ -import { AppsmithUIConfigs, FeatureFlagConfig } from "./types"; +import { AppsmithUIConfigs } from "./types"; import { Integrations } from "@sentry/tracing"; import * as Sentry from "@sentry/react"; import { createBrowserHistory } from "history"; @@ -25,7 +25,6 @@ export interface INJECTED_CONFIGS { fusioncharts: { licenseKey: string; }; - optimizely: string; enableMixpanel: boolean; google: string; enableTNCPP: boolean; @@ -81,7 +80,6 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => { fusioncharts: { licenseKey: process.env.REACT_APP_FUSIONCHARTS_LICENSE_KEY || "", }, - optimizely: process.env.REACT_APP_OPTIMIZELY_KEY || "", enableMixpanel: process.env.REACT_APP_SEGMENT_KEY ? process.env.REACT_APP_SEGMENT_KEY.length > 0 : false, @@ -131,19 +129,6 @@ const getConfig = (fromENV: string, fromWindow = "") => { export const getAppsmithConfigs = (): AppsmithUIConfigs => { const { APPSMITH_FEATURE_CONFIGS } = window; const ENV_CONFIG = getConfigsFromEnvVars(); - const getFeatureFlags = ( - optimizelyApiKey = "", - ): FeatureFlagConfig | undefined => { - if (optimizelyApiKey.length > 0) { - return { - remoteConfig: { - optimizely: optimizelyApiKey, - }, - default: {}, - }; - } - return; - }; // const sentry = getConfig(ENV_CONFIG.sentry, APPSMITH_FEATURE_CONFIGS.sentry); const sentryDSN = getConfig( @@ -264,9 +249,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => { ENV_CONFIG.enableMixpanel || APPSMITH_FEATURE_CONFIGS.enableMixpanel, cloudHosting: ENV_CONFIG.cloudHosting || APPSMITH_FEATURE_CONFIGS.cloudHosting, - featureFlag: getFeatureFlags( - ENV_CONFIG.optimizely || APPSMITH_FEATURE_CONFIGS.optimizely, - ), logLevel: ENV_CONFIG.logLevel || APPSMITH_FEATURE_CONFIGS.logLevel, enableTNCPP: ENV_CONFIG.enableTNCPP || APPSMITH_FEATURE_CONFIGS.enableTNCPP, appVersion: ENV_CONFIG.appVersion || APPSMITH_FEATURE_CONFIGS.appVersion, diff --git a/app/client/src/ce/configs/types.ts b/app/client/src/ce/configs/types.ts index dd8449cff0..51bf7e7c6a 100644 --- a/app/client/src/ce/configs/types.ts +++ b/app/client/src/ce/configs/types.ts @@ -5,17 +5,6 @@ export type SentryConfig = { environment: string; }; -export enum FeatureFlagsEnum {} - -export type FeatureFlags = Record; - -export type FeatureFlagConfig = { - remoteConfig?: { - optimizely: string; - }; - default: FeatureFlags; -}; - export interface AppsmithUIConfigs { sentry: { enabled: boolean; @@ -62,7 +51,6 @@ export interface AppsmithUIConfigs { cloudHosting: boolean; - featureFlag?: FeatureFlagConfig; logLevel: LogLevelDesc; appVersion: { id: string; diff --git a/app/client/vercel.json b/app/client/vercel.json index 8e7974078a..0f3171a311 100644 --- a/app/client/vercel.json +++ b/app/client/vercel.json @@ -11,10 +11,6 @@ { "source": "/login/:slug*", "destination": "https://release.app.appsmith.com/login/:slug*" - }, - { - "source": "/f/:slug*", - "destination": "https://cdn.optimizely.com/:slug*" } ] } \ No newline at end of file diff --git a/app/client/yarn.lock b/app/client/yarn.lock index c85ec91c14..82cf82f599 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -2317,48 +2317,6 @@ version "1.0.3" resolved "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz" -"@optimizely/js-sdk-datafile-manager@^0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-datafile-manager/-/js-sdk-datafile-manager-0.9.1.tgz#46eef70bf59c93bdba481908994b9cec550d3049" - integrity sha512-AaAu1zPtPY3/qsVp5UwGS77aB8gxyQ1GxvzzOlN/40Y5MbBN8ul2HnUVwl9ZfUlPVunBhe1cw5o1H5/T0IrZYA== - dependencies: - "@optimizely/js-sdk-logging" "^0.3.1" - "@optimizely/js-sdk-utils" "^0.4.0" - decompress-response "^4.2.1" - -"@optimizely/js-sdk-event-processor@^0.9.2": - version "0.9.2" - resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-event-processor/-/js-sdk-event-processor-0.9.2.tgz#900f11703fb55695104bf6952f65978583f58d5b" - integrity sha512-9qkvGlvUYytGtQhJExOcjS0pgd04ABlmbQ/ZOdOEZA0pgtAiCwG+LaDnksQQdqAKgyEm/vc5A2ndXJEVy2nP0A== - dependencies: - "@optimizely/js-sdk-logging" "^0.3.1" - "@optimizely/js-sdk-utils" "^0.4.0" - -"@optimizely/js-sdk-logging@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@optimizely/js-sdk-logging/-/js-sdk-logging-0.3.1.tgz#358b48f4ce2ce22b1969d9e3e929caac1e6e6351" - integrity sha512-K71Jf283FP0E4oXehcXTTM3gvgHZHr7FUrIsw//0mdJlotHJT4Nss4hE0CWPbBxO7LJAtwNnO+VIA/YOcO4vHg== - dependencies: - "@optimizely/js-sdk-utils" "^0.4.0" - -"@optimizely/js-sdk-utils@^0.4.0": - version "0.4.0" - resolved "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz" - dependencies: - uuid "^3.3.2" - -"@optimizely/optimizely-sdk@^4.8.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@optimizely/optimizely-sdk/-/optimizely-sdk-4.8.0.tgz#c29e6840342ca56948656c873660b5dcea06aebe" - integrity sha512-x64O4XJG1Xux7i+sBR0kqpQ17AD9XhQ5rhSl0/pdlIBVSyU/HUXwAuFUv9O1ZgnKw6Am2LsLAEckrbkYt6q00g== - dependencies: - "@optimizely/js-sdk-datafile-manager" "^0.9.1" - "@optimizely/js-sdk-event-processor" "^0.9.2" - "@optimizely/js-sdk-logging" "^0.3.1" - "@optimizely/js-sdk-utils" "^0.4.0" - json-schema "^0.4.0" - murmurhash "0.0.2" - "@pmmmwh/react-refresh-webpack-plugin@0.4.2": version "0.4.2" resolved "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.2.tgz" @@ -6593,7 +6551,7 @@ decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz" -decompress-response@^4.2.0, decompress-response@^4.2.1: +decompress-response@^4.2.0: version "4.2.1" resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz" dependencies: @@ -10512,11 +10470,6 @@ json-schema@0.2.3: version "0.2.3" resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" -json-schema@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" @@ -11731,10 +11684,6 @@ multicast-dns@^6.0.1: dns-packet "^1.3.1" thunky "^1.0.2" -murmurhash@0.0.2: - version "0.0.2" - resolved "https://registry.npmjs.org/murmurhash/-/murmurhash-0.0.2.tgz" - mutationobserver-shim@^0.3.5: version "0.3.7" resolved "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz" diff --git a/deploy/docker/templates/docker.env.sh b/deploy/docker/templates/docker.env.sh index ee9037a40a..ccfe67efb9 100644 --- a/deploy/docker/templates/docker.env.sh +++ b/deploy/docker/templates/docker.env.sh @@ -27,9 +27,6 @@ APPSMITH_SEGMENT_KEY= APPSMITH_RAPID_API_KEY_VALUE= APPSMITH_MARKETPLACE_ENABLED= -# Optimizely -APPSMITH_OPTIMIZELY_KEY= - # Algolia Search (Docs) APPSMITH_ALGOLIA_API_ID= APPSMITH_ALGOLIA_API_KEY= diff --git a/deploy/docker/templates/nginx/nginx-app-http.conf.template.sh b/deploy/docker/templates/nginx/nginx-app-http.conf.template.sh index adb2c256f3..013a8e05e1 100644 --- a/deploy/docker/templates/nginx/nginx-app-http.conf.template.sh +++ b/deploy/docker/templates/nginx/nginx-app-http.conf.template.sh @@ -41,7 +41,6 @@ server { sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '\${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '\${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '\${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '\${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '\${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '\${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '\${APPSMITH_ALGOLIA_API_KEY}'; diff --git a/deploy/docker/templates/nginx/nginx-app-https.conf.template.sh b/deploy/docker/templates/nginx/nginx-app-https.conf.template.sh index 6cc2e9f6e1..2ded828679 100644 --- a/deploy/docker/templates/nginx/nginx-app-https.conf.template.sh +++ b/deploy/docker/templates/nginx/nginx-app-https.conf.template.sh @@ -61,7 +61,6 @@ server { sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '\${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '\${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '\${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '\${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '\${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '\${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '\${APPSMITH_ALGOLIA_API_KEY}'; diff --git a/deploy/heroku/default.conf.template b/deploy/heroku/default.conf.template index 0519516293..31186289cd 100644 --- a/deploy/heroku/default.conf.template +++ b/deploy/heroku/default.conf.template @@ -20,7 +20,6 @@ server { sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '${APPSMITH_ALGOLIA_API_KEY}'; @@ -38,9 +37,6 @@ server { sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM}'; } - location /f { - proxy_pass https://cdn.optimizely.com/; - } location /api { proxy_pass http://localhost:8080; diff --git a/deploy/k8s/scripts/nginx-configmap.yaml b/deploy/k8s/scripts/nginx-configmap.yaml index c3be3fff30..b671c7cbde 100644 --- a/deploy/k8s/scripts/nginx-configmap.yaml +++ b/deploy/k8s/scripts/nginx-configmap.yaml @@ -29,7 +29,6 @@ data: sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '${APPSMITH_ALGOLIA_API_KEY}'; @@ -48,7 +47,4 @@ data: sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM}'; } - location /f { - proxy_pass https://cdn.optimizely.com/; - } }" diff --git a/deploy/template/nginx_app.conf.sh b/deploy/template/nginx_app.conf.sh index 5dd1dbb0c4..50440ae702 100644 --- a/deploy/template/nginx_app.conf.sh +++ b/deploy/template/nginx_app.conf.sh @@ -42,7 +42,6 @@ $NGINX_SSL_CMNT server_name $custom_domain ; sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '\${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '\${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '\${APPSMITH_SEGMENT_KEY}'; - sub_filter __APPSMITH_OPTIMIZELY_KEY__ '\${APPSMITH_OPTIMIZELY_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '\${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '\${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; sub_filter __APPSMITH_ALGOLIA_API_KEY__ '\${APPSMITH_ALGOLIA_API_KEY}'; @@ -60,9 +59,6 @@ $NGINX_SSL_CMNT server_name $custom_domain ; sub_filter __APPSMITH_DISABLE_INTERCOM__ '\${APPSMITH_DISABLE_INTERCOM}'; } - location /f { - proxy_pass https://cdn.optimizely.com/; - } location /api { proxy_pass http://appsmith-internal-server:8080; @@ -103,7 +99,6 @@ $NGINX_SSL_CMNT sub_filter __APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__ '\${APPSM $NGINX_SSL_CMNT sub_filter __APPSMITH_OAUTH2_GITHUB_CLIENT_ID__ '\${APPSMITH_OAUTH2_GITHUB_CLIENT_ID}'; $NGINX_SSL_CMNT sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '\${APPSMITH_MARKETPLACE_ENABLED}'; $NGINX_SSL_CMNT sub_filter __APPSMITH_SEGMENT_KEY__ '\${APPSMITH_SEGMENT_KEY}'; -$NGINX_SSL_CMNT sub_filter __APPSMITH_OPTIMIZELY_KEY__ '\${APPSMITH_OPTIMIZELY_KEY}'; $NGINX_SSL_CMNT sub_filter __APPSMITH_ALGOLIA_API_ID__ '\${APPSMITH_ALGOLIA_API_ID}'; $NGINX_SSL_CMNT sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '\${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; $NGINX_SSL_CMNT sub_filter __APPSMITH_ALGOLIA_API_KEY__ '\${APPSMITH_ALGOLIA_API_KEY}'; @@ -121,10 +116,6 @@ $NGINX_SSL_CMNT sub_filter __APPSMITH_RECAPTCHA_ENABLED__ '\${APPSMITH_RE $NGINX_SSL_CMNT sub_filter __APPSMITH_DISABLE_INTERCOM__ '\${APPSMITH_DISABLE_INTERCOM}'; $NGINX_SSL_CMNT } $NGINX_SSL_CMNT -$NGINX_SSL_CMNT location /f { -$NGINX_SSL_CMNT proxy_pass https://cdn.optimizely.com/; -$NGINX_SSL_CMNT } -$NGINX_SSL_CMNT $NGINX_SSL_CMNT location /api { $NGINX_SSL_CMNT proxy_pass http://appsmith-internal-server:8080; $NGINX_SSL_CMNT }