Update for ibmmq format

Author: liornabat

README.md

@@ -119,6 +119,8 @@ data:
           queue_name: YOUR.QUEUE
           username: your-username
           password: your-password
+          # message_format: MQHRF2
+          # message_ccsid: 1208
           poll_interval_ms: 100
       - name: ibm_to_kubemq
         type: ibm_mq_to_kubemq
@@ -158,7 +160,7 @@ spec:
     spec:
       containers:
         - name: kubemq-ibmmq-connector
-          image: europe-docker.pkg.dev/kubemq/images/ibm-mq-connector:v0.1.0
+          image: europe-docker.pkg.dev/kubemq/images/ibm-mq-connector:v0.4.0
           volumeMounts:
             - name: config-volume
               mountPath: /app/config.yaml

Taskfile.yml

@@ -3,7 +3,7 @@
 version: '3'
 
 vars:
-  VERSION: v0.2.0
+  VERSION: v0.4.0
   IMAGE_NAME: europe-docker.pkg.dev/kubemq/images/ibm-mq-connector
 
 tasks:
@@ -42,3 +42,6 @@ tasks:
     cmds:
       - kubectl config use-context gke_ji-portal-v2_us-central1_ai-agent-cluster
       - kubectl apply -k . -n default
+  deploy-ibmmq:
+    cmds:
+      - docker run --env LICENSE=accept --env MQ_QMGR_NAME=QM1 --publish 1414:1414 --publish 9443:9443 --detach --env MQ_APP_PASSWORD=passw0rd  ibmcom/mq:latest

depolyments/k8s/config.yaml

@@ -20,6 +20,8 @@ data:
           queue_name: SECUREAPP.QUEUE
           username: admin
           password: Passw0rd
+          # message_format: MQHRF2
+          # message_ccsid: 870
           poll_interval_ms: 100
     
       - name: ibm_to_kubemq

src/ibm_mq/client.py

@@ -56,7 +56,9 @@ def _connect(self):
                 "cd": cd,
                 "opts": connect_options,
                 "user": self.config.username.encode("utf-8"),
-                "password": self.config.password.encode("utf-8"),
+                "password": (
+                    self.config.password.encode("utf-8") if self.config.password else ""
+                ),
             }
 
             if sco is not None:
@@ -80,8 +82,6 @@ def _connect(self):
         self.is_connected = True
         self.logger.info("Connected to IBM MQ")
 
-
-
     def _disconnect(self):
         try:
             if not self.is_connected:
@@ -156,7 +156,11 @@ async def send_message(self, message: bytes):
         async def _send_message():
             try:
                 self.logger.info("Sending message to IBM MQ")
-                await asyncio.to_thread(self.queue.put, message)
+                md = pymqi.MD()
+                md.Format = self.config.get_md_format()
+                if self.config.message_ccsid > 0:
+                    md.CodedCharSetId = self.config.message_ccsid
+                await asyncio.to_thread(self.queue.put, message, md)
                 self.logger.info("Message sent successfully")
             except Exception as e:
                 self.logger.error(f"Error sending message: {str(e)}")

src/ibm_mq/config.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 from pydantic import BaseModel, Field, model_validator
+import pymqi
 
 
 class Config(BaseModel):
@@ -13,8 +14,8 @@ class Config(BaseModel):
     queue_name: str = Field(default=None, description="Queue name")
     username: str = Field(default=None, description="Username")
     password: Optional[str] = Field(default=None, description="Password")
-    message_ccsid: int = Field(default=1208, description="CCSID")
-    message
+    message_ccsid: Optional[int] = Field(default=1208, description="CCSID")
+    message_format: Optional[str] = Field(default="", description="Message format")
     poll_interval_ms: int = Field(
         default=100, ge=1, description="Poll interval in milliseconds"
     )
@@ -38,3 +39,31 @@ def validate_ssl_fields(self):
             if not self.key_repo_location:
                 raise ValueError("key_repo_location is required when ssl is True")
         return self
+
+    def get_md_format(self) -> bytes:
+        format_map = {
+            "": pymqi.CMQC.MQFMT_NONE,
+            "MQADMIN": pymqi.CMQC.MQFMT_ADMIN,
+            "MQAMQP": pymqi.CMQC.MQFMT_AMQP,
+            "MQCHCOM": pymqi.CMQC.MQFMT_CHANNEL_COMPLETED,
+            "MQCICS": pymqi.CMQC.MQFMT_CICS,
+            "MQCMD1": pymqi.CMQC.MQFMT_COMMAND_1,
+            "MQCMD2": pymqi.CMQC.MQFMT_COMMAND_2,
+            "MQDEAD": pymqi.CMQC.MQFMT_DEAD_LETTER_HEADER,
+            "MQHDIST": pymqi.CMQC.MQFMT_DIST_HEADER,
+            "MQHEPCF": pymqi.CMQC.MQFMT_EVENT,
+            "MQEVENT": pymqi.CMQC.MQFMT_EVENT,
+            "MQIMS": pymqi.CMQC.MQFMT_IMS,
+            "MQIMSVS": pymqi.CMQC.MQFMT_IMS_VAR_STRING,
+            "MQHMDE": pymqi.CMQC.MQFMT_MD_EXTENSION,
+            "MQPCF": pymqi.CMQC.MQFMT_PCF,
+            "MQHREF": pymqi.CMQC.MQFMT_REF_MSG_HEADER,
+            "MQHRF": pymqi.CMQC.MQFMT_RF_HEADER,
+            "MQHRF2": pymqi.CMQC.MQFMT_RF_HEADER_2,
+            "MQSTR": pymqi.CMQC.MQFMT_STRING,
+            "MQTRIG": pymqi.CMQC.MQFMT_TRIGGER,
+            "MQHWIH": pymqi.CMQC.MQFMT_WORK_INFO_HEADER,
+            "MQXMIT": pymqi.CMQC.MQFMT_XMIT_Q_HEADER,
+        }
+        clean_format = self.message_format.strip().upper()
+        return format_map.get(clean_format, pymqi.CMQC.MQFMT_NONE)