Merge branch 'main' into ol-facets/PR2-read-data-from-views

CHANGELOG.md

@@ -9,6 +9,8 @@
     * Performance improvement storing and querying facets.
     * Migration procedure requires manual steps if database has more than 100K lineage events.
     * We highly encourage users to review our [migration plan](https://github.com/MarquezProject/marquez/blob/main/api/src/main/resources/marquez/db/migration/V57__readme.md).
+* Additions to seed data for column-lineage [`#2381`](https://github.com/MarquezProject/marquez/pull/2381) [@rossturk](https://github.com/rossturk)
+* Added new `docker/down.sh` script that makes it easier to stop local deployment when run detached [`#2380`](https://github.com/MarquezProject/marquez/pull/2380) [@rossturk](https://github.com/rossturk)
 
 ## [0.29.0](https://github.com/MarquezProject/marquez/compare/0.28.0...0.29.0) - 2022-12-19
 
@@ -905,4 +907,4 @@
 
 ----
 SPDX-License-Identifier: Apache-2.0 
-Copyright 2018-2023 contributors to the Marquez project.
+Copyright 2018-2023 contributors to the Marquez project.

api/build.gradle

@@ -24,7 +24,7 @@ ext {
     jdbi3Version = '3.36.0'
     prometheusVersion = '0.16.0'
     testcontainersVersion = '1.17.6'
-    sentryVersion = '6.11.0'
+    sentryVersion = '6.13.0'
 }
 
 dependencies {

build.gradle

@@ -21,7 +21,7 @@ buildscript {
     dependencies {
         classpath 'com.adarshr:gradle-test-logger-plugin:3.2.0'
         classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.12.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.14.0'
     }
 }
 
@@ -54,12 +54,12 @@ subprojects {
     }
 
     ext {
-        assertjVersion = '3.24.1'
+        assertjVersion = '3.24.2'
         dropwizardVersion = '2.1.4'
         jacocoVersion = '0.8.8'
         junit5Version = '5.9.2'
         lombokVersion = '1.18.24'
-        mockitoVersion = '5.0.0'
+        mockitoVersion = '5.1.0'
         openlineageVersion = '0.18.0'
         slf4jVersion = '1.7.36'
         postgresqlVersion = '42.5.1'
@@ -107,7 +107,7 @@ subprojects {
 
     pmd {
         consoleOutput = true
-        toolVersion = "6.53.0"
+        toolVersion = "6.54.0"
         rulesMinimumPriority = 5
         ruleSetFiles = rootProject.files("pmd-marquez.xml")
         ruleSets = []

chart/templates/marquez/deployment.yaml

@@ -34,12 +34,14 @@ spec:
             - /bin/bash
           args:
             - -ec
-            - until pg_isready -h ${POSTGRES_HOST} -p ${POSTGRES_PORT}; do echo waiting for database; sleep 2; done;
+            - until pg_isready -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USER}; do echo waiting for database; sleep 2; done;
           env:
             - name: POSTGRES_HOST
               value: {{ include "marquez.database.host" . | quote }}
             - name: POSTGRES_PORT
               value: {{ include "marquez.database.port" . | quote }}
+            - name: POSTGRES_USER
+              value: {{ include "marquez.database.user" . | quote }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}

chart/values.yaml

@@ -107,7 +107,7 @@ postgresql:
   ## @param image.tag PostgreSQL image tag (immutable tags are recommended)
   ##
   image:
-    tag: 0.29.0
+    tag: 12.1.0
   ## Authentication parameters
   ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
   ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run

docker/down.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set -e
+
+title() {
+  echo -e "\033[1m${1}\033[0m"
+}
+
+usage() {
+  echo "usage: ./$(basename -- ${0}) [--api-port PORT] [--web-port PORT] [--tag TAG]"
+  echo "A script used to bring down Marquez when run via Docker"
+  echo
+  title "ARGUMENTS:"
+  echo "  -a, --api-port int          api port (default: 5000)"
+  echo "  -m, --api-admin-port int    api admin port (default: 5001)"
+  echo "  -w, --web-port int          web port (default: 3000)"
+  echo "  -t, --tag string            image tag (default: latest)"
+  echo
+}
+
+# Change working directory to project root
+project_root=$(git rev-parse --show-toplevel)
+cd "${project_root}/"
+
+compose_files="-f docker-compose.yml"
+args="--remove-orphans"
+
+API_PORT=5000
+API_ADMIN_PORT=5001
+WEB_PORT=3000
+TAG=0.19.0
+while [ $# -gt 0 ]; do
+  case $1 in
+    -a|'--api-port')
+       shift
+       API_PORT="${1}"
+       ;;
+    -m|'--api-admin-port')
+       shift
+       API_ADMIN_PORT="${1}"
+       ;;
+    -w|'--web-port')
+       shift
+       WEB_PORT="${1}"
+       ;;
+    -t|'--tag')
+       shift
+       TAG="${1}"
+       ;;
+    -h|'--help')
+       usage
+       exit 0
+       ;;
+    *) usage
+       exit 1
+       ;;
+  esac
+  shift
+done
+
+API_PORT=${API_PORT} API_ADMIN_PORT=${API_ADMIN_PORT} WEB_PORT=${WEB_PORT} TAG="${TAG}" docker-compose $compose_files down $args