✨ Completed instructions for integration testing container

Created and tested instructions for creating an integration testing
container that allows all the integration tests that run by default to
pass.  The container image has all the necessary sample files placed on
disk and all the necessary sample files deployed to AEM.

In theory, this would allow the integration tests to be run as part of a
GitHub action if the test container image were available however because
AEM is proprietary, an AEM image cannot be placed in a publicly
accessible location.

Author: rmcdouga

rest-services/jbang_scripts/README.md

@@ -0,0 +1,15 @@
+# Creating `deploy_it_assets.jar`
+
+Execute the following command from this directory to create the necessary `deploy_it_assets.jar` file in the ff_it_files directory:  
+`jbang export fatjar --verbose --output ..\test_containers\ff_it_files\deploy_it_assets.jar .\deploy_it_assets.java`
+
+# Developer Tips
+
+When making changes to the script, it is helpful if you execute the following command to create a maven project under
+the current directory.  You can them import that project in Eclipse and work with the code like normal Java code
+(taking advantage of Eclipse's incremental compilation, error messages, etc.).
+
+`jbang export maven .\deploy_it_assets.java`
+
+When you have completed your change, you can copy/paste the modified code back into the original deploy_it_assets.java and delete 
+the maven project in Eclipse (checking the box to delete the files on disk).

rest-services/jbang_scripts/deploy_it_assets.java

@@ -5,11 +5,15 @@
 //DEPS org.slf4j:slf4j-simple:2.0.17
 //JAVA 21+
 
+package com._4point.aem.fluentforms.deploy_it_assets;
+
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Parameters;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.concurrent.Callable;
 
 import com._4point.aem.package_manager.FormsAndDocumentsClient;
@@ -24,7 +28,8 @@ class deploy_it_assets implements Callable<Integer> {
 	private static final String AEM_SERVER_USER = "admin";
 	private static final String AEM_SERVER_PASSWORD = "admin";
 	private static final Path REST_SERVICES_PROJECT_DIR = Path.of("..");
-	private static final Path SAMPLES_DIR = REST_SERVICES_PROJECT_DIR.resolve(Path.of("test_containers", "ff_it_files"));
+	private static final List<Path> SAMPLES_DIRS_LIST = List.of(Path.of("/opt", "adobe", "ff_it_files"), REST_SERVICES_PROJECT_DIR.resolve(Path.of("test_containers", "ff_it_files")));
+	private static final Path SAMPLES_DIR = findSamplesDir(SAMPLES_DIRS_LIST);
 	private static final Path AF_TEST_FORMS_PATH = SAMPLES_DIR.resolve("sample00002test.zip");
 	private static final Path OF_TEST_FORMS_PATH = SAMPLES_DIR.resolve("SampleForm.xdp");
 
@@ -96,4 +101,15 @@ public Integer call() throws Exception { // your business logic goes here...
 
         return 0;
     }
+    
+	private static Path findSamplesDir(List<Path> samplesDirsList) {
+		 return samplesDirsList.stream()
+				 			   .filter(dir -> dir.toFile().isDirectory() && isSamplesDir(dir))
+				 			   .findFirst()
+				 			   .orElseThrow(() -> new IllegalStateException("Could not find a valid samples directory in: " + samplesDirsList));
+	}
+
+	private static boolean isSamplesDir(Path dir) {
+		return Files.exists(dir.resolve("sample00002test.zip")) && Files.exists(dir.resolve("SampleForm.xdp"));
+    }
 }

rest-services/test_containers/ReadMe.md

@@ -1,4 +1,10 @@
 In order to create an integration test container image, using the `ff_it_test` dockerfile, perform the following steps:
 
-1. Alter the first line of the `ff_it_test.dockerfile` file to use the desired AEM base container image.
-2. Run `docker buildx build --file ff_it_test.dockerfile -t aem_lts_it_tests:aem65lts_it_tests .` to create the integration test image.
+1. Create the `deploy_it_assets.jar` file in `ff_it_files` by following the "Creating deploy_it_assets.jar" instructions in `jbang_scripts\README.md`. 
+(This step is required because the .jar is not stored in the GitHub repository but it is required in order for the dockerfile to run.)
+2. Alter the first line of the `ff_it_test.dockerfile` file to use the desired AEM base container image.
+3. Run `docker buildx build --file ff_it_test.dockerfile -t aem_lts_it_tests:aem65lts_it_tests .` to create the integration test image.
+
+After performing these steps then the integration tests should run successfully after `TestUtils.java` is modified to set 
+`AEM_TARGET_TYPE` to be `AemTargetType.TESTCONTAINERS`.  If the name of the integration test container image is
+different than the one in the steps above, then `AEM_IMAGE_NAME` may also need to be modified.

rest-services/test_containers/ff_it_test.dockerfile

@@ -1,4 +1,4 @@
-FROM aem_lts:aem65lts AS ff_it_test
+FROM aem:aem65lts AS ff_it_test
 
 ENV container="aem-lts-quickstart,aem-author,ubuntu,java21"
 
@@ -9,6 +9,12 @@ RUN mkdir -p /opt/adobe/ff_it_files
 
 COPY ff_it_files/* /opt/adobe/ff_it_files
 
+RUN /bin/bash -c "/opt/adobe/AEM*/runStart ; \
+jbang --java=21 /opt/adobe/aem_cntrl-0.0.1-SNAPSHOT.jar wflog --startup ; \
+jbang --java=21 /opt/adobe/ff_it_files/deploy_it_assets.jar ; \ 
+/opt/adobe/AEM*/runStop ; \
+jbang --java=21 /opt/adobe/aem_cntrl-0.0.1-SNAPSHOT.jar wflog --shutdown"
+
 #NOTE: make sure to copy admin.password.file and license.properties files to the /opt/aem-config folder.
 # VOLUME ["/opt/aem-config/"]
 #VOLUME ["/opt/adobe/???/crx-quickstart/logs"]