1.1.2 fixing SNS publish batch-size issue

.github/workflows/main-ci-only.yml

@@ -4,9 +4,9 @@ name: CI-Only Workflow
 on:
   push:
     branches-ignore:
-      - master
-      - int
-      - develop
+      - v1_master
+      - v1_int
+      - v1_develop
 
 jobs:
   ### Job to Build and Publish artifacts

.github/workflows/main-dev-deploy.yml

@@ -4,7 +4,7 @@ name: Dev Workflow
 on:
   push:
     branches:
-      - develop
+      - v1_develop
   #workflow_dispatch:
   #pull_request:
     #types:

.github/workflows/main-e2e-deploy.yml

@@ -4,7 +4,7 @@ name: E2E Workflow
 on:
   push:
     branches:
-      - int
+      - v1_int
 
 jobs:
   ### Job to Build and Publish artifacts
@@ -42,7 +42,7 @@ jobs:
     with:
       aws-region: ${{ vars.AWS_REGION }}
       codedeploy-app-name: ${{ vars.CODEDEPLOY_APP_NAME }}
-      codedeploy-group-name: ${{ vars.CODEDEPLOY_E2E_GROUP_NAME }}
+      codedeploy-group-name: Naksha_STG_Deployment_Group
       deployment-description: 'Deployment triggered by ${{ github.triggering_actor }} from Github repo [${{ github.repository }}], ${{ github.ref_type }} [${{ github.ref_name }}], commit sha [${{ github.sha }}]'
       s3-bucket-name: ${{ vars.RELEASE_S3_BUCKET_NAME }}
       s3-artifact-path: ${{ needs.S3-CodeDeploy-Release.outputs.s3-artifact-path }}

.github/workflows/reusable-build-and-publish.yml

@@ -48,7 +48,7 @@ jobs:
           cp -p $SERVICE_JAR_DIR/xyz-hub-service.jar $CODEDEPLOY_DIR/contents/xyz-hub/
       - name: List CodeDeploy artifact content
         run: |
-          ls -lR $CODEDEPLOY_DIR
+          ls -lRa $CODEDEPLOY_DIR
       - name: Save pipeline artifact name
         id: save-artifact-name
         run: echo "name=${{ env.GITHUB_CODEDEPLOY_ARTIFACT_NAME }}" >> "$GITHUB_OUTPUT"
@@ -58,6 +58,7 @@ jobs:
           name: ${{ env.GITHUB_CODEDEPLOY_ARTIFACT_NAME }}
           path: ${{ env.CODEDEPLOY_DIR }}
           if-no-files-found: error
+          include-hidden-files: true
       - name: Identify and save Application version
         id: save-app-version
         run: |

.github/workflows/reusable-s3-codedeploy-release.yml

@@ -49,7 +49,7 @@ jobs:
           path: download
       - name: List CodeDeploy artifacts
         run: |
-          ls -lR download/
+          ls -lRa download/
       - name: Preparing S3 artifact name
         id: s3-artifact-name
         run: |

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Naksha_1.1.2
+
+- Fixed batch-size failure issue for SNS publishing where one of the message fails during publish, then we optimize by continuing from that failure instead of re-processing entire batch 
+
 ## Naksha_1.1.1
 
 - Introduced new query parameter `rlock` to indicate whether API transaction should `WAIT` or `ABORT` when there is DB row-level lock found during Updates.

pom.xml

@@ -41,7 +41,7 @@
 
   <groupId>com.here.xyz</groupId>
   <artifactId>xyz-hub</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
 
   <modules>

xyz-connectors/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

xyz-hub-service/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

xyz-hub-test/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

xyz-models/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

xyz-psql-connector/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

xyz-txn-handler/pom.xml

@@ -25,7 +25,7 @@
         <groupId>com.here.xyz</groupId>
         <artifactId>xyz-hub</artifactId>
         <relativePath>../</relativePath>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <licenses>

xyz-txn-handler/src/main/java/com/here/xyz/pub/handlers/PubTxnListHandler.java

@@ -46,10 +46,15 @@ public void run() {
                 return;
             }
             // Handover transactions to appropriate Publisher (e.g. DefaultSNSPublisher)
-            final PublishEntryDTO lastTxn = PubUtil.getPubInstance(sub).publishTransactions(pubCfg, sub, txnList, lastTxnId, lastTxnRecId);
-
-            // Update last txn_id in AdminDB::xyz_config::xyz_txn_pub table
-            PubDatabaseHandler.saveLastTxnId(adminDBConnParams, subId, lastTxn);
+            PublishEntryDTO lastTxn = null;
+            try {
+                lastTxn = PubUtil.getPubInstance(sub).publishTransactions(pubCfg, sub, txnList, lastTxnId, lastTxnRecId);
+            } finally {
+                if (lastTxn != null) {
+                    // Update last txn_id in AdminDB::xyz_config::xyz_txn_pub table
+                    PubDatabaseHandler.saveLastTxnId(adminDBConnParams, subId, lastTxn);
+                }
+            }
         } catch (Exception ex) {
             logger.error("{} - Exception in publisher job for subId={}, spaceId={}. ",
                     PubLogConstants.LOG_CODE_PUBLISH_ERROR, subId, spaceId, ex);