genesis-devtools 0.2.3__tar.gz → 0.2.4__tar.gz

genesis_devtools-0.2.4/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+0.2.4
+-----
+
+* Bugfix: Building several images for one element (#47)

{genesis_devtools-0.2.3 → genesis_devtools-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genesis-devtools
-Version: 0.2.3
+Version: 0.2.4
 Summary: Tools to manager life cycle of Genesis projects.
 Home-page: https://github.com/infraguys/genesis_devtools
 Author: Genesis Corporation

{genesis_devtools-0.2.3 → genesis_devtools-0.2.4}/genesis_devtools/builder/base.py

@@ -131,6 +131,7 @@ class AbstractImageBuilder(abc.ABC):
         image: Image,
         deps: tp.List[AbstractDependency],
         developer_keys: tp.Optional[str] = None,
+        output_dir: str = c.DEF_GEN_OUTPUT_DIR_NAME,
     ) -> None:
         """Actions to prepare the environment for building the image."""
 
@@ -157,9 +158,10 @@ class AbstractImageBuilder(abc.ABC):
         image: Image,
         deps: tp.List[AbstractDependency],
         developer_keys: tp.Optional[str] = None,
+        output_dir: str = c.DEF_GEN_OUTPUT_DIR_NAME,
     ) -> None:
         """Run the image builder."""
-        self.pre_build(image_dir, image, deps, developer_keys)
+        self.pre_build(image_dir, image, deps, developer_keys, output_dir)
         self.build(image_dir, image, developer_keys)
         self.post_build(image_dir, image)
 
@@ -176,6 +178,7 @@ class DummyImageBuilder(AbstractImageBuilder):
         image: Image,
         deps: tp.List[AbstractDependency],
         developer_keys: tp.Optional[str] = None,
+        output_dir: str = c.DEF_GEN_OUTPUT_DIR_NAME,
     ) -> None:
         """Actions to prepare the environment for building the image."""
         return None

{genesis_devtools-0.2.3 → genesis_devtools-0.2.4}/genesis_devtools/builder/builder.py

@@ -17,9 +17,12 @@ from __future__ import annotations
 
 import typing as tp
 import tempfile
+import shutil
+import os
 
 from genesis_devtools.builder import base
 from genesis_devtools.logger import AbstractLogger, DummyLogger
+from genesis_devtools import constants as c
 
 
 class SimpleBuilder:
@@ -35,6 +38,7 @@ class SimpleBuilder:
         elements: tp.List[base.Element],
         image_builder: base.AbstractImageBuilder,
         logger: tp.Optional[AbstractLogger] = None,
+        images_output_dir: str = c.DEF_GEN_OUTPUT_DIR_NAME,
     ) -> None:
         super().__init__()
         self._deps = deps
@@ -42,6 +46,44 @@ class SimpleBuilder:
         self._image_builder = image_builder
         self._work_dir = work_dir
         self._logger = logger or DummyLogger()
+        self._images_output_dir = images_output_dir
+
+    def _build_image(
+        self,
+        img: base.Image,
+        build_dir: str | None,
+        output_dir: str,
+        developer_keys: str,
+    ) -> None:
+        # The build_dir is used only for debugging purposes to observe
+        # the content of the image. In production, the image is built
+        # in a temporary directory.
+        if build_dir is not None:
+            self._image_builder.run(
+                build_dir,
+                img,
+                self._deps,
+                developer_keys,
+                output_dir,
+            )
+        else:
+            with tempfile.TemporaryDirectory() as temp_dir:
+                self._image_builder.run(
+                    temp_dir,
+                    img,
+                    self._deps,
+                    developer_keys,
+                    output_dir,
+                )
+
+        # Move the image to the final location
+        if not os.path.exists(self._images_output_dir):
+            os.makedirs(self._images_output_dir)
+
+        shutil.move(
+            os.path.join(output_dir, f"{img.name}.{img.format}"),
+            self._images_output_dir,
+        )
 
     def fetch_dependency(self, deps_dir: str) -> None:
         """Fetch common dependencies for elements."""
@@ -63,19 +105,15 @@ class SimpleBuilder:
             for img in e.images:
                 if build_suffix:
                     img.name = f"{img.name}.{build_suffix}"
+                tmp_img_output = f"_tmp_{img.name}-output"
 
-                # The build_dir is used only for debugging purposes to observe
-                # the content of the image. In production, the image is built
-                # in a temporary directory.
-                if build_dir is not None:
-                    self._image_builder.run(
-                        build_dir, img, self._deps, developer_keys
+                try:
+                    self._build_image(
+                        img, build_dir, tmp_img_output, developer_keys
                     )
-                else:
-                    with tempfile.TemporaryDirectory() as temp_dir:
-                        self._image_builder.run(
-                            temp_dir, img, self._deps, developer_keys
-                        )
+                finally:
+                    if os.path.exists(tmp_img_output):
+                        shutil.rmtree(tmp_img_output)
 
     @classmethod
     def from_config(
@@ -84,6 +122,7 @@ class SimpleBuilder:
         build_config: tp.Dict[str, tp.Any],
         image_builder: base.AbstractImageBuilder,
         logger: tp.Optional[AbstractLogger] = None,
+        images_output_dir: str = c.DEF_GEN_OUTPUT_DIR_NAME,
     ) -> "SimpleBuilder":
         """Create a builder from configuration."""
         # Prepare dependencies entries but do not fetch them
@@ -107,4 +146,6 @@ class SimpleBuilder:
         if not elements:
             raise ValueError("No elements found in configuration")
 
-        return cls(work_dir, deps, elements, image_builder, logger)
+        return cls(
+            work_dir, deps, elements, image_builder, logger, images_output_dir
+        )

{genesis_devtools-0.2.3 → genesis_devtools-0.2.4}/genesis_devtools/builder/packer.py

@@ -90,7 +90,7 @@ class PackerVariable(tp.NamedTuple):
         return self.var_tmpl.format(**data)
 
     @classmethod
-    def variable_file_content(cls, overrides: tp.Dict[str, tp.Any]) -> str:
+    def variable_file_content(cls, overrides: dict[str, tp.Any]) -> str:
         if not overrides:
             return ""
 
@@ -116,12 +116,9 @@ class PackerBuilder(base.DummyImageBuilder):
     Packer image builder that uses Packer tools to build images.
     """
 
-    def __init__(
-        self, output_dir: str, logger: AbstractLogger | None = None
-    ) -> None:
+    def __init__(self, logger: AbstractLogger | None = None) -> None:
         super().__init__()
         self._logger = logger or DummyLogger()
-        self._output_dir = output_dir
 
     def _resolve_envs(self, envs: list[str]) -> str:
         if len(envs) == 0:
@@ -144,8 +141,9 @@ class PackerBuilder(base.DummyImageBuilder):
         self,
         image_dir: str,
         image: base.Image,
-        deps: tp.List[base.AbstractDependency],
+        deps: list[base.AbstractDependency],
         developer_keys: str | None = None,
+        output_dir: str = c.DEF_GEN_OUTPUT_DIR_NAME,
     ) -> None:
         """Actions to prepare the environment for building the image."""
 
@@ -195,7 +193,7 @@ class PackerBuilder(base.DummyImageBuilder):
             file_provisioners="\n".join(provisioners),
             script=image.script,
             developer_keys=developer_keys_prov,
-            output_directory=self._output_dir,
+            output_directory=output_dir,
             envs=envs,
         )
 

{genesis_devtools-0.2.3 → genesis_devtools-0.2.4}/genesis_devtools/cmd/cli.py

@@ -133,7 +133,7 @@ def build_cmd(
         return
 
     logger = ClickLogger()
-    packer_image_builder = PackerBuilder(output_dir, logger)
+    packer_image_builder = PackerBuilder(logger)
 
     # Path where genesis.yaml configuration file is located
     work_dir = os.path.abspath(
@@ -147,7 +147,7 @@ def build_cmd(
 
     for _, build in builds.items():
         builder = SimpleBuilder.from_config(
-            work_dir, build, packer_image_builder, logger
+            work_dir, build, packer_image_builder, logger, output_dir
         )
         with tempfile.TemporaryDirectory() as temp_dir:
             builder.fetch_dependency(deps_dir or temp_dir)
@@ -210,8 +210,6 @@ def build_cmd(
 @click.option(
     "-f",
     "--force",
-    default=False,
-    type=bool,
     show_default=True,
     is_flag=True,
     help="Rebuild if the output already exists",

{genesis_devtools-0.2.3 → genesis_devtools-0.2.4}/genesis_devtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genesis-devtools
-Version: 0.2.3
+Version: 0.2.4
 Summary: Tools to manager life cycle of Genesis projects.
 Home-page: https://github.com/infraguys/genesis_devtools
 Author: Genesis Corporation

genesis_devtools-0.2.4/genesis_devtools.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "5308a95", "is_release": false}

genesis_devtools-0.2.3/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-0.2.3
------
-
-* Added ability to set default value for envs (#46)

genesis_devtools-0.2.3/genesis_devtools.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "5ae17c1", "is_release": false}