Skip to content

Commit

Permalink
chore: misc updates and improvements made while you were gone, take 2 (
Browse files Browse the repository at this point in the history
…#583)

* chore(deps): update most dependencies (#15)

* chore(deps): update most dependencies

* feat: split arrays in one entry per line for pretty-printed JSON

* chore: review-based changes (#16)

* feat: add option to not warn for read-only streams (#22)

* feat: log remote state verification disabled warning only once (#23)

* chore(deps): update misc dependencies (#24)

* feat: add option to not warn for topic-less projects (#26)
  • Loading branch information
sverrehu authored Jun 6, 2024
1 parent 40d70a6 commit e75d005
Show file tree
Hide file tree
Showing 27 changed files with 235 additions and 155 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/ci-integration-test-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B clean integration-test -Pacls -Dcp.version=${{matrix.cpversion}} --file pom.xml
run: mvn -B clean integration-test -Pacls -Dcp.version=${{matrix.cpversion}} --file pom.xml
14 changes: 5 additions & 9 deletions .github/workflows/ci-integration-test-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,17 @@ jobs:
matrix:
os: [ubuntu-latest]
java: [11.0.x]
cpversion: [7.5.0]
cpversion: [7.6.0]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B clean integration-test -Pacls -Dcp.version=${{matrix.cpversion}} --file pom.xml
14 changes: 5 additions & 9 deletions .github/workflows/ci-unit-test-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml
14 changes: 5 additions & 9 deletions .github/workflows/ci-unit-test-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml
29 changes: 11 additions & 18 deletions .github/workflows/nightly-artifacts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,14 @@ jobs:
name: Build docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v1
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: copy fat jar
Expand All @@ -49,24 +45,21 @@ jobs:
name: Build rpm/deb packages (using maven)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
distribution: "temurin"
cache: maven
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/release-artifacts-build-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@ jobs:
name: Build rpm/deb packages (using maven)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 8
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Import private GPG key
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/release-artifacts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Build rpm/deb packages (using maven)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Import private GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v4
Expand All @@ -22,22 +22,19 @@ jobs:
- name: Import public GPG Key
run: rpm --import release/keys/public.key
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
distribution: "temurin"
cache: maven
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/release-docker-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Build docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v1
- name: Docker meta
id: docker_meta
Expand All @@ -21,15 +21,11 @@ jobs:
{{version}}
{{major}}.{{minor}}
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 8
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: copy fat jar
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Build docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v1
- name: Docker meta
id: docker_meta
Expand All @@ -22,15 +22,11 @@ jobs:
{{version}}
{{major}}.{{minor}}
- name: Set up the JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
distribution: "temurin"
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: copy fat jar
Expand Down
60 changes: 30 additions & 30 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<plugin>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.20</version>
<version>2.23</version>
<configuration>
<style>google</style>
</configuration>
Expand Down Expand Up @@ -408,7 +408,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -428,7 +428,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.2</version>
<configuration>
<filters>
<filter>
Expand Down Expand Up @@ -534,38 +534,38 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- plugins -->
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
<maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version>
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
<maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<rpm-maven-plugin.version>2.3.0</rpm-maven-plugin.version>
<spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>
<spotbugs-maven-plugin.version>4.8.3.1</spotbugs-maven-plugin.version>
<!-- dependencies -->
<assertj.version>3.24.2</assertj.version>
<avro.version>1.11.2</avro.version>
<aws.java.sdk.version>2.20.144</aws.java.sdk.version>
<commons.version>1.5.0</commons.version>
<confluent-ce.version>7.5.0-ce</confluent-ce.version>
<confluent.version>7.5.0</confluent.version>
<gcp.java.sdk.version>26.22.0</gcp.java.sdk.version>
<assertj.version>3.25.3</assertj.version>
<avro.version>1.11.3</avro.version>
<aws.java.sdk.version>2.25.6</aws.java.sdk.version>
<commons.version>1.6.0</commons.version>
<confluent-ce.version>7.6.0-ce</confluent-ce.version>
<confluent.version>7.6.0</confluent.version>
<gcp.java.sdk.version>26.34.0</gcp.java.sdk.version>
<hamcrest.version>2.2</hamcrest.version>
<jackson.version>2.15.2</jackson.version>
<jedis.version>4.4.4</jedis.version>
<jersey.version>3.1.3</jersey.version>
<jinjava.version>2.7.1</jinjava.version>
<jackson.version>2.16.2</jackson.version>
<jedis.version>4.4.7</jedis.version>
<jersey.version>3.1.5</jersey.version>
<jinjava.version>2.7.2</jinjava.version>
<junit.version>4.13.2</junit.version>
<ksqldb.client.version>7.0.0</ksqldb.client.version>
<ksqldb.version>0.27.1</ksqldb.version>
<log4j.version>2.20.0</log4j.version>
<lombok.version>1.18.28</lombok.version>
<mockito.version>5.5.0</mockito.version>
<slf4j.version>2.0.9</slf4j.version>
<testcontainers.version>1.19.0</testcontainers.version>
<typesafe.version>1.4.2</typesafe.version>
<zookeeper.version>3.9.0</zookeeper.version>
<log4j.version>2.23.0</log4j.version>
<lombok.version>1.18.30</lombok.version>
<mockito.version>5.11.0</mockito.version>
<slf4j.version>2.0.12</slf4j.version>
<testcontainers.version>1.19.7</testcontainers.version>
<typesafe.version>1.4.3</typesafe.version>
<zookeeper.version>3.9.1</zookeeper.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -720,7 +720,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.26.1</version>
<version>2.35.0</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down Expand Up @@ -773,7 +773,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.35.1</version>
<version>2.35.2</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ private Set<TopologyAclBinding> loadActualClusterStateIfAvailable(ExecutionPlan
.collect(Collectors.toSet());

if (!config.shouldVerifyRemoteState()) {
LOGGER.warn(
"Remote state verification disabled, this is not a good practice, be aware"
+ "in future versions, this check is going to become mandatory.");
OnceOnlyWarningLogger.getInstance().logRemoteStateVerificationDisabledWarning();
}

if (config.shouldVerifyRemoteState() && !config.fetchStateFromTheCluster()) {
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/purbon/kafka/topology/ArtefactManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ protected Collection<? extends Artefact> loadActualClusterStateIfAvailable(Execu
var currentState = config.fetchStateFromTheCluster() ? getClustersState() : getLocalState(plan);

if (!config.shouldVerifyRemoteState()) {
LOGGER.warn(
"Remote state verification disabled, this is not a good practice, be aware"
+ "in future versions, this check is going to become mandatory.");
OnceOnlyWarningLogger.getInstance().logRemoteStateVerificationDisabledWarning();
}

if (config.shouldVerifyRemoteState() && !config.fetchStateFromTheCluster()) {
Expand Down
Loading

0 comments on commit e75d005

Please sign in to comment.