- Renamed the Foundation Core Python package.

- Renamed the Foundation Metadata Core (Python) package. - Renamed the Foundation Encryption Policy (Python) package. - Renamed the Extensions Encryption Vault Python package. - Renamed the Extensions Data Delivery Spark (Python) package. - Renamed all the child directories, classes, and methods. - Corrected all the imports inside of the velocity templates to ensure a successful build of the Foundation Core Python. - Baton migration scripts for automated migrations from legacy package names to the new aiSSEMBLE landscape.
boozallen · Jun 25, 2024 · 64a2336 · 64a2336
1 parent 74a1eeb
commit 64a2336
Show file tree

Hide file tree

Showing 116 changed files with 840 additions and 196 deletions.
diff --git a/...ns/extensions-docker/aissemble-policy-decision-point/src/main/resources/docker/Dockerfile b/...ns/extensions-docker/aissemble-policy-decision-point/src/main/resources/docker/Dockerfile
@@ -11,8 +11,8 @@ USER 1001
 RUN mkdir -p /deployments/krausening/
 COPY target/dockerbuild/*.jar /deployments/
 
-COPY ./src/main/resources/truststore/aiops-secure.jks /deployments/
-COPY ./src/main/resources/krausening/base/aiops-security.properties /deployments/krausening/
+COPY ./src/main/resources/truststore/aissemble-secure.jks /deployments/
+COPY ./src/main/resources/krausening/base/aissemble-security.properties /deployments/krausening/
 COPY ./src/main/resources/authorization/policies/test-policy.xml /deployments/
 COPY ./src/main/resources/authorization/attributes/test-attributes.json /deployments/
 COPY ./src/main/resources/authorization/pdp.xml /deployments/
diff --git a/...krausening/base/aiops-security.properties → ...sening/base/aissemble-security.properties b/...krausening/base/aiops-security.properties → ...sening/base/aissemble-security.properties
@@ -7,8 +7,8 @@
 # This software package is licensed under the Booz Allen Public License. All Rights Reserved.
 # #L%
 ###
-token.issuer=aiops.authority
-private.key.alias=aiopskey
-keystore.file.location=/deployments/aiops-secure.jks
+token.issuer=aissemble.authority
+private.key.alias=aissemblekey
+keystore.file.location=/deployments/aissemble-secure.jks
 attribute.definition.location=/deployments/
 pdp.configuration.location=/deployments/pdp.xml
diff --git a/...ain/resources/truststore/aiops-secure.jks → ...resources/truststore/aissemble-secure.jks b/...ain/resources/truststore/aiops-secure.jks → ...resources/truststore/aissemble-secure.jks
diff --git a/...ns/extensions-encryption/aissemble-extensions-encryption-vault-python/README.md b/...ns/extensions-encryption/aissemble-extensions-encryption-vault-python/README.md
@@ -22,7 +22,7 @@ The following example illustrates how to perform encryption.
     #### VaultRemoteEncryptionStrategy
     ```         
     # Uses remote Vault encryption
-    from aiops_encrypt.vault_remote_encryption_strategy import VaultRemoteEncryptionStrategy
+    from aissemble_encrypt.vault_remote_encryption_strategy import VaultRemoteEncryptionStrategy
 
     vault_remote = VaultRemoteEncryptionStrategy()
 
@@ -39,7 +39,7 @@ The following example illustrates how to perform encryption.
     #### VaultLocalEncryptionStrategy
     ```
     # Uses an encryption key retrieved from the Vault server, but performs the encryption locally.
-    from aiops_encrypt.vault_local_encryption_strategy import VaultLocalEncryptionStrategy
+    from aissemble_encrypt.vault_local_encryption_strategy import VaultLocalEncryptionStrategy
     
     vault_local = VaultLocalEncryptionStrategy()
 
@@ -53,7 +53,7 @@ The following example illustrates how to perform encryption.
     #### AesCbcEncryptionStrategy
     ```         
     # Uses the AES CBC encryption
-    from aiops_encrypt.aes_cbc_encryption_strategy import AesCbcEncryptionStrategy
+    from aissemble_encrypt.aes_cbc_encryption_strategy import AesCbcEncryptionStrategy
 
     aes_cbc = AesCbcEncryptionStrategy()
 
@@ -67,7 +67,7 @@ The following example illustrates how to perform encryption.
     #### AesGcm96EncryptionStrategy
     ```         
     # AES GCM encryption with a 96 bit initialization vector (same algorithm as Vault)
-    from aiops_encrypt.aes_gcm_96_encryption_strategy import AesGcm96EncryptionStrategy
+    from aissemble_encrypt.aes_gcm_96_encryption_strategy import AesGcm96EncryptionStrategy
 
     aes_gcm_96 = AesGcm96EncryptionStrategy()
 

diff --git a/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/pyproject.toml b/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/pyproject.toml
@@ -5,7 +5,7 @@ description = "Vault data encryption classes (python)"
 authors = ["aiSSEMBLE Baseline Community <aissemble@bah.com>"]
 readme = "README.md"
 packages = [
-    {include = "aiops_encrypt", from="src"}
+    {include = "aissemble_encrypt", from="src"}
 ]
 
 [tool.poetry.dependencies]

diff --git a/...ault-python/src/aiops_encrypt/__init__.py → ...-python/src/aissemble_encrypt/__init__.py b/...ault-python/src/aiops_encrypt/__init__.py → ...-python/src/aissemble_encrypt/__init__.py
diff --git a/...thon/src/aiops_encrypt/aes_cbc_encrypt.py → .../src/aissemble_encrypt/aes_cbc_encrypt.py b/...thon/src/aiops_encrypt/aes_cbc_encrypt.py → .../src/aissemble_encrypt/aes_cbc_encrypt.py
diff --git a/...ps_encrypt/aes_cbc_encryption_strategy.py → ...le_encrypt/aes_cbc_encryption_strategy.py b/...ps_encrypt/aes_cbc_encryption_strategy.py → ...le_encrypt/aes_cbc_encryption_strategy.py
@@ -9,7 +9,7 @@
 ###
 from .strategy_base import StrategyBase
 from krausening.logging import LogManager
-from aiops_encrypt.aes_cbc_encrypt import AesCbcEncrypt
+from aissemble_encrypt.aes_cbc_encrypt import AesCbcEncrypt
 
 
 class AesCbcEncryptionStrategy(StrategyBase):

diff --git a/...n/src/aiops_encrypt/aes_gcm_96_encrypt.py → ...c/aissemble_encrypt/aes_gcm_96_encrypt.py b/...n/src/aiops_encrypt/aes_gcm_96_encrypt.py → ...c/aissemble_encrypt/aes_gcm_96_encrypt.py
diff --git a/...encrypt/aes_gcm_96_encryption_strategy.py → ...encrypt/aes_gcm_96_encryption_strategy.py b/...encrypt/aes_gcm_96_encryption_strategy.py → ...encrypt/aes_gcm_96_encryption_strategy.py
@@ -9,7 +9,7 @@
 ###
 from .strategy_base import StrategyBase
 from krausening.logging import LogManager
-from aiops_encrypt.aes_gcm_96_encrypt import AesGcm96Encrypt
+from aissemble_encrypt.aes_gcm_96_encrypt import AesGcm96Encrypt
 
 
 class AesGcm96EncryptionStrategy(StrategyBase):

diff --git a/...python/src/aiops_encrypt/strategy_base.py → ...on/src/aissemble_encrypt/strategy_base.py b/...python/src/aiops_encrypt/strategy_base.py → ...on/src/aissemble_encrypt/strategy_base.py
diff --git a/...-python/src/aiops_encrypt/vault_config.py → ...hon/src/aissemble_encrypt/vault_config.py b/...-python/src/aiops_encrypt/vault_config.py → ...hon/src/aissemble_encrypt/vault_config.py
diff --git a/...python/src/aiops_encrypt/vault_encrypt.py → ...on/src/aissemble_encrypt/vault_encrypt.py b/...python/src/aiops_encrypt/vault_encrypt.py → ...on/src/aissemble_encrypt/vault_encrypt.py
@@ -15,8 +15,8 @@
 import os
 from krausening.logging import LogManager
 import gc
-from aiops_encrypt.vault_key_util import VaultKeyUtil
-from aiops_encrypt.vault_config import VaultConfig
+from aissemble_encrypt.vault_key_util import VaultKeyUtil
+from aissemble_encrypt.vault_config import VaultConfig
 
 
 class VaultEncrypt:
@@ -66,7 +66,7 @@ def encrypt(self, data: str):
         Uses the Vault encryption service to encrypt data
         """
         encrypt_data_response = self.__client.secrets.transit.encrypt_data(
-            name="aiopskey",
+            name="aissemblekey",
             plaintext=self.base64_encode(data),
         )
 
@@ -104,7 +104,7 @@ def decrypt(self, encrypted_data: str):
         Uses the Vault service to decrypt data
         """
         decrypt_data_response = self.__client.secrets.transit.decrypt_data(
-            name="aiopskey",
+            name="aissemblekey",
             ciphertext=encrypted_data,
         )
 

diff --git a/...ython/src/aiops_encrypt/vault_key_util.py → ...n/src/aissemble_encrypt/vault_key_util.py b/...ython/src/aiops_encrypt/vault_key_util.py → ...n/src/aissemble_encrypt/vault_key_util.py
@@ -11,7 +11,7 @@
 import base64
 from krausening.logging import LogManager
 import gc
-from aiops_encrypt.vault_config import VaultConfig
+from aissemble_encrypt.vault_config import VaultConfig
 
 
 class VaultKeyUtil:
@@ -57,7 +57,7 @@ def __init__(self, key_version: str):
 
     def __get_key_export(self, key_version="latest"):
         export_key_response = self.__client.secrets.transit.export_key(
-            name="aiopskey",
+            name="aissemblekey",
             key_type="encryption-key",
             version=key_version,
         )

diff --git a/...ncrypt/vault_local_encryption_strategy.py → ...ncrypt/vault_local_encryption_strategy.py b/...ncrypt/vault_local_encryption_strategy.py → ...ncrypt/vault_local_encryption_strategy.py
@@ -9,7 +9,7 @@
 ###
 from .strategy_base import StrategyBase
 from krausening.logging import LogManager
-from aiops_encrypt.vault_encrypt import VaultEncrypt
+from aissemble_encrypt.vault_encrypt import VaultEncrypt
 
 
 class VaultLocalEncryptionStrategy(StrategyBase):

diff --git a/...crypt/vault_remote_encryption_strategy.py → ...crypt/vault_remote_encryption_strategy.py b/...crypt/vault_remote_encryption_strategy.py → ...crypt/vault_remote_encryption_strategy.py
@@ -9,7 +9,7 @@
 ###
 from .strategy_base import StrategyBase
 from krausening.logging import LogManager
-from aiops_encrypt.vault_encrypt import VaultEncrypt
+from aissemble_encrypt.vault_encrypt import VaultEncrypt
 
 
 class VaultRemoteEncryptionStrategy(StrategyBase):

diff --git a/...ons-encryption/aissemble-extensions-encryption-vault-python/tests/features/environment.py b/...ons-encryption/aissemble-extensions-encryption-vault-python/tests/features/environment.py
@@ -10,7 +10,7 @@
 from krausening.logging import LogManager
 from container.safe_docker_container import SafeDockerContainer
 from testcontainers.core.waiting_utils import wait_for
-from aiops_encrypt.vault_config import VaultConfig
+from aissemble_encrypt.vault_config import VaultConfig
 from importlib import metadata
 import packaging.version
 import platform

diff --git a/...ion/aissemble-extensions-encryption-vault-python/tests/features/steps/encryption_steps.py b/...ion/aissemble-extensions-encryption-vault-python/tests/features/steps/encryption_steps.py
@@ -17,11 +17,15 @@
     use_step_matcher,
 )
 import nose.tools as nt
-from aiops_encrypt.aes_cbc_encryption_strategy import AesCbcEncryptionStrategy
-from aiops_encrypt.aes_gcm_96_encryption_strategy import AesGcm96EncryptionStrategy
-from aiops_encrypt.vault_remote_encryption_strategy import VaultRemoteEncryptionStrategy
-from aiops_encrypt.vault_local_encryption_strategy import VaultLocalEncryptionStrategy
-from aiops_encrypt.vault_key_util import VaultKeyUtil
+from aissemble_encrypt.aes_cbc_encryption_strategy import AesCbcEncryptionStrategy
+from aissemble_encrypt.aes_gcm_96_encryption_strategy import AesGcm96EncryptionStrategy
+from aissemble_encrypt.vault_remote_encryption_strategy import (
+    VaultRemoteEncryptionStrategy,
+)
+from aissemble_encrypt.vault_local_encryption_strategy import (
+    VaultLocalEncryptionStrategy,
+)
+from aissemble_encrypt.vault_key_util import VaultKeyUtil
 from krausening.logging import LogManager
 from json import dumps
 

diff --git a/foundation/aissemble-foundation-core-python/pyproject.toml b/foundation/aissemble-foundation-core-python/pyproject.toml
@@ -5,11 +5,11 @@ description = "Core classes for supporting concepts (alerting, metadata, etc) th
 authors = ["aiSSEMBLE Baseline Community <aissemble@bah.com>"]
 readme = "README.md"
 packages = [
-    {include = "aiops_core_bom", from = "src"},
-    {include = "aiops_core_config", from = "src"},
-    {include = "aiops_core_filestore", from = "src"},
-    {include = "aiops_core_metadata", from = "src"},
-    {include = "aiopsauth", from = "src"},
+    {include = "aissemble_core_bom", from = "src"},
+    {include = "aissemble_core_config", from = "src"},
+    {include = "aissemble_core_filestore", from = "src"},
+    {include = "aissemble_core_metadata", from = "src"},
+    {include = "aissembleauth", from = "src"},
     {include = "inference", from = "src"},
     {include = "policy_manager", from = "src"}
 ]

diff --git a/...ython/src/aiops_core_metadata/__init__.py → ...python/src/aissemble_core_bom/__init__.py b/...ython/src/aiops_core_metadata/__init__.py → ...python/src/aissemble_core_bom/__init__.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...python/src/aiops_core_bom/training_bom.py → ...on/src/aissemble_core_bom/training_bom.py b/...python/src/aiops_core_bom/training_bom.py → ...on/src/aissemble_core_bom/training_bom.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...-python/src/aiops_core_config/__init__.py → ...hon/src/aissemble_core_config/__init__.py b/...-python/src/aiops_core_config/__init__.py → ...hon/src/aissemble_core_config/__init__.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...src/aiops_core_config/messaging_config.py → ...aissemble_core_config/messaging_config.py b/...src/aiops_core_config/messaging_config.py → ...aissemble_core_config/messaging_config.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...ation/aissemble-foundation-core-python/src/aissemble_core_config/rdbms_connection_pool.py b/...ation/aissemble-foundation-core-python/src/aissemble_core_config/rdbms_connection_pool.py
diff --git a/...core_config/spark_elasticsearch_config.py → ...core_config/spark_elasticsearch_config.py b/...core_config/spark_elasticsearch_config.py → ...core_config/spark_elasticsearch_config.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...c/aiops_core_config/spark_neo4j_config.py → ...ssemble_core_config/spark_neo4j_config.py b/...c/aiops_core_config/spark_neo4j_config.py → ...ssemble_core_config/spark_neo4j_config.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...ation/aissemble-foundation-core-python/src/aissemble_core_config/spark_postgres_config.py b/...ation/aissemble-foundation-core-python/src/aissemble_core_config/spark_postgres_config.py
@@ -0,0 +1,56 @@
+###
+# #%L
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
+# %%
+# Copyright (C) 2021 Booz Allen
+# %%
+# This software package is licensed under the Booz Allen Public License. All Rights Reserved.
+# #L%
+###
+from krausening.properties import PropertyManager
+
+
+class SparkRDBMSConfig:
+    """
+    Configurations for PySpark Relational Database Management System support.
+    """
+
+    DEFAULT_JDBC_URL = "jdbc:postgresql://postgres:5432/db"
+    DEFAULT_JDBC_DRIVER = "org.postgresql.Driver"
+    DEFAULT_USER = "postgres"
+    DEFAULT_PASSWORD = "password"
+
+    def __init__(self):
+        self.properties = PropertyManager.get_instance().get_properties(
+            "spark-rdbms.properties"
+        )
+
+    def jdbc_url(self):
+        """
+        The JDBC URL for the database connection.
+        """
+        return self.properties.getProperty(
+            "jdbc.url", SparkRDBMSConfig.DEFAULT_JDBC_URL
+        )
+
+    def jdbc_driver(self):
+        """
+        The JDBC driver class name.
+        """
+        return self.properties.getProperty(
+            "jdbc.driver", SparkRDBMSConfig.DEFAULT_JDBC_DRIVER
+        )
+
+    def user(self):
+        """
+        The RDBMS user.
+        """
+        return self.properties.getProperty("jdbc.user", SparkRDBMSConfig.DEFAULT_USER)
+
+    def password(self):
+        """
+        The password for the RDBMS user.
+        """
+        return self.properties.getProperty(
+            "jdbc.password", SparkRDBMSConfig.DEFAULT_PASSWORD
+        )
diff --git a/...c/aiops_core_config/spark_rdbms_config.py → ...ssemble_core_config/spark_rdbms_config.py b/...c/aiops_core_config/spark_rdbms_config.py → ...ssemble_core_config/spark_rdbms_config.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...ore-python/src/aiops_core_bom/__init__.py → .../src/aissemble_core_filestore/__init__.py b/...ore-python/src/aiops_core_bom/__init__.py → .../src/aissemble_core_filestore/__init__.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...iops_core_filestore/file_store_factory.py → ...mble_core_filestore/file_store_factory.py b/...iops_core_filestore/file_store_factory.py → ...mble_core_filestore/file_store_factory.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...ion-core-python/src/aiopsauth/__init__.py → ...n/src/aissemble_core_metadata/__init__.py b/...ion-core-python/src/aiopsauth/__init__.py → ...n/src/aissemble_core_metadata/__init__.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...ore_metadata/hive_metadata_api_service.py → ...ore_metadata/hive_metadata_api_service.py b/...ore_metadata/hive_metadata_api_service.py → ...ore_metadata/hive_metadata_api_service.py
@@ -1,14 +1,14 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%
 # This software package is licensed under the Booz Allen Public License. All Rights Reserved.
 # #L%
 ###
 from krausening.logging import LogManager
-from aiops_core_config import MessagingConfig
+from aissemble_core_config import MessagingConfig
 from .metadata_api import MetadataAPI
 from .metadata_model import MetadataModel
 from typing import Dict, List

diff --git a/..._metadata/logging_metadata_api_service.py → ..._metadata/logging_metadata_api_service.py b/..._metadata/logging_metadata_api_service.py → ..._metadata/logging_metadata_api_service.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...n/src/aiops_core_metadata/metadata_api.py → ...c/aissemble_core_metadata/metadata_api.py b/...n/src/aiops_core_metadata/metadata_api.py → ...c/aissemble_core_metadata/metadata_api.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...src/aiops_core_metadata/metadata_model.py → ...aissemble_core_metadata/metadata_model.py b/...src/aiops_core_metadata/metadata_model.py → ...aissemble_core_metadata/metadata_model.py
@@ -1,13 +1,13 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%
 # This software package is licensed under the Booz Allen Public License. All Rights Reserved.
 # #L%
 ###
-from pydantic import BaseModel
+from pydantic.main import BaseModel
 from datetime import datetime
 from typing import Dict
 from uuid import uuid4

diff --git a/...thon/src/aiops_core_filestore/__init__.py → ...core-python/src/aissembleauth/__init__.py b/...thon/src/aiops_core_filestore/__init__.py → ...core-python/src/aissembleauth/__init__.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%

diff --git a/...-core-python/src/aiopsauth/auth_config.py → ...e-python/src/aissembleauth/auth_config.py b/...-core-python/src/aiopsauth/auth_config.py → ...e-python/src/aissembleauth/auth_config.py
@@ -1,6 +1,6 @@
 ###
 # #%L
-# AIOps Foundation::AIOps Core (Python)
+# aiSSEMBLE Foundation::aiSSEMBLE Core (Python)
 # %%
 # Copyright (C) 2021 Booz Allen
 # %%