Merge pull request metabase#15194 from metabase/merge-release-x.38.x-…

…2021-03-16

Merge release x.38.x -> master 2021-03-16

.circleci/config.yml

@@ -1220,7 +1220,7 @@ workflows:
           <<: *Matrix
 
       - fe-tests-cypress:
-          name: fe-tests-cypres-mysql-8-<< matrix.edition >>
+          name: fe-tests-cypress-mysql-8-<< matrix.edition >>
           requires:
             - build-uberjar-<< matrix.edition >>
           e: fe-mysql-8

.devcontainer/Dockerfile

@@ -1,4 +1,5 @@
 FROM mcr.microsoft.com/vscode/devcontainers/java:0-8
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-  && apt-get -y install --no-install-recommends leiningen
+RUN apt-key adv --refresh-keys --keyserver keyserver.ubuntu.com\
+  && apt-get update && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get -y install --no-install-recommends leiningen

bin/docker/Dockerfile

@@ -3,14 +3,18 @@ FROM adoptopenjdk/openjdk11:alpine-jre
 ENV FC_LANG en-US LC_CTYPE en_US.UTF-8
 
 # dependencies
-RUN apk -U upgrade && apk add --update --no-cache bash ttf-dejavu fontconfig
+RUN apk -U upgrade &&  \
+    apk add --update --no-cache bash ttf-dejavu fontconfig curl java-cacerts && \
+    mkdir -p /app/certs && \
+    curl https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem -o /app/certs/rds-combined-ca-bundle.pem  && \
+    /opt/java/openjdk/bin/keytool -noprompt -import -trustcacerts -alias aws-rds -file /app/certs/rds-combined-ca-bundle.pem -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit && \
+    curl https://cacerts.digicert.com/DigiCertGlobalRootG2.crt.pem -o /app/certs/DigiCertGlobalRootG2.crt.pem  && \
+    /opt/java/openjdk/bin/keytool -noprompt -import -trustcacerts -alias azure-cert -file /app/certs/DigiCertGlobalRootG2.crt.pem -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit && \
+    mkdir -p /plugins && chmod a+rwx /plugins
 
 # add Metabase jar & add our run script to the image
 COPY ./metabase.jar ./run_metabase.sh /app/
 
-# create the plugins directory, with writable permissions
-RUN mkdir -p /plugins && chmod a+rwx /plugins
-
 # expose our default runtime port
 EXPOSE 3000
 

bin/release/src/release/common.clj

@@ -180,6 +180,7 @@
      (u/step (format "Check whether %s will be the latest version" (version))
        (let [latest-gh-tag (most-recent-tag (recent-tags-from-github))]
          (u/announce "Latest %s version from GitHub is %s" (edition) latest-gh-tag)
-         (let [latest? (version-greater-than (version) latest-gh-tag)]
+         (let [latest? (when-not (pre-release-version?)
+                         (version-greater-than (version) latest-gh-tag))]
            (u/announce "%s %s be the new latest %s version." (version) (if latest? "will" "will NOT") (edition))
            latest?))))))

bin/release/src/release/elastic_beanstalk/launch-aws-eb.html.template

@@ -3,19 +3,19 @@
 <title>Redirecting...</title>
 <link
     rel="canonical"
-    href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl={{url}}&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot"
+    href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&environmentType=LoadBalancing&sourceBundleUrl={{url}}&instanceType=t3a.small"
     />
 <meta
     http-equiv="refresh"
-    content="0; url=https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl={{url}}&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot"
+    content="0; url=https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&environmentType=LoadBalancing&sourceBundleUrl={{url}}&instanceType=t3a.small"
     />
 <h1>Redirecting...</h1>
 <a
-    href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl={{url}}&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot"
+    href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&environmentType=LoadBalancing&sourceBundleUrl={{url}}&instanceType=t3a.small"
     >
 Click here if you are not redirected.
 </a>
 <script>
     location =
-        "https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl={{url}}&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot";
+        "https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&environmentType=LoadBalancing&sourceBundleUrl={{url}}&instanceType=t3a.small";
 </script>

docs/administration-guide/05-setting-permissions.md

@@ -65,7 +65,7 @@ If you select `Limit access` for one of your databases, your view will change to
 
 Data access levels for schemas follows the same pattern as for databases:
 
-- **Unrestricted access:** can all tables in this schema, including any tables that might get added in the future.
+- **Unrestricted access:** can access all tables in this schema, including any tables that might get added in the future.
 - **Limited access:** can only access the tables that you explicitly select.
 - **No access:** can’t access any tables in this schema.
 
@@ -74,7 +74,7 @@ Lastly, data access levels for tables are almost exactly the same as well:
 - **Unrestricted access:** can ask questions about this table and see saved questions and dashboard cards using this table.
 - **No access:** can’t ask questions about this table or see saved questions or dashboard cards using this table.
 
-_Note: you’ll notice that tables don’t have the option for limited access. If need to set column-level or row-level data permissions, check out the [data sandboxing](https://www.metabase.com/docs/latest/enterprise-guide/data-sandboxes.html) feature of the [Enterprise Edition](https://www.metabase.com/enterprise/)._
+_Note: you’ll notice that tables don’t have the option for limited access. If you need to set column-level or row-level data permissions, check out the [data sandboxing](https://www.metabase.com/docs/latest/enterprise-guide/data-sandboxes.html) feature of the [Enterprise Edition](https://www.metabase.com/enterprise/)._
 
 ### A note about Pulses