Remove extensions mechanism (#5895)

* Remove extensions mechanism.

* Missing change.

Author: arikfr

.circleci/config.yml

@@ -9,10 +9,8 @@ build-docker-image-job: &build-docker-image-job
     - checkout
     - run: sudo apt update
     - run: sudo apt install python3-pip
-    - run: sudo pip3 install -r requirements_bundles.txt
     - run: .circleci/update_version
     - run: sudo npm install --global --force [email protected]
-    - run: yarn bundle
     - run: .circleci/docker_build
 jobs:
   backend-lint:
@@ -83,10 +81,8 @@ jobs:
       - checkout
       - run: sudo apt update
       - run: sudo apt install python3-pip
-      - run: sudo pip3 install -r requirements_bundles.txt
       - run: sudo npm install --global --force [email protected]
       - run: yarn cache clean && yarn --frozen-lockfile --network-concurrency 1
-      - run: yarn bundle
       - run:
           name: Run App Tests
           command: yarn test

Dockerfile

@@ -39,46 +39,46 @@ RUN useradd --create-home redash
 # Ubuntu packages
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
-    curl \
-    gnupg \
-    build-essential \
-    pwgen \
-    libffi-dev \
-    sudo \
-    git-core \
-    # Postgres client
-    libpq-dev \
-    # ODBC support:
-    g++ unixodbc-dev \
-    # for SAML
-    xmlsec1 \
-    # Additional packages required for data sources:
-    libssl-dev \
-    default-libmysqlclient-dev \
-    freetds-dev \
-    libsasl2-dev \
-    unzip \
-    libsasl2-modules-gssapi-mit && \
-    apt-get clean && \
-     rm -rf /var/lib/apt/lists/*
+  curl \
+  gnupg \
+  build-essential \
+  pwgen \
+  libffi-dev \
+  sudo \
+  git-core \
+  # Postgres client
+  libpq-dev \
+  # ODBC support:
+  g++ unixodbc-dev \
+  # for SAML
+  xmlsec1 \
+  # Additional packages required for data sources:
+  libssl-dev \
+  default-libmysqlclient-dev \
+  freetds-dev \
+  libsasl2-dev \
+  unzip \
+  libsasl2-modules-gssapi-mit && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
 
 
 ARG TARGETPLATFORM
 ARG databricks_odbc_driver_url=https://databricks.com/wp-content/uploads/2.6.10.1010-2/SimbaSparkODBC-2.6.10.1010-2-Debian-64bit.zip
 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
-    curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
-    && curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list \
-    && apt-get update \
-    && ACCEPT_EULA=Y apt-get install  -y --no-install-recommends msodbcsql17 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && curl "$databricks_odbc_driver_url" --location --output /tmp/simba_odbc.zip \
-    && chmod 600 /tmp/simba_odbc.zip \
-    && unzip /tmp/simba_odbc.zip -d /tmp/ \
-    && dpkg -i /tmp/SimbaSparkODBC-*/*.deb \
-    && printf "[Simba]\nDriver = /opt/simba/spark/lib/64/libsparkodbc_sb64.so" >> /etc/odbcinst.ini \
-    && rm /tmp/simba_odbc.zip \
-    && rm -rf /tmp/SimbaSparkODBC*; fi
+  curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
+  && curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list \
+  && apt-get update \
+  && ACCEPT_EULA=Y apt-get install  -y --no-install-recommends msodbcsql17 \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* \
+  && curl "$databricks_odbc_driver_url" --location --output /tmp/simba_odbc.zip \
+  && chmod 600 /tmp/simba_odbc.zip \
+  && unzip /tmp/simba_odbc.zip -d /tmp/ \
+  && dpkg -i /tmp/SimbaSparkODBC-*/*.deb \
+  && printf "[Simba]\nDriver = /opt/simba/spark/lib/64/libsparkodbc_sb64.so" >> /etc/odbcinst.ini \
+  && rm /tmp/simba_odbc.zip \
+  && rm -rf /tmp/SimbaSparkODBC*; fi
 
 WORKDIR /app
 
@@ -93,7 +93,7 @@ RUN pip install pip==20.2.4;
 COPY requirements_all_ds.txt ./
 RUN if [ "x$skip_ds_deps" = "x" ] ; then pip install -r requirements_all_ds.txt ; else echo "Skipping pip install -r requirements_all_ds.txt" ; fi
 
-COPY requirements_bundles.txt requirements_dev.txt ./
+COPY requirements_dev.txt ./
 RUN if [ "x$skip_dev_deps" = "x" ] ; then pip install -r requirements_dev.txt ; fi
 
 COPY requirements.txt ./

Makefile

@@ -1,4 +1,4 @@
-.PHONY: compose_build up test_db create_database clean down bundle tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
+.PHONY: compose_build up test_db create_database clean down tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
 
 compose_build:
 	COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose build
@@ -22,9 +22,6 @@ clean:
 down:
 	docker-compose down
 
-bundle:
-	docker-compose run server bin/bundle-extensions
-
 tests:
 	docker-compose run server tests
 
@@ -34,20 +31,19 @@ lint:
 backend-unit-tests: up test_db
 	docker-compose run --rm --name tests server tests
 
-frontend-unit-tests: bundle
+frontend-unit-tests:
 	CYPRESS_INSTALL_BINARY=0 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 yarn --frozen-lockfile
-	yarn bundle
 	yarn test
 
 test: lint backend-unit-tests frontend-unit-tests
 
-build: bundle
+build: 
 	yarn build
 
-watch: bundle
+watch: 
 	yarn watch
 
-start: bundle
+start: 
 	yarn start
 
 redis-cli:

bin/bundle-extensions

@@ -5,7 +5,6 @@
   "main": "index.js",
   "scripts": {
     "start": "npm-run-all --parallel watch:viz webpack-dev-server",
-    "bundle": "bin/bundle-extensions",
     "clean": "rm -rf ./client/dist/",
     "build:viz": "(cd viz-lib && yarn build:babel)",
     "build": "yarn clean && yarn build:viz && NODE_ENV=production webpack",

package.json

@@ -25,7 +25,6 @@ def __init__(self, *args, **kwargs):
 def create_app():
     from . import (
         authentication,
-        extensions,
         handlers,
         limiter,
         mail,
@@ -54,7 +53,6 @@ def create_app():
     limiter.init_app(app)
     handlers.init_app(app)
     configure_webpack(app)
-    extensions.init_app(app)
     users.init_app(app)
     tasks.init_app(app)