Merge pull request #50 from CybercentreCanada/feature/cccs-main-cccs-…

…1.2-update

Feature/cccs main cccs 1.2 update

RESOURCES/FEATURE_FLAGS.md

@@ -33,6 +33,7 @@ These features are considered **unfinished** and should only be used on developm
 - REMOVE_SLICE_LEVEL_LABEL_COLORS
 - SHARE_QUERIES_VIA_KV_STORE
 - TAGGING_SYSTEM
+- ENABLE_TEMPLATE_REMOVE_FILTERS
 
 ## In Testing
 These features are **finished** but currently being tested. They are usable, but may still contain some bugs.

UPDATING.md

@@ -22,25 +22,24 @@ under the License.
 This file documents any backwards-incompatible changes in Superset and
 assists people when migrating to a new version.
 
-## Next
-- [13772](https://github.com/apache/superset/pull/13772): Row level security (RLS) is now enabled by default. To activate the feature, please run `superset init` to expose the RLS menus to Admin users.
-
-- [13980](https://github.com/apache/superset/pull/13980): Data health checks no longer use the metadata database as an interim cache. Though non-breaking, deployments which implement complex logic should likely memoize the callback function. Refer to documentation in the confg.py file for more detail.
+## 1.2.0
 
-- [14255](https://github.com/apache/superset/pull/14255): The default `CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC` callable logic has been updated to leverage the specified database and schema to ensure the upload S3 key prefix is unique. Previously tables generated via upload from CSV with the same name but differ schema and/or cluster would use the same S3 key prefix. Note this change does not impact previously imported tables.
-
-### Breaking Changes
-### Potential Downtime
 ### Deprecations
+
 - [13440](https://github.com/apache/superset/pull/13440): Dashboard/Charts reports and old Alerts is deprecated. The following config keys are deprecated:
     - ENABLE_ALERTS
     - SCHEDULED_EMAIL_DEBUG_MODE
     - EMAIL_REPORTS_CRON_RESOLUTION
     - EMAIL_ASYNC_TIME_LIMIT_SEC
     - EMAIL_REPORT_BCC_ADDRESS
     - EMAIL_REPORTS_USER
+
 ### Other
 
+- [13772](https://github.com/apache/superset/pull/13772): Row level security (RLS) is now enabled by default. To activate the feature, please run `superset init` to expose the RLS menus to Admin users.
+- [13980](https://github.com/apache/superset/pull/13980): Data health checks no longer use the metadata database as an interim cache. Though non-breaking, deployments which implement complex logic should likely memoize the callback function. Refer to documentation in the confg.py file for more detail.
+- [14255](https://github.com/apache/superset/pull/14255): The default `CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC` callable logic has been updated to leverage the specified database and schema to ensure the upload S3 key prefix is unique. Previously tables generated via upload from CSV with the same name but differ schema and/or cluster would use the same S3 key prefix. Note this change does not impact previously imported tables.
+
 ## 1.1.0
 
 ### Breaking Changes

cccs-build/superset-base/azure-pipelines.yml

@@ -0,0 +1,38 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - cccs-*
+      - feature/CLDN-*
+  paths:
+    include:
+      - '*'
+    exclude:
+      - cccs-build/superset
+
+variables:
+  containerRegistry: uchimera
+  imageRepository: cccs/superset-base
+  dockerfile: $(Build.SourcesDirectory)/Dockerfile
+  buildTimestamp: $[format('{0:yyyyMMddHHmmss}', pipeline.startTime)]
+  DOCKER_BUILDKIT: 1
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+  - bash: |
+      BRANCH_NAME=$(echo "$SYSTEM_PULLREQUEST_SOURCEBRANCH $BUILD_SOURCEBRANCH" | sed -r 's/^\s*(refs\/heads\/)?(\S*).*$/\2/' | sed 's/\//_/g')
+      echo "##vso[task.setvariable variable=BRANCH_NAME]$BRANCH_NAME"
+    displayName: Parse Source Control Branch Name
+
+  - task: Docker@2
+    displayName: Build and push an image to container registry
+    inputs:
+      command: buildAndPush
+      containerRegistry: $(containerRegistry)
+      repository: $(imageRepository)
+      dockerfile: $(dockerfile)
+      tags: |
+        $(BRANCH_NAME)
+        $(BRANCH_NAME)_$(buildTimestamp)_b$(Build.BuildId)

cccs-build/superset/Dockerfile

@@ -0,0 +1,12 @@
+FROM uchimera.azurecr.io/cccs/superset-base:cccs-1.2_20210817193416_b1800
+
+USER root
+
+COPY requirements.txt /tmp
+
+ARG BUILD_NUMBER=0-development
+RUN sed -i '/^VERSION_SHA_LENGTH = .*/i # CCCS Superset Azure pipeline injection\nBUILD_NUMBER = '${BUILD_NUMBER}'\n' /app/superset/config.py \
+  && pip install --no-cache-dir -r /tmp/requirements.txt \
+  && rm /tmp/requirements.txt
+
+USER superset

cccs-build/superset/azure-pipelines.yml

@@ -0,0 +1,57 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - cccs-*
+      - feature/CLDN-*
+  paths:
+    include:
+      - cccs-build/superset
+
+variables:
+  containerRegistry: uchimera
+  imageRepository: cccs/superset
+  dockerfile: $(Build.SourcesDirectory)/cccs-build/superset/Dockerfile
+  buildTimestamp: $[format('{0:yyyyMMddHHmmss}', pipeline.startTime)]
+  DOCKER_BUILDKIT: 1
+
+steps:
+  - bash: |
+      BRANCH_NAME=$(echo "$SYSTEM_PULLREQUEST_SOURCEBRANCH $BUILD_SOURCEBRANCH" | sed -r 's/^\s*(refs\/heads\/)?(\S*).*$/\2/' | sed 's/\//_/g')
+      echo "##vso[task.setvariable variable=BRANCH_NAME]$BRANCH_NAME"
+    displayName: Parse Source Control Branch Name
+
+  - task: Docker@2
+    displayName: Login to $(containerRegistry)
+    inputs:
+      command: login
+      containerRegistry: $(containerRegistry)
+
+  - task: Docker@2
+    displayName: Build the image
+    inputs:
+      command: build
+      containerRegistry: $(containerRegistry)
+      repository: $(imageRepository)
+      dockerfile: $(dockerfile)
+      arguments: --build-arg BUILD_NUMBER=$(Build.BuildNumber)
+      tags: |
+        $(BRANCH_NAME)
+        $(BRANCH_NAME)_$(buildTimestamp)_b$(Build.BuildId)
+
+  - task: Docker@2
+    displayName: Push the image to $(containerRegistry)
+    inputs:
+      command: push
+      containerRegistry: $(containerRegistry)
+      repository: $(imageRepository)
+      tags: |
+        $(BRANCH_NAME)
+        $(BRANCH_NAME)_$(buildTimestamp)_b$(Build.BuildId)
+
+  - task: Docker@2
+    displayName: Logout of $(containerRegistry)
+    inputs:
+      command: logout
+      containerRegistry: $(containerRegistry)
+    condition: always()

cccs-build/superset/requirements.txt

@@ -0,0 +1,10 @@
+# Required for OAuth
+authlib==0.15.4
+
+# Required for our custom logger
+python-json-logger==2.0.2
+
+# Additional drivers for Superset (or SQLAlchemy) to use
+sqlalchemy-trino==0.3.0
+mysql-connector-python==8.0.26
+elasticsearch-dbapi==0.2.4

requirements/local.txt

@@ -274,5 +274,3 @@
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
 
-elasticsearch-dbapi
-sqlalchemy-trino