Merge pull request #314 from RADAR-base/release-0.8.0

Release 0.8.0
RADAR-base · Oct 18, 2022 · c9a1475 · c9a1475
2 parents f64e827 + 2a22ad5
commit c9a1475
Show file tree

Hide file tree

Showing 102 changed files with 3,467 additions and 3,418 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,9 +8,6 @@ on:
   pull_request:
     branches: [ master, dev ]
 
-env:
-  DOCKER_IMAGE: radarbase/radar-schemas-tools
-
 jobs:
   # Build and test the code
   java:
@@ -24,9 +21,9 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
@@ -45,10 +42,13 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
+    env:
+      DOCKER_IMAGE: radarbase/radar-schemas-tools
+
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Docker build parameters
         id: docker_params
@@ -66,34 +66,34 @@ jobs:
 
       - name: Cache Docker layers
         id: cache_buildx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ steps.docker_params.outputs.push }}-${{ hashFiles('Dockerfile', 'java-sdk/**/*.gradle', 'java-sdk/gradle.properties', 'java-sdk/*/src/main/**', 'commons/**', 'specifications/**', 'docker/**') }}
           restore-keys: |
             ${{ runner.os }}-buildx-${{ steps.docker_params.outputs.push }}-
             ${{ runner.os }}-buildx-
 
-      - name: Login to Docker Hub
+      - name: Log in to Docker Hub
         if: steps.docker_params.outputs.has_docker_login == 'true'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Add Docker labels and tags
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v4
         with:
           images: ${{ env.DOCKER_IMAGE }}
 
       # Setup docker build environment
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache parameters
         id: cache-parameters
@@ -105,8 +105,9 @@ jobs:
           fi
 
       - name: Build docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
+          context: .
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: ${{ steps.cache-parameters.outputs.cache-to }}
           platforms: ${{ steps.docker_params.outputs.platforms }}
@@ -134,11 +135,6 @@ jobs:
           docker run --rm ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} curl --version
           docker run --rm ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} radar-schemas-tools --help
 
-      # Push the image on the dev and master branches
-      - name: Push image
-        if: ${{ github.event_name != 'pull_request' }}
-        run: docker push ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
-
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
       # https://github.com/moby/buildkit/issues/1896

diff --git a/.github/workflows/publish_snapshots.yml b/.github/workflows/publish_snapshots.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   # Build and test the code
-  build:
+  java:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -19,13 +19,13 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Has SNAPSHOT version
         id: is-snapshot
         run: grep "version = '.*-SNAPSHOT'" build.gradle
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,9 +17,9 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
@@ -58,34 +58,36 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v2
-
-      # Setup docker build environment
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Add Docker labels and tags
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v4
         with:
           images: ${{ env.DOCKER_IMAGE }}
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
+      # Setup docker build environment
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: Build docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
+          context: .
           # Allow running the image on X86 and ARM.
           platforms: linux/amd64,linux/arm64
           push: true

diff --git a/.github/workflows/scheduled_snyk.yaml b/.github/workflows/scheduled_snyk.yaml
@@ -5,17 +5,21 @@ on:
 jobs:
   security:
     runs-on: ubuntu-latest
+
     defaults:
       run:
         working-directory: java-sdk
 
     env:
       REPORT_FILE: test.json
+
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - uses: snyk/actions/setup@master
+        with:
+          snyk-version: v1.931.0
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
@@ -32,3 +36,11 @@ jobs:
           --configuration-matching='^runtimeClasspath$'
           --json-file-output=${{ env.REPORT_FILE }}
           --org=radar-base
+
+      - name: Report new vulnerabilities
+        uses: thehyve/report-vulnerability@master
+        with:
+          report-file: ${{ env.REPORT_FILE }}
+        env:
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ failure() }}
diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml
@@ -12,10 +12,12 @@ jobs:
         working-directory: java-sdk
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - uses: snyk/actions/setup@master
+        with:
+          snyk-version: v1.931.0
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
@@ -32,3 +34,4 @@ jobs:
           --configuration-matching='^runtimeClasspath$'
           --fail-on=upgradable
           --org=radar-base
+          --severity-threshold=high
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ out/
 *.iml
 .gradle/
 .gradletasknamecache
-gradle.properties
 exchange.properties
 *.class
 /doc/
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,17 @@
-FROM --platform=$BUILDPLATFORM gradle:7.4-jdk17 as builder
+FROM --platform=$BUILDPLATFORM gradle:7.5-jdk17 as builder
 
 RUN mkdir -p /code/java-sdk
 WORKDIR /code/java-sdk
 ENV GRADLE_USER_HOME=/code/.gradlecache \
    GRADLE_OPTS=-Djdk.lang.Process.launchMechanism=vfork
 
-COPY java-sdk/build.gradle java-sdk/settings.gradle /code/java-sdk/
-COPY java-sdk/radar-schemas-commons/build.gradle /code/java-sdk/radar-schemas-commons/
-COPY java-sdk/radar-schemas-core/build.gradle /code/java-sdk/radar-schemas-core/
-COPY java-sdk/radar-schemas-registration/build.gradle /code/java-sdk/radar-schemas-registration/
-COPY java-sdk/radar-schemas-tools/build.gradle /code/java-sdk/radar-schemas-tools/
-COPY java-sdk/radar-catalog-server/build.gradle /code/java-sdk/radar-catalog-server/
-RUN gradle downloadDependencies copyDependencies startScripts --no-watch-fs -Pprofile=docker
+COPY java-sdk/*.gradle.kts java-sdk/gradle.properties /code/java-sdk/
+COPY java-sdk/radar-schemas-commons/build.gradle.kts /code/java-sdk/radar-schemas-commons/
+COPY java-sdk/radar-schemas-core/build.gradle.kts /code/java-sdk/radar-schemas-core/
+COPY java-sdk/radar-schemas-registration/build.gradle.kts /code/java-sdk/radar-schemas-registration/
+COPY java-sdk/radar-schemas-tools/build.gradle.kts /code/java-sdk/radar-schemas-tools/
+COPY java-sdk/radar-catalog-server/build.gradle.kts /code/java-sdk/radar-catalog-server/
+RUN gradle downloadDependencies copyDependencies startScripts --no-watch-fs
 
 COPY commons /code/commons
 COPY specifications /code/specifications
@@ -22,7 +22,7 @@ COPY java-sdk/radar-schemas-registration/src /code/java-sdk/radar-schemas-regist
 COPY java-sdk/radar-schemas-tools/src /code/java-sdk/radar-schemas-tools/src
 COPY java-sdk/radar-catalog-server/src /code/java-sdk/radar-catalog-server/src
 
-RUN gradle jar --no-watch-fs -Pprofile=docker
+RUN gradle jar --no-watch-fs
 
 FROM eclipse-temurin:17-jre
 
@@ -33,7 +33,7 @@ ENV KAFKA_SCHEMA_REGISTRY=http://schema-registry-1:8081 \
     KAFKA_NUM_REPLICATION=3 \
     KAFKA_NUM_BROKERS=3 \
     KAFKA_BOOTSTRAP_SERVERS="" \
-    KAFKA_CONFIG_PATH="" \
+    CONFIG_PATH="" \
     NO_VALIDATE=""
 
 RUN apt-get update && apt-get install -y \
@@ -55,7 +55,7 @@ VOLUME /schema/conf
 VOLUME /etc/confluent/
 
 # Copy bash file
-COPY docker/specifications.exclude /etc/radar-schemas/specifications.exclude
+COPY docker/config.yaml /etc/radar-schemas-tools/
 COPY docker/topic_init.sh ./docker/init.sh ./docker/list_aggregated.sh ./docker/list_raw.sh /usr/bin/
 
 USER 101