M23 rebase

.circleci/config.yml

@@ -61,42 +61,18 @@ jobs:
     steps:
       - checkout
       - run: sudo apt install python-pip
-      - run: sudo pip install -r requirements_bundles.txt
+      - run: sudo pip install -r requirements_bundles.txt -r requirements.txt
       - run: npm install
       - run: npm run bundle
       - run: npm test
       - run: npm run lint
-  frontend-e2e-tests:
-    environment:
-      COMPOSE_FILE: .circleci/docker-compose.cypress.yml
-      COMPOSE_PROJECT_NAME: cypress
-      PERCY_TOKEN_ENCODED: ZGRiY2ZmZDQ0OTdjMzM5ZWE0ZGQzNTZiOWNkMDRjOTk4Zjg0ZjMxMWRmMDZiM2RjOTYxNDZhOGExMjI4ZDE3MA==
-      CYPRESS_PROJECT_ID_ENCODED: OTI0Y2th
-      CYPRESS_RECORD_KEY_ENCODED: YzA1OTIxMTUtYTA1Yy00NzQ2LWEyMDMtZmZjMDgwZGI2ODgx
-    docker:
-      - image: circleci/node:8
-    steps:
-      - setup_remote_docker
-      - checkout
-      - run:
-          name: Install npm dependencies
-          command: |
-            npm install
-      - run:
-          name: Setup Redash server
-          command: |
-            npm run cypress start
-            docker-compose run cypress npm run cypress db-seed
-      - run:
-          name: Execute Cypress tests
-          command: npm run cypress run-ci
   build-tarball:
     docker:
       - image: circleci/node:8
     steps:
       - checkout
       - run: sudo apt install python-pip
-      - run: sudo pip install -r requirements_bundles.txt
+      - run: sudo pip install -r requirements_bundles.txt  -r requirements.txt
       - run: npm install
       - run: .circleci/update_version
       - run: npm run bundle
@@ -107,47 +83,90 @@ jobs:
           path: /tmp/artifacts/
   build-docker-image:
     docker:
-      - image: circleci/node:8
+      - image: circleci/buildpack-deps:xenial
     steps:
       - setup_remote_docker
       - checkout
-      - run: sudo apt install python-pip
-      - run: sudo pip install -r requirements_bundles.txt
-      - run: .circleci/update_version
+      - run: sudo apt install python-pip npm
+      - run: sudo pip install -r requirements_bundles.txt  -r requirements.txt
+      - run: .circleci/update_version "master"
       - run: npm run bundle
-      - run: .circleci/docker_build
+      - run: .circleci/docker_build "master"
+  build-docker-image-rc:
+    docker:
+      - image: circleci/buildpack-deps:xenial
+    steps:
+      - setup_remote_docker
+      - checkout
+      - run: sudo apt install python-pip npm
+      - run: sudo pip install -r requirements_bundles.txt  -r requirements.txt
+      - run: .circleci/update_version "rc"
+      - run: npm run bundle
+      - run: .circleci/docker_build "rc"
+  build-docker-image-tag:
+    docker:
+      - image: circleci/buildpack-deps:xenial
+    steps:
+      - setup_remote_docker
+      - checkout
+      - run: sudo apt install python-pip npm
+      - run: sudo pip install -r requirements_bundles.txt  -r requirements.txt
+      - run: .circleci/update_version "$CIRCLE_TAG"
+      - run: npm run bundle
+      - run: .circleci/docker_build "$CIRCLE_TAG"
+      # Create alias from tag to "latest":
+      - run: docker tag $DOCKERHUB_REPO:$CIRCLE_TAG $DOCKERHUB_REPO:latest
+      - run: docker push $DOCKERHUB_REPO:latest
 workflows:
   version: 2
   build:
     jobs:
       - python-flake8-tests
       - legacy-python-flake8-tests
-      - backend-unit-tests
-      - frontend-lint
+      - backend-unit-tests:
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
+      - frontend-lint:
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
       - frontend-unit-tests:
           requires:
             - frontend-lint
-      - frontend-e2e-tests:
-          requires:
-            - frontend-lint
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
       - build-tarball:
           requires:
             - backend-unit-tests
             - frontend-unit-tests
-            - frontend-e2e-tests
           filters:
             branches:
               only:
                 - master
-                - /release\/.*/
       - build-docker-image:
           requires:
             - backend-unit-tests
             - frontend-unit-tests
-            - frontend-e2e-tests
           filters:
             branches:
               only:
                 - master
-                - preview-image
-                - /release\/.*/
+      - build-docker-image-rc:
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+          filters:
+            branches:
+              only:
+                - release
+      - build-docker-image-tag:
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/

.circleci/docker_build

@@ -1,17 +1,9 @@
 #!/bin/bash
-VERSION=$(jq -r .version package.json)
-VERSION_TAG=$VERSION.b$CIRCLE_BUILD_NUM
+VERSION_TAG="$1"
 
 docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-if [ $CIRCLE_BRANCH = master ] || [ $CIRCLE_BRANCH = preview-image ]
-then
-    docker build -t redash/redash:preview -t redash/preview:$VERSION_TAG .
-    docker push redash/redash:preview
-    docker push redash/preview:$VERSION_TAG
-else
-    docker build -t redash/redash:$VERSION_TAG .
-    docker push redash/redash:$VERSION_TAG
-fi
+docker build -t $DOCKERHUB_REPO:$VERSION_TAG .
+docker push $DOCKERHUB_REPO:$VERSION_TAG
 
 echo "Built: $VERSION_TAG"

.circleci/update_version

@@ -1,6 +1,9 @@
 #!/bin/bash
+MOZILLA_VERSION="$1"
+bin/dockerflow-version "$MOZILLA_VERSION"
+
 VERSION=$(jq -r .version package.json)
-FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
+FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM-$MOZILLA_VERSION
 
 sed -ri "s/^__version__ = '([A-Za-z0-9.-]*)'/__version__ = '$FULL_VERSION'/" redash/__init__.py
 sed -i "s/dev/$CIRCLE_SHA1/" client/app/version.json

bin/bundle-extensions

@@ -68,7 +68,7 @@ def load_bundles():
         setup(
             # ...
             entry_points={
-                "redash.bundles": [
+                "redash.extensions": [
                     "wide_footer = my_extensions.wide_footer",
                 ]
                 # ...
@@ -78,7 +78,7 @@ def load_bundles():
 
     """
     bundles = odict()
-    for entry_point in entry_points().get("redash.bundles", []):
+    for entry_point in entry_points().get("redash.extensions", []):
         logger.info('Loading Redash bundle "%s".', entry_point.name)
         module = entry_point_module(entry_point)
         # Try to get a list of bundle files

bin/docker-entrypoint

@@ -2,6 +2,7 @@
 set -e
 
 worker() {
+  /app/manage.py db upgrade
   WORKERS_COUNT=${WORKERS_COUNT:-2}
   QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
   WORKER_EXTRA_OPTIONS=${WORKER_EXTRA_OPTIONS:-}
@@ -11,6 +12,7 @@ worker() {
 }
 
 scheduler() {
+  /app/manage.py db upgrade
   WORKERS_COUNT=${WORKERS_COUNT:-1}
   QUEUES=${QUEUES:-celery}
   SCHEDULE_DB=${SCHEDULE_DB:-celerybeat-schedule}
@@ -21,6 +23,7 @@ scheduler() {
 }
 
 server() {
+  /app/manage.py db upgrade
   exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app
 }
 

bin/dockerflow-version

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -eo pipefail
+
+VERSION="$1"
+
+printf '{"commit":"%s","version":"%s","source":"https://github.com/%s/%s","build":"%s"}\n' \
+  "$CIRCLE_SHA1" \
+  "$VERSION" \
+  "$CIRCLE_PROJECT_USERNAME" \
+  "$CIRCLE_PROJECT_REPONAME" \
+  "$CIRCLE_BUILD_URL" \
+> version.json

bin/migrations-graph

@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+"""
+A quick helper script to print the Alembic migration history
+via Graphiz and show it via GraphvizOnline on
+https://dreampuf.github.io/GraphvizOnline/.
+
+This requires the Graphviz Python library:
+
+   $ pip install --user graphviz
+
+Then run it with the path to the Alembic config file:
+
+   $ migrations-graph --config migrations/alembic.ini
+
+"""
+import os
+import sys
+import urllib
+
+import click
+from alembic import util
+from alembic.script import ScriptDirectory
+from alembic.config import Config
+from alembic.util import CommandError
+from graphviz import Digraph
+
+# Make sure redash can be imported in the migration files
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+
+
+def get_revisions(config, rev_range=None):
+    script = ScriptDirectory.from_config(config)
+
+    if rev_range is not None:
+        if ":" not in rev_range:
+            raise util.CommandError(
+                "History range requires [start]:[end], [start]:, or :[end]"
+            )
+        base, head = rev_range.strip().split(":")
+    else:
+        base = head = None
+
+    return script.walk_revisions(base=base or "base", head=head or "heads")
+
+
+def generate_revision_graph(revisions):
+    dot = Digraph()
+    for revision in revisions:
+        dot.node(revision.revision)
+        if revision.down_revision is None:
+            dot.edge("base", revision.revision)
+            continue
+        if isinstance(revision.down_revision, basestring):
+            dot.edge(revision.down_revision, revision.revision)
+            continue
+        for down_revision in revision.down_revision:
+            dot.edge(down_revision, revision.revision)
+    return dot
+
+
+@click.command()
+@click.option("--config", default="alembic.ini", help="path to alembic config file")
+@click.option("--name", default="alembic", help="name of the alembic ini section")
+def cli(config, name):
+    """
+    Generates a simple Graphviz dot file and creates a link to
+    view it online via https://dreampuf.github.io/GraphvizOnline/.
+    """
+    alembic_config = Config(file_=config, ini_section=name)
+    try:
+        revisions = get_revisions(alembic_config)
+    except CommandError as e:
+        sys.exit(e)
+
+    dot = generate_revision_graph(revisions)
+    encoded_dot = urllib.quote(str(dot.source))
+    viz_url = "https://dreampuf.github.io/GraphvizOnline/#%s" % encoded_dot
+    data = urllib.urlencode({"url": viz_url})
+    try:
+        url = urllib.urlopen("https://git.io/", data).headers["location"]
+    except KeyError:
+        sys.exit("Must be a github.com URL.")
+    print("Generated graph for migration history in %s: %s " % (config, url))
+
+
+if __name__ == "__main__":
+    cli()

client/app/assets/less/ant.less

@@ -14,6 +14,7 @@
 @import '~antd/lib/radio/style/index';
 @import '~antd/lib/time-picker/style/index';
 @import '~antd/lib/pagination/style/index';
+@import '~antd/lib/drawer/style/index';
 @import '~antd/lib/table/style/index';
 @import '~antd/lib/popover/style/index';
 @import '~antd/lib/icon/style/index';

client/app/assets/less/inc/schema-browser.less

@@ -7,14 +7,14 @@ div.table-name {
   border-radius: @redash-radius;
   position: relative;
 
-  .copy-to-editor {
+  .copy-to-editor, .info {
     display: none;
   }
 
   &:hover {
     background: fade(@redash-gray, 10%);
 
-    .copy-to-editor {
+    .copy-to-editor, .info {
       display: flex;
     }
   }
@@ -36,7 +36,7 @@ div.table-name {
     background: transparent;
   }
 
-  .copy-to-editor {
+  .copy-to-editor, .info {
     color: fade(@redash-gray, 90%);
     cursor: pointer;
     position: absolute;
@@ -49,21 +49,25 @@ div.table-name {
     justify-content: center;
   }
 
+  .info {
+    right: 20px
+  }
+
   .table-open {
     padding: 0 22px 0 26px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     position: relative;
 
-    .copy-to-editor {
+    .copy-to-editor, .info {
       display: none;
     }
 
     &:hover {
       background: fade(@redash-gray, 10%);
 
-      .copy-to-editor {
+      .copy-to-editor, .info {
         display: flex;
       }
     }