Merge branch 'development'

coldbox-modules · May 3, 2023 · e0d5823 · e0d5823
2 parents ead7cf1 + 5894892
commit e0d5823
Show file tree

Hide file tree

Showing 11 changed files with 376 additions and 139 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,10 +20,26 @@ jobs:
       DB_PASSWORD: root
       AWS_DOMAIN: amazonaws.com
       AWS_REGION: us-east-1
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
+        cfengine:  [ "lucee@5", "adobe@2018", "adobe@2021" ]
+        coldboxVersion: [ "^6.0.0" ]
+        experimental: [ false ]
+        include:
+          - cfengine: "adobe@2023"
+            coldboxVersion: "^6.0.0"
+            experimental: true
+          - coldboxVersion: "be"
+            cfengine: "lucee@5"
+            experimental: true
+          - coldboxVersion: "be"
+            cfengine: "adobe@2018"
+            experimental: true
+          - coldboxVersion: "be"
+            cfengine: "adobe@2021"
+            experimental: true
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -53,21 +69,22 @@ jobs:
           printf "AWS_REGION=${{ env.AWS_REGION }}\n" >> .env
           printf "AWS_DOMAIN=${{ env.AWS_DOMAIN }}\n" >> .env
           printf "ENGINE=${{ matrix.cfengine }}\n" >> .env
+          printf "COLDBOX_VERSION=${{ matrix.coldboxVersion }}\n" >> .env
+
 
       - name: Setup CommandBox CLI
         uses: Ortus-Solutions/[email protected]
 
-      - name: Install Dependencies
+      - name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
         run: |
-          box run-script install:dependencies
+          box install
+          cd test-harness
+          box package set dependencies.coldbox=${{ matrix.coldboxVersion }}
+          box install
 
       - name: Start ${{ matrix.cfengine }} Server
         run: |
           box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
-          # Install Adobe 2021 cfpm modules
-          if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
-            box run-script install:2021
-          fi
           curl http://127.0.0.1:60299
 
       - name: Run Tests

diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -20,27 +20,32 @@ component {
 	function configure(){
 		// Settings
 		variables.settings = {
-			accessKey                  : "",
-			autoContentType            : false,
-			autoMD5                    : false,
-			awsDomain                  : "amazonaws.com",
-			awsRegion                  : "us-east-1",
-			debug                      : false,
-			defaultACL                 : "public-read",
-			defaultBucketName          : "",
-			defaultCacheControl        : "no-store, no-cache, must-revalidate",
-			defaultDelimiter           : "/",
-			defaultStorageClass        : "STANDARD",
-			defaultTimeOut             : 300,
-			encryptionCharset          : "utf-8",
-			retriesOnError             : 3,
-			secretKey                  : "",
-			serviceName                : "s3",
-			signatureType              : "V4",
-			ssl                        : true,
-			throwOnRequestError        : true,
-			defaultEncryptionAlgorithm : "",
-			defaultEncryptionKey       : ""
+			accessKey                    : "",
+			autoContentType              : false,
+			autoMD5                      : false,
+			awsDomain                    : "amazonaws.com",
+			awsRegion                    : "us-east-1",
+			debug                        : false,
+			defaultACL                   : "public-read",
+			defaultBucketName            : "",
+			defaultCacheControl          : "no-store, no-cache, must-revalidate",
+			defaultDelimiter             : "/",
+			defaultStorageClass          : "STANDARD",
+			defaultTimeOut               : 300,
+			encryptionCharset            : "utf-8",
+			retriesOnError               : 3,
+			secretKey                    : "",
+			serviceName                  : "s3",
+			signatureType                : "V4",
+			ssl                          : true,
+			throwOnRequestError          : true,
+			defaultEncryptionAlgorithm   : "",
+			defaultEncryptionKey         : "",
+			defaultObjectOwnership       : "ObjectWriter",
+			defaultBlockPublicAcls       : false,
+			defaultIgnorePublicAcls      : false,
+			defaultBlockPublicPolicy     : false,
+			defaultRestrictPublicBuckets : false
 		};
 	}
 
@@ -70,7 +75,15 @@ component {
 			.initArg( name = "serviceName", value = variables.settings.serviceName )
 			.initArg( name = "debug", value = variables.settings.debug )
 			.initArg( name = "defaultEncryptionAlgorithm", value = variables.settings.defaultEncryptionAlgorithm )
-			.initArg( name = "defaultEncryptionKey", value = variables.settings.defaultEncryptionKey );
+			.initArg( name = "defaultEncryptionKey", value = variables.settings.defaultEncryptionKey )
+			.initArg( name = "defaultObjectOwnership", value = variables.settings.defaultObjectOwnership )
+			.initArg( name = "defaultBlockPublicAcls", value = variables.settings.defaultBlockPublicAcls )
+			.initArg( name = "defaultIgnorePublicAcls", value = variables.settings.defaultIgnorePublicAcls )
+			.initArg( name = "defaultBlockPublicPolicy", value = variables.settings.defaultBlockPublicPolicy )
+			.initArg(
+				name  = "defaultRestrictPublicBuckets",
+				value = variables.settings.defaultRestrictPublicBuckets
+			);
 		binder.map( "Sv4Util@s3sdk" ).to( "#moduleMapping#.models.AmazonS3" );
 
 		binder.map( "Sv2Util@s3sdk" ).to( "#moduleMapping#.models.AmazonS3" );

diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"Amazon S3 SDK",
-    "version":"5.6.0",
+    "version":"5.7.0",
     "slug":"s3sdk",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/s3sdk/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions, Corp",
@@ -46,9 +46,6 @@
         "format":"cfformat run models,test-harness/tests/**/*.cfc,*.cfc --overwrite",
         "format:watch":"cfformat watch models,test-harness/tests/**/*.cfc,*.cfc ./.cfformat.json",
         "format:check":"cfformat check models,test-harness/tests/**/*.cfc,*.cfc",
-        "cfpm":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\"' | run",
-        "cfpm:install":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\" install ${1}' | run",
-        "install:2021":"run-script cfpm:install zip,debugger,mysql",
-        "install:dependencies":"install && cd test-harness && install"
+        "install:dependencies":"install --force && cd test-harness && install --force"
     }
 }