Update for MQ 9.3.4

- ibmmq - Support for new CSP JWT Token field
ibm-messaging · Oct 19, 2023 · b349c31 · b349c31
1 parent c685772
commit b349c31
Show file tree

Hide file tree

Showing 25 changed files with 441 additions and 153 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## Oct 19 2023 - v5.5.1
+- Update for MQ 9.3.4
+- ibmmq - Support for new CSP JWT Token field
+- mqmetric - metrics.txt now includes the published resource metrics, automatically generated 
+             from product documentation 
+- Refresh links to IBM documentation
+
 ## Jun 21 2023 - v5.5.0
 - Update for MQ 9.3.3
 - mqmetric - Configurable timeout for status queries (ibm-messaging/mq-metric-samples#227)
+- Add linux_arm64 definitions
 
 ## Feb 17 2023 - v5.4.0
 - Update for MQ 9.3.2

diff --git a/Dockerfile b/Dockerfile
@@ -60,7 +60,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
 # Location of the downloadable MQ client package \
 ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
     RDTAR="IBM-MQC-Redist-Linux${MQARCH}.tar.gz" \
-    VRMF=9.3.3.0
+    VRMF=9.3.4.0
 
 # Install the MQ client from the Redistributable package. This also contains the
 # header files we need to compile against. Setup the subset of the package
@@ -76,8 +76,8 @@ RUN cd /opt/mqm \
  && bin/genmqpkg.sh -b /opt/mqm
 
 # Insert the script that will do the build
-COPY buildInDocker.sh $GOPATH
-RUN chmod 777 $GOPATH/buildInDocker.sh
+COPY --chmod=777 buildInDocker.sh $GOPATH
+# RUN chmod 777 $GOPATH/buildInDocker.sh
 
 # Copy the rest of the source tree from this directory into the container
 # And make sure it's readable by the id that will run the compiles (not just root)

diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ let me know, via an issue, if you have another project that might be suitable fo
 |[ibm-messaging/mq-metric-samples](https://github.com/ibm-messaging/mq-metric-samples)| Extracts metrics for use in Prometheus, Influx<br>JSON consumers etc.|
 |[ibm-messaging/mq-golang-jms20](https://github.com/ibm-messaging/mq-golang-jms20)   | JMS-style messaging interface for Go applications|
 |[ibm-messaging/mq-container](https://github.com/ibm-messaging/mq-container)         | Building MQ into containers. Uses features from this package<br>for configuration and monitoring  |
-|[felix-lessoer/qbeat](https://github.com/felix-lessoer/qbeat)                       | Extract monitoring and statstics from MQ for use in Elasticsearch|
+|[felix-lessoer/qbeat](https://github.com/felix-lessoer/qbeat)                       | Extract monitoring and statistics from MQ for use in Elasticsearch|
 |[ibm-messaging/mq-mqi-nodejs](https://github.com/ibm-messaging/mq-mqi-nodejs)       | A similar MQI interface for Node.js applications|
 
 ## Limitations

diff --git a/ibmmq/cmqc_aix.go b/ibmmq/cmqc_aix.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  5/31/23 12:58 PM
-*   Build Level:   p933-L230531
+*   Generated on:  9/27/23 11:53 AM
+*   Build Level:   p934-L230927
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 933
+	MQCMDL_CURRENT_LEVEL           int32  = 934
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1083,6 +1083,7 @@ const (
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
 	MQCMDL_LEVEL_933               int32  = 933
+	MQCMDL_LEVEL_934               int32  = 934
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -1370,14 +1371,17 @@ const (
 	MQCRC_PROGRAM_NOT_AVAILABLE    int32  = 7
 	MQCRC_SECURITY_ERROR           int32  = 6
 	MQCRC_TRANSID_NOT_AVAILABLE    int32  = 9
+	MQCSP_AUTH_ID_TOKEN            int32  = 2
 	MQCSP_AUTH_NONE                int32  = 0
 	MQCSP_AUTH_USER_ID_AND_PWD     int32  = 1
-	MQCSP_CURRENT_LENGTH           int32  = 80
-	MQCSP_CURRENT_VERSION          int32  = 2
+	MQCSP_CURRENT_LENGTH           int32  = 104
+	MQCSP_CURRENT_VERSION          int32  = 3
 	MQCSP_LENGTH_1                 int32  = 56
 	MQCSP_LENGTH_2                 int32  = 80
+	MQCSP_LENGTH_3                 int32  = 104
 	MQCSP_VERSION_1                int32  = 1
 	MQCSP_VERSION_2                int32  = 2
+	MQCSP_VERSION_3                int32  = 3
 	MQCSRV_CONVERT_NO              int32  = 0
 	MQCSRV_CONVERT_YES             int32  = 1
 	MQCSRV_DLQ_NO                  int32  = 0
@@ -4135,6 +4139,7 @@ const (
 	MQRC_TERMINATION_FAILED        int32  = 2287
 	MQRC_TMC_ERROR                 int32  = 2191
 	MQRC_TM_ERROR                  int32  = 2265
+	MQRC_TOKEN_TIMESTAMP_NOT_VALID int32  = 2064
 	MQRC_TOPIC_NOT_ALTERABLE       int32  = 2510
 	MQRC_TOPIC_STRING_ERROR        int32  = 2425
 	MQRC_TRIGGER_CONTROL_ERROR     int32  = 2075
@@ -4991,6 +4996,7 @@ const (
 	MQ_CREATION_DATE_LENGTH        int32  = 12
 	MQ_CREATION_TIME_LENGTH        int32  = 8
 	MQ_CSP_PASSWORD_LENGTH         int32  = 256
+	MQ_CSP_TOKEN_LENGTH            int32  = 8192
 	MQ_CUSTOM_LENGTH               int32  = 128
 	MQ_DATA_SET_NAME_LENGTH        int32  = 44
 	MQ_DATE_LENGTH                 int32  = 12

diff --git a/ibmmq/cmqc_darwin.go b/ibmmq/cmqc_darwin.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  5/31/23 12:58 PM
-*   Build Level:   p933-L230531
+*   Generated on:  9/27/23 11:53 AM
+*   Build Level:   p934-L230927
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 933
+	MQCMDL_CURRENT_LEVEL           int32  = 934
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1083,6 +1083,7 @@ const (
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
 	MQCMDL_LEVEL_933               int32  = 933
+	MQCMDL_LEVEL_934               int32  = 934
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -1370,14 +1371,17 @@ const (
 	MQCRC_PROGRAM_NOT_AVAILABLE    int32  = 7
 	MQCRC_SECURITY_ERROR           int32  = 6
 	MQCRC_TRANSID_NOT_AVAILABLE    int32  = 9
+	MQCSP_AUTH_ID_TOKEN            int32  = 2
 	MQCSP_AUTH_NONE                int32  = 0
 	MQCSP_AUTH_USER_ID_AND_PWD     int32  = 1
-	MQCSP_CURRENT_LENGTH           int32  = 80
-	MQCSP_CURRENT_VERSION          int32  = 2
+	MQCSP_CURRENT_LENGTH           int32  = 104
+	MQCSP_CURRENT_VERSION          int32  = 3
 	MQCSP_LENGTH_1                 int32  = 56
 	MQCSP_LENGTH_2                 int32  = 80
+	MQCSP_LENGTH_3                 int32  = 104
 	MQCSP_VERSION_1                int32  = 1
 	MQCSP_VERSION_2                int32  = 2
+	MQCSP_VERSION_3                int32  = 3
 	MQCSRV_CONVERT_NO              int32  = 0
 	MQCSRV_CONVERT_YES             int32  = 1
 	MQCSRV_DLQ_NO                  int32  = 0
@@ -4135,6 +4139,7 @@ const (
 	MQRC_TERMINATION_FAILED        int32  = 2287
 	MQRC_TMC_ERROR                 int32  = 2191
 	MQRC_TM_ERROR                  int32  = 2265
+	MQRC_TOKEN_TIMESTAMP_NOT_VALID int32  = 2064
 	MQRC_TOPIC_NOT_ALTERABLE       int32  = 2510
 	MQRC_TOPIC_STRING_ERROR        int32  = 2425
 	MQRC_TRIGGER_CONTROL_ERROR     int32  = 2075
@@ -4991,6 +4996,7 @@ const (
 	MQ_CREATION_DATE_LENGTH        int32  = 12
 	MQ_CREATION_TIME_LENGTH        int32  = 8
 	MQ_CSP_PASSWORD_LENGTH         int32  = 256
+	MQ_CSP_TOKEN_LENGTH            int32  = 8192
 	MQ_CUSTOM_LENGTH               int32  = 128
 	MQ_DATA_SET_NAME_LENGTH        int32  = 44
 	MQ_DATE_LENGTH                 int32  = 12

diff --git a/ibmmq/cmqc_linux_amd64.go b/ibmmq/cmqc_linux_amd64.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  5/31/23 12:58 PM
-*   Build Level:   p933-L230531
+*   Generated on:  9/27/23 11:53 AM
+*   Build Level:   p934-L230927
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 933
+	MQCMDL_CURRENT_LEVEL           int32  = 934
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1083,6 +1083,7 @@ const (
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
 	MQCMDL_LEVEL_933               int32  = 933
+	MQCMDL_LEVEL_934               int32  = 934
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -1370,14 +1371,17 @@ const (
 	MQCRC_PROGRAM_NOT_AVAILABLE    int32  = 7
 	MQCRC_SECURITY_ERROR           int32  = 6
 	MQCRC_TRANSID_NOT_AVAILABLE    int32  = 9
+	MQCSP_AUTH_ID_TOKEN            int32  = 2
 	MQCSP_AUTH_NONE                int32  = 0
 	MQCSP_AUTH_USER_ID_AND_PWD     int32  = 1
-	MQCSP_CURRENT_LENGTH           int32  = 80
-	MQCSP_CURRENT_VERSION          int32  = 2
+	MQCSP_CURRENT_LENGTH           int32  = 104
+	MQCSP_CURRENT_VERSION          int32  = 3
 	MQCSP_LENGTH_1                 int32  = 56
 	MQCSP_LENGTH_2                 int32  = 80
+	MQCSP_LENGTH_3                 int32  = 104
 	MQCSP_VERSION_1                int32  = 1
 	MQCSP_VERSION_2                int32  = 2
+	MQCSP_VERSION_3                int32  = 3
 	MQCSRV_CONVERT_NO              int32  = 0
 	MQCSRV_CONVERT_YES             int32  = 1
 	MQCSRV_DLQ_NO                  int32  = 0
@@ -4135,6 +4139,7 @@ const (
 	MQRC_TERMINATION_FAILED        int32  = 2287
 	MQRC_TMC_ERROR                 int32  = 2191
 	MQRC_TM_ERROR                  int32  = 2265
+	MQRC_TOKEN_TIMESTAMP_NOT_VALID int32  = 2064
 	MQRC_TOPIC_NOT_ALTERABLE       int32  = 2510
 	MQRC_TOPIC_STRING_ERROR        int32  = 2425
 	MQRC_TRIGGER_CONTROL_ERROR     int32  = 2075
@@ -4991,6 +4996,7 @@ const (
 	MQ_CREATION_DATE_LENGTH        int32  = 12
 	MQ_CREATION_TIME_LENGTH        int32  = 8
 	MQ_CSP_PASSWORD_LENGTH         int32  = 256
+	MQ_CSP_TOKEN_LENGTH            int32  = 8192
 	MQ_CUSTOM_LENGTH               int32  = 128
 	MQ_DATA_SET_NAME_LENGTH        int32  = 44
 	MQ_DATE_LENGTH                 int32  = 12

diff --git a/ibmmq/cmqc_linux_arm64.go b/ibmmq/cmqc_linux_arm64.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  5/31/23 12:58 PM
-*   Build Level:   p933-L230531
+*   Generated on:  9/27/23 11:53 AM
+*   Build Level:   p934-L230927
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 933
+	MQCMDL_CURRENT_LEVEL           int32  = 934
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1083,6 +1083,7 @@ const (
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
 	MQCMDL_LEVEL_933               int32  = 933
+	MQCMDL_LEVEL_934               int32  = 934
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -1370,14 +1371,17 @@ const (
 	MQCRC_PROGRAM_NOT_AVAILABLE    int32  = 7
 	MQCRC_SECURITY_ERROR           int32  = 6
 	MQCRC_TRANSID_NOT_AVAILABLE    int32  = 9
+	MQCSP_AUTH_ID_TOKEN            int32  = 2
 	MQCSP_AUTH_NONE                int32  = 0
 	MQCSP_AUTH_USER_ID_AND_PWD     int32  = 1
-	MQCSP_CURRENT_LENGTH           int32  = 80
-	MQCSP_CURRENT_VERSION          int32  = 2
+	MQCSP_CURRENT_LENGTH           int32  = 104
+	MQCSP_CURRENT_VERSION          int32  = 3
 	MQCSP_LENGTH_1                 int32  = 56
 	MQCSP_LENGTH_2                 int32  = 80
+	MQCSP_LENGTH_3                 int32  = 104
 	MQCSP_VERSION_1                int32  = 1
 	MQCSP_VERSION_2                int32  = 2
+	MQCSP_VERSION_3                int32  = 3
 	MQCSRV_CONVERT_NO              int32  = 0
 	MQCSRV_CONVERT_YES             int32  = 1
 	MQCSRV_DLQ_NO                  int32  = 0
@@ -4135,6 +4139,7 @@ const (
 	MQRC_TERMINATION_FAILED        int32  = 2287
 	MQRC_TMC_ERROR                 int32  = 2191
 	MQRC_TM_ERROR                  int32  = 2265
+	MQRC_TOKEN_TIMESTAMP_NOT_VALID int32  = 2064
 	MQRC_TOPIC_NOT_ALTERABLE       int32  = 2510
 	MQRC_TOPIC_STRING_ERROR        int32  = 2425
 	MQRC_TRIGGER_CONTROL_ERROR     int32  = 2075
@@ -4991,6 +4996,7 @@ const (
 	MQ_CREATION_DATE_LENGTH        int32  = 12
 	MQ_CREATION_TIME_LENGTH        int32  = 8
 	MQ_CSP_PASSWORD_LENGTH         int32  = 256
+	MQ_CSP_TOKEN_LENGTH            int32  = 8192
 	MQ_CUSTOM_LENGTH               int32  = 128
 	MQ_DATA_SET_NAME_LENGTH        int32  = 44
 	MQ_DATE_LENGTH                 int32  = 12

diff --git a/ibmmq/cmqc_linux_ppc64le.go b/ibmmq/cmqc_linux_ppc64le.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  5/31/23 12:58 PM
-*   Build Level:   p933-L230531
+*   Generated on:  9/27/23 11:53 AM
+*   Build Level:   p934-L230927
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 933
+	MQCMDL_CURRENT_LEVEL           int32  = 934
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1083,6 +1083,7 @@ const (
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
 	MQCMDL_LEVEL_933               int32  = 933
+	MQCMDL_LEVEL_934               int32  = 934
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -1370,14 +1371,17 @@ const (
 	MQCRC_PROGRAM_NOT_AVAILABLE    int32  = 7
 	MQCRC_SECURITY_ERROR           int32  = 6
 	MQCRC_TRANSID_NOT_AVAILABLE    int32  = 9
+	MQCSP_AUTH_ID_TOKEN            int32  = 2
 	MQCSP_AUTH_NONE                int32  = 0
 	MQCSP_AUTH_USER_ID_AND_PWD     int32  = 1
-	MQCSP_CURRENT_LENGTH           int32  = 80
-	MQCSP_CURRENT_VERSION          int32  = 2
+	MQCSP_CURRENT_LENGTH           int32  = 104
+	MQCSP_CURRENT_VERSION          int32  = 3
 	MQCSP_LENGTH_1                 int32  = 56
 	MQCSP_LENGTH_2                 int32  = 80
+	MQCSP_LENGTH_3                 int32  = 104
 	MQCSP_VERSION_1                int32  = 1
 	MQCSP_VERSION_2                int32  = 2
+	MQCSP_VERSION_3                int32  = 3
 	MQCSRV_CONVERT_NO              int32  = 0
 	MQCSRV_CONVERT_YES             int32  = 1
 	MQCSRV_DLQ_NO                  int32  = 0
@@ -4135,6 +4139,7 @@ const (
 	MQRC_TERMINATION_FAILED        int32  = 2287
 	MQRC_TMC_ERROR                 int32  = 2191
 	MQRC_TM_ERROR                  int32  = 2265
+	MQRC_TOKEN_TIMESTAMP_NOT_VALID int32  = 2064
 	MQRC_TOPIC_NOT_ALTERABLE       int32  = 2510
 	MQRC_TOPIC_STRING_ERROR        int32  = 2425
 	MQRC_TRIGGER_CONTROL_ERROR     int32  = 2075
@@ -4991,6 +4996,7 @@ const (
 	MQ_CREATION_DATE_LENGTH        int32  = 12
 	MQ_CREATION_TIME_LENGTH        int32  = 8
 	MQ_CSP_PASSWORD_LENGTH         int32  = 256
+	MQ_CSP_TOKEN_LENGTH            int32  = 8192
 	MQ_CUSTOM_LENGTH               int32  = 128
 	MQ_DATA_SET_NAME_LENGTH        int32  = 44
 	MQ_DATE_LENGTH                 int32  = 12