From a6694cc6499ab05bb497b3c7fcfa7752331ea881 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 7 Feb 2025 15:02:36 -0800 Subject: [PATCH 01/21] upgrading dependencies --- pom.xml | 10 +++--- .../kafka/sink/AvroJsonConvertersTest.java | 33 ++++--------------- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 48d4f61f..c9048cce 100644 --- a/pom.xml +++ b/pom.xml @@ -40,12 +40,12 @@ 1.0.15 1.8 8 - 2.4.0 - 5.2.1 + 3.7.2 + 7.7.2 2.6.2 - 4.16.0 - 1.10.0 - 1.0.3 + 4.17.0 + 1.11.0 + 1.0.4 25.1-jre 1.7.25 1.2.3 diff --git a/sink/src/test/java/com/datastax/oss/kafka/sink/AvroJsonConvertersTest.java b/sink/src/test/java/com/datastax/oss/kafka/sink/AvroJsonConvertersTest.java index 1996dab6..d926b86f 100644 --- a/sink/src/test/java/com/datastax/oss/kafka/sink/AvroJsonConvertersTest.java +++ b/sink/src/test/java/com/datastax/oss/kafka/sink/AvroJsonConvertersTest.java @@ -25,23 +25,17 @@ import com.fasterxml.jackson.databind.node.DoubleNode; import com.fasterxml.jackson.databind.node.TextNode; import io.confluent.connect.avro.AvroConverter; -import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient; +import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient; import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig; -import io.confluent.kafka.serializers.AvroSchemaUtils; -import java.io.ByteArrayInputStream; import java.math.BigDecimal; import java.math.BigInteger; -import java.nio.ByteBuffer; import java.util.Base64; import java.util.Collections; import java.util.Map; import java.util.stream.Stream; -import org.apache.avro.generic.GenericDatumReader; -import org.apache.avro.io.BinaryDecoder; -import org.apache.avro.io.DatumReader; -import org.apache.avro.io.DecoderFactory; import org.apache.kafka.connect.data.Decimal; import org.apache.kafka.connect.data.Schema; +import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.data.SchemaBuilder; import org.apache.kafka.connect.json.DecimalFormat; import org.apache.kafka.connect.json.JsonConverter; @@ -49,7 +43,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.Mockito; /** * Tests to validate discussion in KAF-91. These tests are intended to prove that the behaviour @@ -161,7 +154,7 @@ public void should_keep_big_decimal_with_json_converter_decimal_format_numeric() public void should_convert_big_decimal_to_bytes_with_avro_converter() throws Exception { String topic = "topic"; - AvroConverter converter = new AvroConverter(Mockito.mock(SchemaRegistryClient.class)); + AvroConverter converter = new AvroConverter(new MockSchemaRegistryClient()); converter.configure( Collections.singletonMap( AbstractKafkaAvroSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, "localhost"), @@ -172,29 +165,15 @@ public void should_convert_big_decimal_to_bytes_with_avro_converter() throws Exc new SchemaBuilder(Schema.Type.BYTES) .name(Decimal.LOGICAL_NAME) .parameter(Decimal.SCALE_FIELD, Integer.toString(expected.scale())) + .required() .build(); - // Root conversion operation byte[] convertedBytes = converter.fromConnectData(topic, schema, expected); - // AvroConverter winds up adding 5 extra bytes, a "magic" byte + a 4 byte ID value, so strip - // those here. See AbstractKafkaAvroSerializer for more detail. - ByteArrayInputStream stream = - new ByteArrayInputStream(convertedBytes, 5, convertedBytes.length - 5); - - org.apache.avro.Schema bytesSchema = AvroSchemaUtils.getSchema(convertedBytes); - // Confirm that we can read the contents of the connect data as a byte array (not by itself an // impressive feat) _and_ that the bytes in this array represent the unscaled value of the // expected BigInteger - BinaryDecoder decoder = DecoderFactory.get().binaryDecoder(stream, null); - DatumReader reader = new GenericDatumReader(bytesSchema); - ByteBuffer observedBytes = (ByteBuffer) reader.read(null, decoder); - - BigDecimal observed = - new BigDecimal( - new BigInteger(observedBytes.array()), - Integer.parseInt(schema.parameters().get(Decimal.SCALE_FIELD))); - assertThat(expected).isEqualTo(observed); + SchemaAndValue val = converter.toConnectData(topic, convertedBytes); + assertThat(expected).isEqualTo(val.value()); } } From 110614d5598c18ff790561f89432db2887905820 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 09:25:36 -0800 Subject: [PATCH 02/21] CI: upgrade python --- .github/workflows/ci-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 80940cc9..f70e7246 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -64,9 +64,9 @@ jobs: psutil """ > requirements.txt - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: - python-version: '2.x' + python-version: '3.x' cache: 'pip' - name: Setup CCM private if: ${{ matrix.cassandra.is_dse }} From a5c126833f527cd63b09e8b86a902d7ebe54b31f Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 09:54:56 -0800 Subject: [PATCH 03/21] try with python2 --- .github/workflows/ci-integration.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index f70e7246..2eb68d38 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -11,6 +11,7 @@ on: jobs: integration-tests: runs-on: ubuntu-latest + container: quay.io/coatldev/six:latest strategy: fail-fast: false matrix: @@ -38,7 +39,7 @@ jobs: is_dse: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 8 uses: actions/setup-java@v2 with: @@ -58,16 +59,17 @@ jobs: #!/bin/bash # This step is need to not make setup-python fails set -e + ln -sf /opt/python/2.7/bin/python2 /opt/python/bin/python echo """ pyYaml six psutil """ > requirements.txt - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.x' - cache: 'pip' +# - name: Set up Python +# uses: actions/setup-python@v5 +# with: +# python-version: '3.x' +# cache: 'pip' - name: Setup CCM private if: ${{ matrix.cassandra.is_dse }} env: From 2a12cfd76884c560f64875faaee165ac8eab7dd7 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 10:01:17 -0800 Subject: [PATCH 04/21] Revert "try with python2" This reverts commit a5c126833f527cd63b09e8b86a902d7ebe54b31f. --- .github/workflows/ci-integration.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 2eb68d38..f70e7246 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -11,7 +11,6 @@ on: jobs: integration-tests: runs-on: ubuntu-latest - container: quay.io/coatldev/six:latest strategy: fail-fast: false matrix: @@ -39,7 +38,7 @@ jobs: is_dse: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up JDK 8 uses: actions/setup-java@v2 with: @@ -59,17 +58,16 @@ jobs: #!/bin/bash # This step is need to not make setup-python fails set -e - ln -sf /opt/python/2.7/bin/python2 /opt/python/bin/python echo """ pyYaml six psutil """ > requirements.txt -# - name: Set up Python -# uses: actions/setup-python@v5 -# with: -# python-version: '3.x' -# cache: 'pip' + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.x' + cache: 'pip' - name: Setup CCM private if: ${{ matrix.cassandra.is_dse }} env: From 596425e3d2859da9c887552fca35256854535f10 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 10:09:06 -0800 Subject: [PATCH 05/21] setup python2 diferenetly --- .github/workflows/ci-integration.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index f70e7246..3397cc3d 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -64,10 +64,12 @@ jobs: psutil """ > requirements.txt - name: Set up Python - uses: actions/setup-python@v5 + uses: MatteoH2O1999/setup-python@v1 with: - python-version: '3.x' + python-version: '2.7' cache: 'pip' + allow-build: info + cache-build: true - name: Setup CCM private if: ${{ matrix.cassandra.is_dse }} env: From 60577f8a2a96833b08734f00fbc47d273b0d72ee Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 10:58:27 -0800 Subject: [PATCH 06/21] . --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 3397cc3d..b953911e 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -119,7 +119,7 @@ jobs: export CCM_CASSANDRA_VERSION=${{ matrix.cassandra.ccm_version }} export CCM_VERSION=${{ matrix.cassandra.ccm_version }} - mvn verify -Pmedium -pl pulsar-impl \ + mvn verify -Pmedium -pl sink \ -Ddsbulk.ccm.CCM_VERSION=$CCM_VERSION \ -Ddsbulk.ccm.CCM_IS_DSE=$CCM_IS_DSE \ -Ddsbulk.ccm.JAVA_HOME="$JDK8_PATH" \ From 95c3b8e96b950f6ca04b6c7902654160988e6a0f Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 11:18:01 -0800 Subject: [PATCH 07/21] . --- .github/workflows/ci-integration.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index b953911e..c8343aa4 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -77,10 +77,18 @@ jobs: run: | #!/bin/bash set -e + if [ "$CLONE_RIPTANO_CCM_SECRET" == "" ]; then + echo "secretspresent=NO" + else + echo "secretspresent=YES" + fi + echo "Cloning the repo" git clone https://${CLONE_RIPTANO_CCM_SECRET}@github.com/riptano/ccm-private.git cd ccm-private + echo "pip install requirements" pip install -r requirements.txt + echo "setup.py install" ./setup.py install - name: Setup CCM if: ${{ !matrix.cassandra.is_dse }} From 964770ed4814eb70e893dc5457c512e8a1bd621b Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 12:12:18 -0800 Subject: [PATCH 08/21] trying with downgraded cass deps --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c9048cce..e709bbb2 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,8 @@ 3.7.2 7.7.2 2.6.2 - 4.17.0 - 1.11.0 + 4.16.0 + 1.10.0 1.0.4 25.1-jre 1.7.25 From 2a299cc88a3ce8ad00d38204901633625f186070 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 14:07:53 -0800 Subject: [PATCH 09/21] . --- .../sink/simulacron/SimpleEndToEndSimulacronIT.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java b/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java index cf24053b..bb007600 100644 --- a/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java +++ b/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java @@ -85,7 +85,7 @@ @ExtendWith(StreamInterceptingExtension.class) @ExtendWith(LogInterceptingExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) -@SimulacronConfig(dseVersion = "5.0.8") +@SimulacronConfig class SimpleEndToEndSimulacronIT { private static final String INSERT_STATEMENT = @@ -332,10 +332,7 @@ void fail_prepare_counter_table() { ImmutableMap props = ImmutableMap.builder() - .put("name", INSTANCE_NAME) - .put("contactPoints", connectorProperties.get("contactPoints")) - .put("port", connectorProperties.get("port")) - .put("loadBalancing.localDc", "dc1") + .putAll(connectorProperties) // since we upgraded to Driver 4.16.x, we need to explicitly set the protocol version // otherwise it will try only DSE_v1 and DSE_v2 because they are not considered "BETA" // https://github.com/datastax/java-driver/blob/4270f93277249abb513bc2abf2ff7a7c481b1d0d/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java#L163 @@ -367,8 +364,7 @@ void fail_delete() { .build())); simulacron.prime(when(bad1).then(serverError("bad thing"))); Map connProps = new HashMap<>(); - connProps.put("name", INSTANCE_NAME); - connProps.put("contactPoints", hostname); + connProps.putAll(connectorProperties); // since we upgraded to Driver 4.16.x, we need to explicitly set the protocol version // otherwise it will try only DSE_v1 and DSE_v2 because they are not considered "BETA" // https://github.com/datastax/java-driver/blob/4270f93277249abb513bc2abf2ff7a7c481b1d0d/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java#L163 From c7f3512dfeebe2432733b1a4b306f330858652f0 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Mon, 10 Feb 2025 15:26:05 -0800 Subject: [PATCH 10/21] . --- .../sink/simulacron/SimpleEndToEndSimulacronIT.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java b/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java index bb007600..32f75bd8 100644 --- a/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java +++ b/sink/src/it/java/com/datastax/oss/kafka/sink/simulacron/SimpleEndToEndSimulacronIT.java @@ -333,10 +333,6 @@ void fail_prepare_counter_table() { ImmutableMap props = ImmutableMap.builder() .putAll(connectorProperties) - // since we upgraded to Driver 4.16.x, we need to explicitly set the protocol version - // otherwise it will try only DSE_v1 and DSE_v2 because they are not considered "BETA" - // https://github.com/datastax/java-driver/blob/4270f93277249abb513bc2abf2ff7a7c481b1d0d/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java#L163 - .put("datastax-java-driver.advanced.protocol.version", "V4") .put("topic.mytopic.ks1.mycounter.mapping", "a=key, b=value, c=value.f2") .build(); assertThatThrownBy(() -> task.start(props)) @@ -365,12 +361,6 @@ void fail_delete() { simulacron.prime(when(bad1).then(serverError("bad thing"))); Map connProps = new HashMap<>(); connProps.putAll(connectorProperties); - // since we upgraded to Driver 4.16.x, we need to explicitly set the protocol version - // otherwise it will try only DSE_v1 and DSE_v2 because they are not considered "BETA" - // https://github.com/datastax/java-driver/blob/4270f93277249abb513bc2abf2ff7a7c481b1d0d/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java#L163 - connProps.put("datastax-java-driver.advanced.protocol.version", "V4"); - connProps.put("port", port); - connProps.put("loadBalancing.localDc", "dc1"); connProps.put( "topic.mytopic.ks1.mycounter.mapping", "a=value.bigint, b=value.text, c=value.int"); From 6685312b5dbe31f2b46d5dd5b20e0a4dfd023241 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Thu, 13 Feb 2025 15:20:30 -0800 Subject: [PATCH 11/21] bump netty --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e709bbb2..d7f4b215 100644 --- a/pom.xml +++ b/pom.xml @@ -61,8 +61,8 @@ 2 1.3 4.0.1 - 4.1.39.Final - 2.0.25.Final + 4.1.77.Final + 2.0.52.Final 4.0.2 1.6.0 1.1.7.2 From 217a82aca07013b88d7e7cfff8ebaa41ee6e4e7d Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 11:28:50 -0800 Subject: [PATCH 12/21] testing secrets --- .github/workflows/ci-integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index c8343aa4..adb34aee 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -74,9 +74,11 @@ jobs: if: ${{ matrix.cassandra.is_dse }} env: CLONE_RIPTANO_CCM_SECRET: ${{secrets.CLONE_RIPTANO_CCM_SECRET}} + TEST: ${{secrets.TEST}} run: | #!/bin/bash set -e + echo $TEST if [ "$CLONE_RIPTANO_CCM_SECRET" == "" ]; then echo "secretspresent=NO" else From 2b3cb013b51d4170c312de4f01d7c5d28844d77c Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 11:31:44 -0800 Subject: [PATCH 13/21] testing secrets --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index adb34aee..5c052a04 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -85,7 +85,7 @@ jobs: echo "secretspresent=YES" fi echo "Cloning the repo" - git clone https://${CLONE_RIPTANO_CCM_SECRET}@github.com/riptano/ccm-private.git + git clone https://${{ secrets.CLONE_RIPTANO_CCM_SECRET }}:x-oauth-basic@github.com/riptano/ccm-private.git cd ccm-private echo "pip install requirements" From e7d032975d12a4729cb77758c62676c4a3718d5e Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 12:00:32 -0800 Subject: [PATCH 14/21] . --- .github/workflows/ci-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 5c052a04..8def6cf3 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -11,6 +11,7 @@ on: jobs: integration-tests: runs-on: ubuntu-latest + environment: GH_CI strategy: fail-fast: false matrix: From 800283756fda671de4a6d90d0332831d2c0e2463 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 12:04:23 -0800 Subject: [PATCH 15/21] . --- .github/workflows/ci-integration.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 8def6cf3..4ae4f996 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -76,10 +76,23 @@ jobs: env: CLONE_RIPTANO_CCM_SECRET: ${{secrets.CLONE_RIPTANO_CCM_SECRET}} TEST: ${{secrets.TEST}} + GB_TOKEN: ${{secrets.GB_TOKEN}} run: | #!/bin/bash set -e + if [ "GB_TOKEN" == "" ]; then + echo "GB_TOKEN=NO" + else + echo "GB_TOKEN=YES" + fi + echo $TEST + if [ "$TEST" == "" ]; then + echo "envsecret=NO" + else + echo "envsecret=YES" + fi + if [ "$CLONE_RIPTANO_CCM_SECRET" == "" ]; then echo "secretspresent=NO" else From 8ce62d496113081c5e18ed49d3ef684cb9436ad7 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 12:08:04 -0800 Subject: [PATCH 16/21] no env --- .github/workflows/ci-integration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 4ae4f996..ab3e130e 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -11,7 +11,6 @@ on: jobs: integration-tests: runs-on: ubuntu-latest - environment: GH_CI strategy: fail-fast: false matrix: From 5aff01925564fa1766fd06f9a413f0923a2d9393 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 12:11:45 -0800 Subject: [PATCH 17/21] . --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index ab3e130e..0190683b 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -98,7 +98,7 @@ jobs: echo "secretspresent=YES" fi echo "Cloning the repo" - git clone https://${{ secrets.CLONE_RIPTANO_CCM_SECRET }}:x-oauth-basic@github.com/riptano/ccm-private.git + git clone https://${GB_TOKEN}@github.com/riptano/ccm-private.git cd ccm-private echo "pip install requirements" From 530df71a850387ab1f1b35ef619dd572cd1ee3e7 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 12:17:00 -0800 Subject: [PATCH 18/21] . --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 0190683b..992f70eb 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -98,7 +98,7 @@ jobs: echo "secretspresent=YES" fi echo "Cloning the repo" - git clone https://${GB_TOKEN}@github.com/riptano/ccm-private.git + git clone https://oauth2:${GB_TOKEN}@github.com/riptano/ccm-private.git cd ccm-private echo "pip install requirements" From 3c32e1129d04dfe6644ac1f422fae4511cbcc2e0 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 12:18:57 -0800 Subject: [PATCH 19/21] . --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 992f70eb..64690268 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -98,7 +98,7 @@ jobs: echo "secretspresent=YES" fi echo "Cloning the repo" - git clone https://oauth2:${GB_TOKEN}@github.com/riptano/ccm-private.git + git clone https://${GB_TOKEN}:x-oauth-basic@github.com/riptano/ccm-private.git cd ccm-private echo "pip install requirements" From 622783be01221ddd657d82686cb61fee092cb8c8 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 14:47:52 -0800 Subject: [PATCH 20/21] disable failing test --- .../com/datastax/oss/kafka/sink/cloud/CloudSniEndToEndIT.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sink/src/it/java/com/datastax/oss/kafka/sink/cloud/CloudSniEndToEndIT.java b/sink/src/it/java/com/datastax/oss/kafka/sink/cloud/CloudSniEndToEndIT.java index a3d65ede..0d4d2530 100644 --- a/sink/src/it/java/com/datastax/oss/kafka/sink/cloud/CloudSniEndToEndIT.java +++ b/sink/src/it/java/com/datastax/oss/kafka/sink/cloud/CloudSniEndToEndIT.java @@ -48,6 +48,7 @@ import org.apache.kafka.connect.sink.SinkRecord; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -59,6 +60,8 @@ @ExtendWith(WiremockResolver.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Tag("medium") +// per https://github.com/datastax/dsbulk/commit/0c91fdc4aa3e867decf4f080353b3bba468ce911 +@Disabled(value = "SNI Proxy image not available anymore in CI") public class CloudSniEndToEndIT extends ITConnectorBase { private final SNIProxyServer proxy; From 0a8141a6350d4dc52096d31a6cd2eb3593155669 Mon Sep 17 00:00:00 2001 From: Andrey Yegorov Date: Fri, 14 Feb 2025 15:09:14 -0800 Subject: [PATCH 21/21] . --- .github/workflows/ci-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration.yml b/.github/workflows/ci-integration.yml index 64690268..75d3aa7c 100644 --- a/.github/workflows/ci-integration.yml +++ b/.github/workflows/ci-integration.yml @@ -171,7 +171,7 @@ jobs: env - mvn verify -Pmedium -pl tests \ + mvn verify -Pmedium -pl sink \ -Ddsbulk.ccm.CCM_VERSION=$CCM_VERSION \ -Ddsbulk.ccm.CCM_IS_DSE=$CCM_IS_DSE \ -Ddsbulk.ccm.JAVA_HOME="$JDK8_PATH" \