Adding IBMMQ Discovery Agent #148

Ushnash · 2023-12-19T18:49:16Z

What is the purpose of this change?

Adding in the IBMMQ Discovery Agent plugin.

How was this change implemented?

Built an IBMMQ Discovery Agent using the Solace & Kafka agents as templates.

How was this change tested?

Basic unit tests & testing against IBMMQ Cloud.

Is there anything the reviewers should focus on/be aware of?

Am I following appropriate naming conventions?
Is there anything I should/shouldn't be doing?

service/application/src/main/resources/application.yml

moodiRealist · 2024-01-31T19:38:50Z

service/application/src/main/resources/application.yml

+                    - name: username
+                      value: ush
+                    - name: password
+                      value: E5J8yGHjPTErikzOVZ0FiloP47FooNKQSTcTx5jQE-oM


Can these examples use ENV vars like ${SOME_USERNAME} since that's the preferred way?

moodiRealist · 2024-01-31T19:40:02Z

service/ibmmq-plugin/pom.xml

+    <parent>
+        <groupId>com.solace.maas</groupId>
+        <artifactId>maas-event-management-agent-parent</artifactId>
+        <version>1.3.2-SNAPSHOT</version>


please update this with latest version before merging, we are currently at version 1.4.2 and will soon release 1.5.0

The other plugins don't appear to inherit from the EMA parent pom. I'll change this one to match those.

moodiRealist · 2024-01-31T19:42:51Z

service/ibmmq-plugin/pom.xml

+    </parent>
+
+    <artifactId>ibmmq-plugin</artifactId>
+    <version>0.0.2-SNAPSHOT</version>


@gregmeldrum question for you, shouldn't all plugin versions match maas-event-management-agent-parent based on current architecture of EMA?

moodiRealist · 2024-01-31T20:05:07Z

service/ibmmq-plugin/pom.xml

+        <dependency>
+            <groupId>com.solace.maas</groupId>
+            <artifactId>plugin</artifactId>
+            <version>1.3.2-SNAPSHOT</version>


this version needs to change before merge as well.

moodiRealist · 2024-01-31T20:21:16Z

...solace/maas/ep/event/management/agent/plugin/ibmmq/manager/client/IbmMqClientConfigImpl.java

@@ -0,0 +1,21 @@
+/**
+ *
+ */


I don't think these empty comment blocks are needed.

moodiRealist · 2024-01-31T20:22:46Z

...olace/maas/ep/event/management/agent/plugin/ibmmq/manager/client/IbmMqClientManagerImpl.java

+    @Override
+    public IbmMqHttpClient getClient(ConnectionDetailsEvent connectionDetailsEvent) {
+
+        log.trace("Creating IBMMQ-HTTP client for messaging service [{}].",


please user event broker instead of messaging service

moodiRealist · 2024-01-31T20:23:30Z

...va/com/solace/maas/ep/event/management/agent/plugin/ibmmq/processor/IbmMqQueueProcessor.java

+    public IbmMqQueueProcessor(MessagingServiceDelegateService messagingServiceDelegateService) {
+        super();
+        this.messagingServiceDelegateService = messagingServiceDelegateService;
+        log.debug("### In Queue Processor ###");


This log seems to be a remnant of a debugging effort

moodiRealist · 2024-01-31T20:29:32Z

service/pom.xml

@@ -22,6 +22,7 @@
        <module>local-storage-plugin</module>
        <module>confluent-schema-registry-plugin</module>
        <module>application</module>
+        <module>ibmmq-plugin</module>


Please also update the README files to mention this plugin and examples similar to the existing ones.

Ushnash · 2024-02-20T22:43:01Z

@moodiRealist
Could you please re-review the latest changes? I've addressed the feedback. Thank you!

gregmeldrum · 2024-02-21T16:57:11Z

There are some build problems with the current iteration. I tried fixing this and ran into some library version collisions. I think I fixed it all now. I can either update your original branch if you give me access to create a branch, or you can apply the following changes:

diff --git a/service/application/pom.xml b/service/application/pom.xml
index 8fa53d1..b9a370a 100644
--- a/service/application/pom.xml
+++ b/service/application/pom.xml
@@ -248,9 +248,9 @@
             <version>1.6.1-SNAPSHOT</version>
         </dependency>
        <dependency>
-            <groupId>com.solace.maas</groupId>
+            <groupId>com.solace.maas.plugin.ibmmq</groupId>
             <artifactId>ibmmq-plugin</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>

         <dependency>
diff --git a/service/ibmmq-plugin/pom.xml b/service/ibmmq-plugin/pom.xml
index c842d5e..c5fa79d 100644
--- a/service/ibmmq-plugin/pom.xml
+++ b/service/ibmmq-plugin/pom.xml
@@ -3,6 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.solace.maas.plugin.ibmmq</groupId>
     <artifactId>ibmmq-plugin</artifactId>
     <version>1.6.1-SNAPSHOT</version>
     <name>Solace Event Management Agent - IBM MQ Plugin</name>
@@ -11,10 +12,11 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <solace.maas.ema.version>1.6.1-SNAPSHOT</solace.maas.ema.version>
-        <spring.cloud.openfeign.version>4.1.0</spring.cloud.openfeign.version>
-        <openfeign.jackson.version>13.0</openfeign.jackson.version>
+        <spring-boot-version>3.1.7</spring-boot-version>
+        <spring.cloud.openfeign.version>4.0.6</spring.cloud.openfeign.version>
+        <openfeign.jackson.version>13.2</openfeign.jackson.version>
         <okhttp.version>4.0.1</okhttp.version>
+        <camel.version>4.2.0</camel.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

@@ -22,6 +24,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -36,7 +39,7 @@
         <dependency>
             <groupId>com.solace.maas</groupId>
             <artifactId>plugin</artifactId>
-            <version>${solace.maas.ema.version}</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -48,6 +51,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/service/pom.xml b/service/pom.xml
index fd45818..054ea38 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -21,8 +21,8 @@
         <module>terraform-plugin</module>
         <module>local-storage-plugin</module>
         <module>confluent-schema-registry-plugin</module>
-        <module>application</module>
         <module>ibmmq-plugin</module>
+        <module>application</module>
     </modules>

Synching with upstream EMA origin.

moodiRealist

Looks good to me. @gregmeldrum do you have any final comments?

gregmeldrum · 2024-03-04T13:53:59Z

Please make the following changes and then we'll merge it:

diff --git a/service/ibmmq-plugin/pom.xml b/service/ibmmq-plugin/pom.xml
index 124676e..ade49a1 100644
--- a/service/ibmmq-plugin/pom.xml
+++ b/service/ibmmq-plugin/pom.xml
@@ -5,16 +5,16 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.solace.maas.plugin.ibmmq</groupId>
     <artifactId>ibmmq-plugin</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
     <name>Solace Event Management Agent - IBM MQ Plugin</name>
     <description>Solace Event Management Agent - IBM MQ Plugin</description>

     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <solace.maas.ema.version>1.6.1-SNAPSHOT</solace.maas.ema.version>
-        <spring.boot.version>3.1.7</spring.boot.version>
-        <spring.cloud.openfeign.version>4.1.0</spring.cloud.openfeign.version>
+        <solace.maas.ema.version>1.6.2-SNAPSHOT</solace.maas.ema.version>
+        <spring.boot.version>3.1.9</spring.boot.version>
+        <spring.cloud.openfeign.version>4.0.6</spring.cloud.openfeign.version>
         <openfeign.jackson.version>13.0</openfeign.jackson.version>
         <okhttp.version>4.0.1</okhttp.version>
         <camel.version>4.2.0</camel.version>
@@ -77,4 +77,4 @@
             </plugin>
         </plugins>
     </build>

…EST client. Also, updated version to match parent.

Ushnash · 2024-03-08T05:13:58Z

I've updated some plugin internals & made the version current with the plugin. Please review @moodiRealist

moodiRealist · 2024-03-08T13:15:19Z

service/ibmmq-plugin/pom.xml

+        <!--
+                <spring.cloud.openfeign.version>4.0.6</spring.cloud.openfeign.version>
+                <openfeign.jackson.version>13.0</openfeign.jackson.version>
+        -->


If the commented out code is deadcode, please remove them.

moodiRealist · 2024-03-08T13:18:29Z

service/ibmmq-plugin/pom.xml

+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <solace.maas.ema.version>1.6.3-SNAPSHOT</solace.maas.ema.version>
+        <spring.boot.version>3.1.8</spring.boot.version>


I believe we use spring.boot.version 3.1.9 in other places, was there a specific reason you didn't go with that version?

Catch up to upstream repo

Feature/merg with upstream

Ushnash added 2 commits December 19, 2023 12:44

adding ibmmq plugin

2323fad

Merge remote-tracking branch 'refs/remotes/origin/main'

76d72a9

moodiRealist reviewed Jan 31, 2024

View reviewed changes

service/application/src/main/resources/application.yml Outdated Show resolved Hide resolved

moodiRealist reviewed Jan 31, 2024

View reviewed changes

Ushnash added 2 commits February 8, 2024 22:20

Merge branch 'SolaceProducts:main' into main

d2f7671

Merge branch 'SolaceProducts:main' into main

d7e6dc1

Ushnash had a problem deploying to build_pr February 15, 2024 16:30 — with GitHub Actions Failure

Ushnash added 2 commits February 20, 2024 12:05

Merge branch 'SolaceProducts:main' into main

7afe820

updating with review suggestions from PR SolaceProducts#148

6e65a31

Ushnash added 3 commits February 21, 2024 23:06

updating/adding version numbers

696d92d

Merge branch 'SolaceProducts:main' into main

6535a7c

Merge branch 'main' of https://github.com/Ushnash/event-management-agent

c1de132

Synching with upstream EMA origin.

moodiRealist approved these changes Feb 28, 2024

View reviewed changes

Merge branch 'SolaceProducts:main' into main

771f5ed

Ushnash had a problem deploying to build_pr March 4, 2024 13:36 — with GitHub Actions Failure

Ushnash added 2 commits March 7, 2024 17:54

Merge branch 'SolaceProducts:main' into main

675112d

Replaced OpenFeign with Spring-native HTTPInterface for declarative R…

dbebe96

…EST client. Also, updated version to match parent.

moodiRealist reviewed Mar 8, 2024

View reviewed changes

gregmeldrum self-requested a review March 8, 2024 13:35

spencerhank and others added 3 commits May 7, 2024 09:08

Merge remote-tracking branch 'upstream/main'

62f0a78

Catch up to upstream repo

merge with upstream and update ibm mq documentation

635e70d

Merge pull request #1 from Ushnash/feature/merg-with-upstream

fafcd80

Feature/merg with upstream

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding IBMMQ Discovery Agent #148

Adding IBMMQ Discovery Agent #148

Ushnash commented Dec 19, 2023

moodiRealist Jan 31, 2024

moodiRealist Jan 31, 2024

Ushnash Feb 20, 2024

moodiRealist Jan 31, 2024

moodiRealist Jan 31, 2024

moodiRealist Jan 31, 2024

moodiRealist Jan 31, 2024

moodiRealist Jan 31, 2024

moodiRealist Jan 31, 2024

Ushnash commented Feb 20, 2024

gregmeldrum commented Feb 21, 2024

moodiRealist left a comment

gregmeldrum commented Mar 4, 2024

Ushnash commented Mar 8, 2024 •

edited

Loading

moodiRealist Mar 8, 2024

moodiRealist Mar 8, 2024

@@ @@ -0,0 +1,21 @@ @@
+              /**
+               *
+               */

Adding IBMMQ Discovery Agent #148

Are you sure you want to change the base?

Adding IBMMQ Discovery Agent #148

Conversation

Ushnash commented Dec 19, 2023

What is the purpose of this change?

How was this change implemented?

How was this change tested?

Is there anything the reviewers should focus on/be aware of?

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ushnash commented Feb 20, 2024

gregmeldrum commented Feb 21, 2024

moodiRealist left a comment

Choose a reason for hiding this comment

gregmeldrum commented Mar 4, 2024

Ushnash commented Mar 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ushnash commented Mar 8, 2024 •

edited

Loading