Skip to content

Commit 38b6df2

Browse files
committed
fix: builder errors due to missing configurations
Signed-off-by: Joel Hanson <joelhanson025@gmail.com>
1 parent 96bf282 commit 38b6df2

File tree

6 files changed

+46
-12
lines changed

6 files changed

+46
-12
lines changed

.github/workflows/checkstyle-and-tests.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,34 @@ on:
77
types: [opened, synchronize, reopened]
88

99
jobs:
10-
test:
11-
name: Checkstyle and Tests
10+
build-and-test:
11+
name: Build, Checkstyle, and Test
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
1515
uses: actions/checkout@v3
16+
1617
- name: Set up JDK 8
1718
uses: actions/setup-java@v3
1819
with:
1920
java-version: 8
2021
distribution: 'semeru'
22+
2123
- name: Get java-version
2224
run: |
2325
BUILD_VERSION=$( mvn help:evaluate -Dexpression=project.version -q -DforceStdout )
2426
echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
25-
- name: Compile
26-
run: mvn -X compile
27-
- name: Checkstyle
28-
run: mvn -X validate
29-
- name: Test
30-
run: mvn -X test
27+
28+
- name: Build and Test
29+
run: mvn -B clean compile verify checkstyle:check
30+
31+
- name: Upload test results
32+
uses: actions/upload-artifact@v3
33+
if: always()
34+
with:
35+
name: test-results
36+
path: target/surefire-reports
37+
3138
verify-commits:
3239
name: Verify Commits
3340
runs-on: ubuntu-latest

.github/workflows/github-build-release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,25 @@ name: Build and create release
88
jobs:
99
build:
1010
name: Build and upload release binary
11-
#if: github.event.base_ref == 'refs/heads/master' # only run if on master branch
1211
runs-on: ubuntu-latest
1312
steps:
1413
- name: Checkout code
1514
uses: actions/checkout@v3
15+
1616
- name: Set up JDK 8
1717
uses: actions/setup-java@v3
1818
with:
1919
java-version: 8
2020
distribution: 'semeru'
21+
2122
- name: Get java-version
2223
run: |
2324
BUILD_VERSION=$( mvn help:evaluate -Dexpression=project.version -q -DforceStdout )
2425
echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
26+
2527
- name: Build
26-
run: mvn package
28+
run: mvn -B clean package
29+
2730
- name: Create Release
2831
id: create_release
2932
uses: actions/create-release@v1
@@ -34,6 +37,7 @@ jobs:
3437
release_name: Release ${{ github.ref }}
3538
draft: false
3639
prerelease: false
40+
3741
- name: Upload Release Asset With Dependencies
3842
id: upload-release-asset-with-dependencies
3943
uses: actions/upload-release-asset@v1
@@ -44,6 +48,7 @@ jobs:
4448
asset_path: ./target/kafka-connect-mq-sink-${{env.VERSION}}-jar-with-dependencies.jar
4549
asset_name: kafka-connect-mq-sink-${{env.VERSION}}-jar-with-dependencies.jar
4650
asset_content_type: application/java-archive
51+
4752
- name: Upload Release Asset With non-MQ Dependencies
4853
id: upload-release-asset-with-dependencies-exc-mq
4954
uses: actions/upload-release-asset@v1
@@ -54,6 +59,7 @@ jobs:
5459
asset_path: ./target/kafka-connect-mq-sink-${{env.VERSION}}-dependencies-exc-mq.jar
5560
asset_name: kafka-connect-mq-sink-${{env.VERSION}}-dependencies-exc-mq.jar
5661
asset_content_type: application/java-archive
62+
5763
- name: Upload Release Asset
5864
id: upload-release-asset
5965
uses: actions/upload-release-asset@v1

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
<configuration>
139139
<source>1.8</source>
140140
<target>1.8</target>
141+
<compilerArgument>-Xlint:unchecked</compilerArgument>
141142
</configuration>
142143
</plugin>
143144

@@ -150,6 +151,9 @@
150151
<systemPropertyVariables>
151152
<connectorVersion>${project.version}</connectorVersion>
152153
</systemPropertyVariables>
154+
<additionalClasspathElements>
155+
<additionalClasspathElement>src/test/resources</additionalClasspathElement>
156+
</additionalClasspathElements>
153157
</configuration>
154158
</plugin>
155159

@@ -162,6 +166,9 @@
162166
<systemPropertyVariables>
163167
<connectorVersion>${project.version}</connectorVersion>
164168
</systemPropertyVariables>
169+
<additionalClasspathElements>
170+
<additionalClasspathElement>src/test/resources</additionalClasspathElement>
171+
</additionalClasspathElements>
165172
</configuration>
166173
<executions>
167174
<execution>
@@ -346,5 +353,10 @@
346353
</configuration>
347354
</plugin>
348355
</plugins>
356+
<testResources>
357+
<testResource>
358+
<directory>src/integration/resources</directory>
359+
</testResource>
360+
</testResources>
349361
</build>
350362
</project>

src/integration/java/com/ibm/eventstreams/connect/mqsink/AbstractJMSContextIT.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.junit.ClassRule;
4444
import org.testcontainers.containers.GenericContainer;
4545
import org.testcontainers.containers.wait.strategy.Wait;
46+
import org.testcontainers.utility.MountableFile;
4647

4748
import com.fasterxml.jackson.core.JsonProcessingException;
4849
import com.fasterxml.jackson.core.type.TypeReference;
@@ -53,7 +54,6 @@
5354
import com.github.dockerjava.api.model.PortBinding;
5455
import com.github.dockerjava.api.model.Ports;
5556
import com.ibm.eventstreams.connect.mqsink.util.MQRestAPIHelper;
56-
import com.ibm.eventstreams.connect.mqsink.utils.Configs;
5757
import com.ibm.mq.jms.MQConnectionFactory;
5858
import com.ibm.msg.client.jms.JmsConnectionFactory;
5959
import com.ibm.msg.client.jms.JmsFactoryFactory;
@@ -111,7 +111,10 @@ private static MQRestAPIHelper getMQRestApiHelper() {
111111
final public static GenericContainer<?> MQ_CONTAINER = new GenericContainer<>(MQ_IMAGE)
112112
.withEnv("LICENSE", "accept")
113113
.withEnv("MQ_QMGR_NAME", QMGR_NAME)
114+
.withEnv("MQ_APP_PASSWORD", ADMIN_PASSWORD)
115+
.withEnv("MQ_ADMIN_PASSWORD", ADMIN_PASSWORD)
114116
.withExposedPorts(TCP_MQ_EXPOSED_PORT, REST_API_EXPOSED_PORT)
117+
.withCopyFileToContainer(MountableFile.forClasspathResource("no-auth-qmgr.mqsc"), "/etc/mqm/99-no-auth-qmgr.mqsc")
115118
.withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(
116119
new HostConfig().withPortBindings(
117120
new PortBinding(Ports.Binding.bindPort(TCP_MQ_HOST_PORT),
@@ -155,7 +158,7 @@ public JMSContext getJmsContext() throws Exception {
155158
mqcf.setQueueManager(QMGR_NAME);
156159
mqcf.setConnectionNameList(getConnectionName());
157160

158-
jmsContext = mqcf.createContext();
161+
jmsContext = mqcf.createContext(APP_USERNAME, ADMIN_PASSWORD);
159162
}
160163

161164
return jmsContext;

src/integration/java/com/ibm/eventstreams/connect/mqsink/MQSinkTaskAuthIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.junit.Test;
3535
import org.testcontainers.containers.GenericContainer;
3636
import org.testcontainers.containers.wait.strategy.Wait;
37+
import org.testcontainers.utility.MountableFile;
3738

3839
import com.github.dockerjava.api.model.ExposedPort;
3940
import com.github.dockerjava.api.model.HostConfig;
@@ -52,7 +53,9 @@ public class MQSinkTaskAuthIT {
5253
.withEnv("LICENSE", "accept")
5354
.withEnv("MQ_QMGR_NAME", AbstractJMSContextIT.QMGR_NAME)
5455
.withEnv("MQ_APP_PASSWORD", AbstractJMSContextIT.APP_PASSWORD)
56+
.withEnv("MQ_ADMIN_PASSWORD", AbstractJMSContextIT.ADMIN_PASSWORD)
5557
.withExposedPorts(AbstractJMSContextIT.TCP_MQ_EXPOSED_PORT, AbstractJMSContextIT.REST_API_EXPOSED_PORT)
58+
.withCopyFileToContainer(MountableFile.forClasspathResource("no-auth-qmgr.mqsc"), "/etc/mqm/99-no-auth-qmgr.mqsc")
5659
.withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(
5760
new HostConfig().withPortBindings(
5861
new PortBinding(Ports.Binding.bindPort(AbstractJMSContextIT.TCP_MQ_HOST_PORT),

src/test/resources/no-auth-qmgr.mqsc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER QMGR CHLAUTH(DISABLED)
2+
ALTER QMGR CONNAUTH(' ')
3+
REFRESH SECURITY TYPE(CONNAUTH)

0 commit comments

Comments
 (0)