Merge branch 'main' into fix/issue-2503-display-dataquality-assertition-facets

Author: wslulciuc

.circleci/api-load-test.sh

@@ -14,7 +14,7 @@
 set -e
 
 # Build version of Marquez
-readonly MARQUEZ_VERSION=0.36.0-SNAPSHOT
+readonly MARQUEZ_VERSION=0.47.0-SNAPSHOT
 # Fully qualified path to marquez.jar
 readonly MARQUEZ_JAR="api/build/libs/marquez-api-${MARQUEZ_VERSION}.jar"
 

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
   build-api:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     environment:
       TESTCONTAINERS_RYUK_DISABLED: true
     steps:
@@ -49,7 +49,7 @@ jobs:
   build-image-api:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     steps:
       - checkout
       - run: docker build --no-cache --tag "marquezproject/marquez:${CIRCLE_SHA1}" .
@@ -60,7 +60,7 @@ jobs:
   build-image-web:
     working_directory: ~/marquez/web
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     steps:
       - *checkout_project_root
       - run: docker build --no-cache --tag "marquezproject/marquez-web:${CIRCLE_SHA1}" .
@@ -71,7 +71,7 @@ jobs:
   unit-test-web:
     working_directory: ~/marquez/web
     docker:
-      - image: circleci/node:12.22.7
+      - image: cimg/node:18.16.0
     environment:
       TZ: 'America/New_York'
     steps:
@@ -92,7 +92,7 @@ jobs:
   build-client-java:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     steps:
       - checkout
       - restore_cache:
@@ -150,7 +150,7 @@ jobs:
   load-test-api:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     steps:
       - checkout
       - run: ./.circleci/get-docker-compose.sh
@@ -165,25 +165,30 @@ jobs:
   migrate-db:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     resource_class: large
     steps:
       - checkout
       - run: ./.circleci/get-docker-compose.sh
       - run: ./.circleci/db-migration.sh
 
+  publish-snapshot:
+    working_directory: ~/marquez
+    machine:
+      image: ubuntu-2004:2023.10.1
+    steps:
+      - checkout
+      - run: ./.circleci/get-jdk17.sh
+      - run: ./.circleci/publish.sh # *SNAPSHOT.jar
+
   release-java:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     steps:
       - checkout
       - run: ./.circleci/get-jdk17.sh
-      - run: |
-          # Get, then decode the GPG private key used to sign *.jar
-          export ORG_GRADLE_PROJECT_signingKey=$(echo $GPG_SIGNING_KEY | base64 -d)
-          # Publish *.jar
-          ./gradlew publish
+      - run: ./.circleci/publish.sh # *.jar
 
   release-python:
     working_directory: ~/marquez
@@ -199,7 +204,7 @@ jobs:
   release-docker:
     working_directory: ~/marquez
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2004:2023.10.1
     steps:
       - checkout
       - run: ./docker/login.sh
@@ -225,6 +230,16 @@ workflows:
       - migrate-db:
           requires:
             - build-api
+      - publish-snapshot:
+          filters:
+            branches:
+              only: main
+          context: release
+          requires:
+            - build-image-api
+            - load-test-api
+            - migrate-db
+
   release:
     jobs:
       - build-client-python:

.circleci/db-migration.sh

@@ -11,9 +11,9 @@
 # Usage: $ ./db-migration.sh
 
 # Version of PostgreSQL
-readonly POSTGRES_VERSION="12.1"
+readonly POSTGRES_VERSION="14"
 # Version of Marquez
-readonly MARQUEZ_VERSION=0.35.0
+readonly MARQUEZ_VERSION=0.46.0
 # Build version of Marquez
 readonly MARQUEZ_BUILD_VERSION="$(git log --pretty=format:'%h' -n 1)" # SHA1
 

.circleci/publish.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Copyright 2018-2023 contributors to the Marquez project
+# SPDX-License-Identifier: Apache-2.0
+#
+# Usage: $ ./publish.sh
+
+set -e
+
+# Get, then decode, the GPG private key used to sign *-SNAPSHOT.jar
+export ORG_GRADLE_PROJECT_signingKey=$(echo $GPG_SIGNING_KEY | base64 -d)
+# Publish *.jar
+./gradlew publish
+
+echo "DONE!"

.env.example

@@ -1,4 +1,4 @@
 API_PORT=5000
 API_ADMIN_PORT=5001
 WEB_PORT=3000
-TAG=0.35.0
+TAG=0.46.0

.github/boring-cyborg.yml

@@ -55,4 +55,4 @@ firstPRMergeComment: >
 
 # Comment to be posted to on first time issues
 firstIssueWelcomeComment: >
-  Thanks for opening your first issue in the Marquez project! Please be sure to follow the issue template!
+  Thanks for opening your first issue in the Marquez project! Please be sure to follow the issue template!

.github/pull_request_template.md

@@ -20,4 +20,4 @@ One-line summary:
 - [ ] You've updated any relevant documentation (_if relevant_)
 - [ ] You've included a one-line summary of your change for the [`CHANGELOG.md`](https://github.com/MarquezProject/marquez/blob/main/CHANGELOG.md#unreleased) (_Depending on the change, this may not be necessary_).
 - [ ] You've versioned your `.sql` database schema migration according to [Flyway's naming convention](https://flywaydb.org/documentation/concepts/migrations#naming) (_if relevant_)
-- [ ] You've included a [header](https://github.com/MarquezProject/marquez/blob/main/CONTRIBUTING.md#copyright--license) in any source code files (_if relevant_)
+- [ ] You've included a [header](https://github.com/MarquezProject/marquez/blob/main/CONTRIBUTING.md#copyright--license) in any source code files (_if relevant_)

.github/workflows/headerchecker.yml

@@ -32,7 +32,7 @@ jobs:
         run: |
           ok=1
           readarray -t files <<<"$(jq -r '.[]' <<<'${{ steps.files.outputs.added_modified }}')"
-          for file in ${files[@]}; do 
+          for file in ${files[@]}; do
             if [[ ($file == *".java") ]]; then
               if ! grep -q Copyright "$file"; then
                 ok=0
@@ -45,4 +45,4 @@ jobs:
           else
             GREEN="\e[32m"
             echo -e "${GREEN}All changed & added files have been scanned. Result: no headers are missing.${ENDCOLOR}"
-          fi
+          fi

.github/workflows/test-chart.yaml

@@ -24,7 +24,7 @@ jobs:
           python-version: 3.7
 
       - name: Setup chart-testing
-        uses: helm/chart-testing-action@v2.3.1
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -38,7 +38,7 @@ jobs:
         run: ct lint --config ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@v1.8.0
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml

.gitignore

@@ -39,3 +39,6 @@ metadata.json
 
 # Dependent Helm charts
 chart/charts/
+
+# Dev
+changes.txt