berryworld 1.0.0.196646__py3-none-any.whl → 1.0.0.196834__py3-none-any.whl

berryworld/__init__.py

@@ -1,5 +1,5 @@
 from .xml_parser import XMLparser
-from .handy_mix import HandyMix, URLResolver
+from .handy_mix import HandyMix
 from .transportation_solver import TransportationAlgorithm
 from .allocation_solver import AllocationSolver
 from .pickle_management import PickleManagement

berryworld/generate_env.py

@@ -53,19 +53,24 @@ class EnvVariables:
 
         return config
 
-    def fetch_secrets_by_tag(self, config):
-        """ Fetch secrets from Azure Key Vault based on tags
+    def get_secret_client(self, config):
+        """ Create a Key Vault client
         :param config: Dictionary containing Azure Key Vault configuration
         """
         tenant_id = config["AZURE-TENANT-ID"]
         client_id = config["AZURE-CLIENT-ID"]
         client_secret = config["AZURE-CLIENT-SECRET"]
         vault_url = f"https://{config['AZURE-KEY-VAULT-NAME']}.vault.azure.net/"
-        project_tags = config["AZURE-KEY-VAULT-PROJECT-TAGS"]
-
         credential = ClientSecretCredential(tenant_id, client_id, client_secret)
-        client = SecretClient(vault_url=vault_url, credential=credential)
 
+        return SecretClient(vault_url=vault_url, credential=credential)
+
+    def fetch_secrets_by_tag(self, config):
+        """ Fetch enabled secrets from Azure Key Vault based on tags
+        :param config: Dictionary containing Azure Key Vault configuration
+        """
+        client = self.get_secret_client(config)
+        project_tags = config.get("AZURE-KEY-VAULT-PROJECT-TAGS", [])
         secrets = {}
         for prop in client.list_properties_of_secrets():
             if not prop.enabled:
@@ -78,33 +83,120 @@ class EnvVariables:
                     secrets[key] = secret.value
         return secrets
 
-    def generate_akv_env_file(self, config_path=None, env_path=None):
+    def fetch_all_secrets(self, config):
+        """ Fetch all enabled secrets from the Key Vault
+        :param config: Dictionary containing Azure Key Vault configuration
+        """
+        client = self.get_secret_client(config)
+        secrets = {}
+        for prop in client.list_properties_of_secrets():
+            if prop.enabled:
+                secret = client.get_secret(prop.name)
+                secrets[secret.name] = {
+                    "value": secret.value,
+                    "tags": prop.tags or {}
+                }
+        return secrets
+
+    def create_or_update_akv_secret(self, config, name=None, value=None, tags=None, tag_name=None, tag_value=None,
+                                    disable_old=True, secrets_dict=None):
+        """ Create or update a secret / all secrets in Key Vault :
+        :param config: Dictionary containing Azure Key Vault configuration
+        :param name: Name of the secret to be created / updated
+        :param value: Value of the secret to be created / updated
+        :param tags: Dictionary containing Azure Key Vault configuration
+        :param tag_name: Tag name of the secret to be created / updated
+        :param tag_value: Tag value of the secret to be created / updated
+        :param disable_old: Flag if previous version should be disabled
+        :param secrets_dict: Dictionary of all the secrets from AKV
+        """
+        client = self.get_secret_client(config)
+
+        # If secrets_dict is provided, loop through it
+        if secrets_dict is not None:
+            for s_name, s_data in secrets_dict.items():
+                self.create_or_update_akv_secret(
+                    config,
+                    name=s_name,
+                    value=s_data["value"],
+                    tags=s_data.get("tags"),
+                    disable_old=disable_old
+                )
+            return
+
+        if (name is None and value is None) and secrets_dict is None:
+            raise ValueError("Must provide either secrets_dict or both name and value")
+
+        # Check the latest version of the secret
+        latest_secret = None
+        latest_tags = {}
+        try:
+            latest_secret = client.get_secret(name)
+            latest_tags = latest_secret.properties.tags or {}
+        except Exception:
+            pass
+
+        updated_tags = {**latest_tags}
+        if tags is not None:
+            updated_tags.update(tags)
+        elif tag_name is not None and tag_value is not None:
+            updated_tags[tag_name] = tag_value
+
+        # Check if anything changed in the value or tag
+        value_changed = latest_secret is None or latest_secret.value != value
+        tags_changed = updated_tags != latest_tags
+
+        if not value_changed and not tags_changed:
+            print(f"Secret {name} already up to date. Skipping.")
+            return
+
+        # Create new version
+        new_secret = client.set_secret(name, value, tags=updated_tags)
+        new_version = new_secret.properties.version
+        print(f"Secret {name} updated. New version: {new_version}.")
+
+        # Disable previous versions
+        if disable_old:
+            for secret_prop in client.list_properties_of_secret_versions(name):
+                if secret_prop.version != new_version and secret_prop.enabled:
+                    client.update_secret_properties(secret_prop.name, secret_prop.version, enabled=False)
+
+    def generate_akv_env_file(self, config_path=None, env_path=None, fetch_all=False):
         """ Generate the environment variables file from Azure Key Vault secrets
         :param config_path: Path to the Terraform configuration file (optional)
         :param env_path: Path to the destination .env file (optional)
+        :param fetch_all: Flag if all the secrets should be fetched
         """
         config = self.extract_akv_config_from_tf(config_path)
-        secrets = self.fetch_secrets_by_tag(config)
-
-        # Create .env file for UnitTest
-        with open(env_path, "w") as f:
-            for key, value in secrets.items():
-                f.write(f"{key}={value}\n")
-
-        # Create .env file for container apps
-        if os.name != "nt" and self.env is not None:
-            # Linux/Mac: generate terraform .tfvars file
-            tfvars_path = f"./environments/{self.env}/secrets.auto.tfvars.json"
-            os.makedirs(os.path.dirname(tfvars_path), exist_ok=True)
-            with open(tfvars_path, "w") as f:
-                json.dump({"keyvault_secrets": secrets}, f, indent=2)
-
-    def generate_env_tf(self, config_path='./environments/prod/step01.tf', env_path='.env'):
+        if fetch_all:
+            secrets = self.fetch_all_secrets(config)
+        else:
+            secrets = self.fetch_secrets_by_tag(config)
+
+        if fetch_all:
+            return secrets
+
+        if not fetch_all:
+            # Create .env file for UnitTest
+            with open(env_path, "w") as f:
+                for key, value in secrets.items():
+                    f.write(f"{key}={value}\n")
+
+            # Create .env file for container apps
+            if os.name != "nt" and self.env is not None:
+                # Linux/Mac: generate terraform .tfvars file
+                tfvars_path = f"./environments/{self.env}/secrets.auto.tfvars.json"
+                os.makedirs(os.path.dirname(tfvars_path), exist_ok=True)
+                with open(tfvars_path, "w") as f:
+                    json.dump({"keyvault_secrets": secrets}, f, indent=2)
+
+    def generate_env_tf(self, config_path='./environments/prod/step01.tf', env_path='.env', fetch_all=False):
         """ Main function to parse arguments and generate AKV environment variables file.
         :param config_path: Path to the Terraform configuration file
         :param env_path: Path to the destination .env file
+        :param fetch_all: Flag if all the secrets should be fetched
         """
-        self.generate_akv_env_file(config_path=config_path, env_path=env_path)
+        self.generate_akv_env_file(config_path=config_path, env_path=env_path, fetch_all=fetch_all)
 
     @staticmethod
     def generate_env_file(yaml_path='./environments/prd1/step01.yaml', env_path='./.env'):

{berryworld-1.0.0.196646.dist-info → berryworld-1.0.0.196834.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.196646
+Version: 1.0.0.196834
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd

{berryworld-1.0.0.196646.dist-info → berryworld-1.0.0.196834.dist-info}/RECORD

@@ -1,4 +1,4 @@
-berryworld/__init__.py,sha256=x0BONOWraAH1SG_BRHWpZNarRMUqoRHKkdASKMtAdhc,1140
+berryworld/__init__.py,sha256=y8vZZSv7up3H-uYHEGPDW_ucf-ynzIsoRY6jJvIPsrE,1127
 berryworld/aks_logs.py,sha256=Gb2_cokiZbEX01Yoptd0MxpDociaug-GrXdwliyxFBo,2293
 berryworld/allocation_solver.py,sha256=asFtaCAze6-eHUGWXA0kAp67UBS-Upj1KKdrVLj_ttQ,8513
 berryworld/app_logs.py,sha256=MKzKPYd3JuPfOQNAapIgaeZeFHw1z_w2mbn9I6QCADE,4180
@@ -8,7 +8,7 @@ berryworld/credentials.py,sha256=oyBvdf0q6KrofONGWIhLDTcIIon0pkA0vGOyI_dt8AE,664
 berryworld/devops.py,sha256=7mRbyZPGzk5ox-6J2etv3NxCcfP4cprG0_Xelh7prn8,9776
 berryworld/email_con.py,sha256=CVyEDVnc_iVeRTwJgIU31ToFgyix7L2yn4Ih9Wu7I5s,15806
 berryworld/email_logging.py,sha256=LeSrTExhQhar49gJR2wGC1dS0lqsNpFl9pS3eYWqnuo,4936
-berryworld/generate_env.py,sha256=kJuBb0OOYjoa2gyAnZHgn3gpoEZ8rPbMhnKcTYfENUk,11875
+berryworld/generate_env.py,sha256=LrqUH8AjCI6P0uU6BMBRYC9cnmyKkYcpXF1KKIzxkZ8,15900
 berryworld/handy_mix.py,sha256=SqJ3UjIjmIOgjbp-_1eyKQJ3OJLN7OfpDQIASvjNZ_Q,9672
 berryworld/logging.py,sha256=tOxzaFALQm3aVVEc3I7t8MU6PwgUI9VSnzNCH9yRryo,1013
 berryworld/logic_apps.py,sha256=a0uU4tNO3v2w7grdBv-OOx4hUf7VBIerJpwZ9U-29dQ,14591
@@ -26,12 +26,12 @@ berryworld/verify_keys.py,sha256=X7VUHqYDklWPDO0bGVHIOXeLq5Qi4fZRZbHYw5x7UnA,435
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
-berryworld-1.0.0.196646.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.196834.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_allocation_config.py,sha256=e12l6fE9U57eSPS35g6ekJ_hol7-RHg89JV60_m1BlE,4633
 tests/test_handy_mix_config.py,sha256=Un56mz9KJmdn4K4OwzHAHLSRzDU1Xv2nFrONNuzOG04,2594
 tests/test_xml_parser.py,sha256=3QTlhFEd6KbK6nRFKZnc35tad6wqukTbe4QrFi8mr_8,859
-berryworld-1.0.0.196646.dist-info/METADATA,sha256=vhie3997slP6IMtdOSo1W4-5A07_aiytRm0NJSq1Ihs,1445
-berryworld-1.0.0.196646.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.196646.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.196646.dist-info/RECORD,,
+berryworld-1.0.0.196834.dist-info/METADATA,sha256=7XEbbDOOj1CWZf4zWjjk5nnG5dTpD57LHa9zVMeUrQc,1445
+berryworld-1.0.0.196834.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.196834.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.196834.dist-info/RECORD,,