From 426f4ad081de6869e3a81860c347660e7b28e5ab Mon Sep 17 00:00:00 2001
From: Chaoyi Sun <csun@cpointe-inc.com>
Date: Wed, 3 Jul 2024 21:06:34 -0700
Subject: [PATCH] #179 update ci profile to use fabric8 for multi-platform
 docker build

---
 build-parent/pom.xml                          | 18 -----
 .../dao/VaultPropertyDaoSteps.java            | 11 +---
 extensions/extensions-docker/pom.xml          | 66 +++++++++++--------
 .../tests/features/environment.py             | 20 +-----
 .../data/encryption/HashingSteps.java         | 11 +---
 .../tests/features/environment.py             |  9 +--
 .../docker-compose-arm64.yml                  | 17 -----
 .../docker-compose.yml                        |  2 +-
 8 files changed, 45 insertions(+), 109 deletions(-)
 delete mode 100644 test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose-arm64.yml

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 519edbe99..9fcf4751a 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -1090,24 +1090,6 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
                 <hide.manual.actions>true</hide.manual.actions>
             </properties>
         </profile>
-        <profile>
-            <id>arm64</id>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.technologybrewery.habushu</groupId>
-                            <artifactId>habushu-maven-plugin</artifactId>
-                            <version>${version.habushu.plugin}</version>
-                            <configuration>
-                                <!-- we don't need to deploy "any" wheel artifacts twice: -->
-                                <skipDeploy>true</skipDeploy>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
     </profiles>
 
 </project>
diff --git a/extensions/extensions-configuration-store-vault/src/test/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDaoSteps.java b/extensions/extensions-configuration-store-vault/src/test/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDaoSteps.java
index 2c759398e..9b325a8c7 100644
--- a/extensions/extensions-configuration-store-vault/src/test/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDaoSteps.java
+++ b/extensions/extensions-configuration-store-vault/src/test/java/com/boozallen/aissemble/configuration/dao/VaultPropertyDaoSteps.java
@@ -88,7 +88,7 @@ public void theConfigLoaderUsesVaultPropertyDaoToWriteToVault() {
 
     private void setupVaultContainer() {
         final Properties encryptProperties = Krausening.getInstance().getProperties("encrypt.properties");
-        String dockerImage = "ghcr.io/boozallen/aissemble-vault:" + System.getProperty("version.aissemble.vault") + this.getSystemArchitectureTag();
+        String dockerImage = "ghcr.io/boozallen/aissemble-vault:" + System.getProperty("version.aissemble.vault");
         final DockerImageName vaultImage = DockerImageName.parse(dockerImage).asCompatibleSubstituteFor("vault");
         vaultContainer = new VaultContainer(vaultImage);
         vaultContainer.setWaitStrategy(Wait.forListeningPort());
@@ -106,15 +106,6 @@ private void setupVaultContainer() {
         encryptProperties.setProperty("secrets.unseal.keys", unsealKeysJSONArrayString.replaceAll("[\\s|\\[\\]\"]", ""));
     }
 
-    private String getSystemArchitectureTag() {
-        String arch = System.getProperty("os.arch").toLowerCase().trim();
-        switch(arch) {
-            case "aarch64":
-            case "arm64":   return "-arm64";
-            default:        return "-amd64";
-        }
-    }
-
     private String inputStreamToString(InputStream inputStream) {
         try {
             return new String(inputStream.readAllBytes());
diff --git a/extensions/extensions-docker/pom.xml b/extensions/extensions-docker/pom.xml
index 7e1c4567e..b024364b9 100644
--- a/extensions/extensions-docker/pom.xml
+++ b/extensions/extensions-docker/pom.xml
@@ -18,37 +18,47 @@
 
     <profiles>
         <profile>
-            <id>x86</id>
-            <properties>
-                <target.architecture>amd64</target.architecture>
-                <docker.platforms>linux/amd64</docker.platforms>
-            </properties>
-        </profile>
-        <profile>
-            <id>arm64</id>
-            <properties>
-                <target.architecture>arm64</target.architecture>
-                <docker.platforms>linux/arm64</docker.platforms>
-            </properties>
+            <id>ci</id>
             <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <artifactId>maven-deploy-plugin</artifactId>
-                            <configuration>
-                                <skip>true</skip>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>default-push</id>
+                                <configuration>
+                                    <images>
+                                        <image>
+                                            <name>${docker.baseline.repo.id}/${dockerImageName}:${dockerImageVersion}</name>
+                                            <build>
+                                                <buildx>
+                                                    <platforms>
+                                                        <platform>${docker.platforms}</platform>
+                                                    </platforms>
+                                                </buildx>
+                                                <args>
+                                                    <DELTA_HIVE_CONNECTOR_VERSION>${version.delta.hive.connector}</DELTA_HIVE_CONNECTOR_VERSION>
+                                                    <DOCKER_BASELINE_REPO_ID>${docker.baseline.repo.id}/</DOCKER_BASELINE_REPO_ID>
+                                                    <VERSION_AISSEMBLE>${version.aissemble}</VERSION_AISSEMBLE>
+                                                    <SPARK_VERSION>${version.spark}</SPARK_VERSION>
+                                                </args>
+                                                <contextDir>${project.basedir}</contextDir>
+                                                <dockerFile>./src/main/resources/docker/Dockerfile</dockerFile>
+                                            </build>
+                                        </image>
+                                    </images>
+                                </configuration>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                                <phase>deploy</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
             </build>
         </profile>
-        <profile>
-            <id>ci</id>
-            <properties>
-                <dockerImageVersion>${project.version}-${target.architecture}</dockerImageVersion>
-            </properties>
-        </profile>
         <profile>
             <id>ensure-docker-dependencies</id>
             <!-- This profile is used to ensure that the docker dependencies are encoded in Maven properly. Because of
diff --git a/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/tests/features/environment.py b/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/tests/features/environment.py
index 7b59adfc7..51aaaa7cf 100644
--- a/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/tests/features/environment.py
+++ b/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/tests/features/environment.py
@@ -61,23 +61,9 @@ def before_feature(context, feature):
     # using major, minor, patch and -SNAPSHOT if dev
     version = metadata.version("aissemble-extensions-encryption-vault-python")
     docker_image += version_to_tag(version)
-    base_docker_image = docker_image
-
-    try:
-        if platform.machine().lower() in ["arm64", "aarch64"]:
-            docker_image += "-arm64"
-        else:
-            docker_image += "-amd64"
-
-        context.test_container = SafeDockerContainer(docker_image)
-        start_container(context, docker_image, feature)
-
-    except:
-        logger.info(
-            f"Could not find container {docker_image} (with specific platform).  Trying without platform..."
-        )
-        context.test_container = SafeDockerContainer(base_docker_image)
-        start_container(context, base_docker_image, feature)
+
+    context.test_container = SafeDockerContainer(docker_image)
+    start_container(context, docker_image, feature)
 
     root_key_tuple = context.test_container.exec("cat /root_key.txt")
     secrets_root_key = root_key_tuple.output.decode()
diff --git a/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/java/com/boozallen/aissemble/data/encryption/HashingSteps.java b/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/java/com/boozallen/aissemble/data/encryption/HashingSteps.java
index 4509065ad..591768c94 100644
--- a/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/java/com/boozallen/aissemble/data/encryption/HashingSteps.java
+++ b/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/java/com/boozallen/aissemble/data/encryption/HashingSteps.java
@@ -45,21 +45,12 @@ public class HashingSteps {
     private static final Logger logger = LoggerFactory.getLogger(HashingSteps.class);
     private final GenericContainer<?> genericContainer = new GenericContainer<>(
             DockerImageName.parse(
-                    "ghcr.io/boozallen/aissemble-vault:" + System.getProperty("version.aissemble.vault") + this.getSystemArchitectureTag()
+                    "ghcr.io/boozallen/aissemble-vault:" + System.getProperty("version.aissemble.vault")
             )
     ).withCreateContainerCmdModifier(
             cmd -> cmd.withCapAdd(Capability.IPC_LOCK)
     );
 
-    private String getSystemArchitectureTag() {
-        String arch = System.getProperty("os.arch").toLowerCase().trim();
-        switch(arch) {
-            case "aarch64":
-            case "arm64":   return "-arm64";
-            default:        return "-amd64";
-        }
-    }
-
     @After("@hashing")
     public void tearDown() {
         encryptedData = null;
diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/environment.py b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/environment.py
index fbb93f88d..b99b971dd 100644
--- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/environment.py
+++ b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/environment.py
@@ -24,13 +24,6 @@
 logger = LogManager.get_instance().get_logger("Environment")
 
 
-def select_docker_compose_arch():
-    machine_arch = platform.machine().lower()
-    if machine_arch in ["arm64", "aarch64"]:
-        return "docker-compose-arm64.yml"
-    return "docker-compose.yml"
-
-
 def before_all(context):
     print("Executing setup for tests...")
     os.environ["KRAUSENING_BASE"] = "tests/resources/config/base"
@@ -75,7 +68,7 @@ def before_feature(context, feature):
             f"Starting services defined in Docker Compose file at {test_staging_path}"
         )
 
-        compose = DockerCompose(test_staging_path, select_docker_compose_arch())
+        compose = DockerCompose(test_staging_path, "docker-compose.yml")
         context.docker_compose_containers = compose
 
         compose.start()
diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose-arm64.yml b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose-arm64.yml
deleted file mode 100644
index a98de6632..000000000
--- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose-arm64.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3'
-services:
-  vault:
-    # For testing we will pull the image directly from the remote server as opposed to a locally built image.
-    # This will ensure that the Vault keys are in sync.
-    image: "ghcr.io/boozallen/aissemble-vault:${version.aissemble}-arm64"
-    cap_add:
-      - IPC_LOCK
-    environment:
-      - VAULT_DEV_ROOT_TOKEN_ID=myroot
-      - VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200
-    ports:
-      - '8200:8200'
-  s3-local:
-    image: localstack/localstack:latest
-    ports:
-      - '4566:4566'
\ No newline at end of file
diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose.yml b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose.yml
index 072f1f766..ee6f7bc39 100644
--- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose.yml
+++ b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/integration-test-resources/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   vault:
     # For testing we will pull the image directly from the remote server as opposed to a locally built image.
     # This will ensure that the Vault keys are in sync.
-    image: "ghcr.io/boozallen/aissemble-vault:${version.aissemble}-amd64"
+    image: "ghcr.io/boozallen/aissemble-vault:${version.aissemble}"
     cap_add:
       - IPC_LOCK
     environment: