Merge branch 'development'

Author: jclausen

.github/workflows/ci.yml

@@ -29,12 +29,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "11"

.github/workflows/gh-release.yml

@@ -10,10 +10,9 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.2.0
-      - uses: taiki-e/create-gh-release-action@v1.5.0
+      - uses: actions/checkout@v4
+      - uses: taiki-e/create-gh-release-action@v1.8.2
         with:
           # Produced by the build/Build.cfc
           changelog: changelog.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
 
       - uses: Ortus-Solutions/[email protected]
         with:

.github/workflows/tests.yml

@@ -40,10 +40,10 @@ jobs:
             experimental: true
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
 
       - name: Setup Java
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "${{ matrix.javaVersion }}"
@@ -62,7 +62,7 @@ jobs:
 
       - name: Scan project file system
         id: scan
-        uses: anchore/scan-action@v2
+        uses: anchore/scan-action@v5
         with:
           path: "./"
           fail-build: true
@@ -108,9 +108,9 @@ jobs:
 
       - name: Upload Test Results to Artifacts
         if: always()
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results-${{ matrix.cfengine }}
+          name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}-jdk${{ matrix.javaVersion }}-es${{ matrix.ELASTICSEARCH_VERSION }}
           path: |
             test-harness/tests/results/**/*
 
@@ -121,9 +121,9 @@ jobs:
 
       - name: Upload Debugging Log To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
-          name: Failure Debugging Info - ${{ matrix.cfengine }}
+          name: Failure Debugging Info - ${{ matrix.cfengine }} | Coldbox ${{ matrix.coldboxVersion }} ( jdk${{ matrix.javaVersion }}-es${{ matrix.ELASTICSEARCH_VERSION }} )
           path: |
             .engine/**/logs/*
             .engine/**/WEB-INF/cfusion/logs/*

ModuleConfig.cfc

@@ -75,7 +75,8 @@ component {
 		interceptorSettings = {
 			customInterceptionPoints : [
 				"cbElasticsearchPreSave",
-				"cbElasticsearchPostSave"
+				"cbElasticsearchPostSave",
+				"onLogstashEntryCreate"
 			]
 		};
 

box.json

@@ -1,8 +1,8 @@
 {
     "name":"Elasticsearch for the Coldbox Framework",
-    "author":"Ortus Solutions <[email protected]",
+    "author":"Ortus Solutions <[email protected]>",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbelasticsearch/@build.version@/[email protected]@[email protected]@.zip",
-    "version":"3.4.1",
+    "version":"3.4.2",
     "slug":"cbelasticsearch",
     "type":"modules",
     "homepage":"https://cbelasticsearch.ortusbooks.com",

build/resources/elasticsearch.yml

@@ -2,4 +2,7 @@ discovery.type: "single-node"
 cluster.name: "docker-cluster"
 xpack.security.enabled: "false"
 network.host: 0.0.0.0
-path.repo: ["/tmp"]
+path.repo: ["/tmp"]
+
+# ES 8 requires explicit setting of the following
+# xpack.security.enabled: false

changelog.md

@@ -7,7 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * * *
 
-## [Unreleased]
+## [3.4.1] - 2024-11-10
+
+### Added
+
+- Add `onLogstashEntryCreate` interception point, to allow influencing and additions to final log object
+- Add `mode` argument to client `saveAll` method to allow for a `create` mode to be used for data streams
 
 ## [3.4.1] - 2024-09-26
 

models/io/HyperClient.cfc

@@ -1230,7 +1230,8 @@ component accessors="true" threadSafe singleton {
 	array function saveAll(
 		required array documents,
 		boolean throwOnError = false,
-		struct params        = {}
+		struct params        = {},
+		string mode = "update"
 	){
 		var requests = [];
 
@@ -1259,10 +1260,22 @@ component accessors="true" threadSafe singleton {
 				}
 			}
 
+			var opAction = { "#mode#" : { "_index" : doc.getIndex() } };
+
+			if( !isNull( doc.getId() ) ){
+				opAction[ mode ][ "_id" ] = doc.getId();
+			}
+
+			var docAction = { "doc" : memento };
+
+			if( mode == "update" ){
+				docAction[ "doc_as_upsert" ] = true;
+			}
+
 			requests.append(
 				[
-					{ "update" : { "_index" : doc.getIndex(), "_id" : doc.getId() } },
-					{ "doc" : memento, "doc_as_upsert" : true }
+					opAction,
+					docAction
 				],
 				true
 			);

models/util/Util.cfc

@@ -1,6 +1,7 @@
 component accessors="true" singleton {
 
 	property name="appEnvironment" inject="box:setting:environment";
+	property name="interceptorService" inject="coldbox:InterceptorService";
 
 	/**
 	 * Ensures a CF native struct is returned ( allowing for dot-notation )
@@ -158,6 +159,8 @@ component accessors="true" singleton {
 		}
 
 		generateLogEntrySignature( logObj );
+
+		interceptorService.announce( "onLogstashEntryCreate", { "entry" : logObj } );
 	}
 
 	/**

test-harness/tests/specs/unit/AppenderServiceTest.cfc

@@ -109,7 +109,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
                         "Test message",
                         4
                     );
-                    sleep( 1000 );
+                    sleep( 1500 );
                     expect( getDataStreamCount( appender.getProperty( "dataStreamPattern" ) ) ).toBe( dataStreamCount + 1 );
                 } );