cs-image-system-tf-ebs-instance-plugin 0.1.2__tar.gz → 0.1.4__tar.gz

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cs-image-system-tf-ebs-instance-plugin
-Version: 0.1.2
+Version: 0.1.4
 Summary: The OpenTofu plugin for AWS: instances and EBS, EFS and S3 storages as module calls
 Project-URL: Repository, https://github.com/infrastructurebuilder/cs-image-system-3
 Project-URL: Documentation, https://github.com/infrastructurebuilder/cs-image-system-3/blob/develop/docs/OPERATIONS.md
@@ -9,9 +9,10 @@ Author-email: Mykel Alvis <mykelalvis@infrastructurebuilder.org>
 License-Expression: Apache-2.0
 License-File: LICENSE
 Requires-Python: >=3.13
-Requires-Dist: cs-image-system-aws-runtime-plugin==0.1.2
-Requires-Dist: cs-image-system-hashicorp-utils==0.1.2
-Requires-Dist: cs-image-system-system==0.1.2
+Requires-Dist: cs-image-system-aws-runtime-plugin==0.1.4
+Requires-Dist: cs-image-system-base==0.1.4
+Requires-Dist: cs-image-system-contract==0.1.4
+Requires-Dist: cs-image-system-hashicorp-utils==0.1.4
 Requires-Dist: pydantic>=2.13
 Description-Content-Type: text/markdown
 

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "cs-image-system-tf-ebs-instance-plugin"
-version = "0.1.2"
+version = "0.1.4"
 description = "The OpenTofu plugin for AWS: instances and EBS, EFS and S3 storages as module calls"
 readme = "README.md"
 authors = [{ name = "Mykel Alvis", email = "mykelalvis@infrastructurebuilder.org" }]
@@ -12,9 +12,10 @@ license = "Apache-2.0"
 license-files = ["LICENSE"]
 requires-python = ">=3.13"
 dependencies = [
-    "cs-image-system-system==0.1.2",
-    "cs-image-system-hashicorp-utils==0.1.2",
-    "cs-image-system-aws-runtime-plugin==0.1.2",
+    "cs-image-system-contract==0.1.4",
+    "cs-image-system-base==0.1.4",
+    "cs-image-system-hashicorp-utils==0.1.4",
+    "cs-image-system-aws-runtime-plugin==0.1.4",
     "pydantic>=2.13",
 ]
 

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/src/cs_image_system/tf_ebs_instance_plugin/main.py

@@ -4,7 +4,6 @@
 
 import logging
 from cs_image_system.base.basic.abstract_plugin_metadata import AbstractPluginMetadata
-from cs_image_system.base.protocols.plugin_metadata import PluginMetadataProtocol
 from .tf_instance_builder import TofuInstanceBuilder, TofuVersionChecker
 from .tf_instance_models import TOFU, TofuInstanceBuilderModel
 from .tf_storage_builder import (
@@ -28,7 +27,7 @@ from .tf_storage_models import (
 log = logging.getLogger(__name__)
 
 
-class TFEbsTofuTypes(AbstractPluginMetadata, PluginMetadataProtocol):
+class TFEbsTofuTypes(AbstractPluginMetadata):
   """Tofu instance AND storage builders in one registration.
 
   Storages live in the same plugin as instances so the two generate together

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/src/cs_image_system/tf_ebs_instance_plugin/tf_instance_builder.py

@@ -9,10 +9,10 @@ from typing import Any, TypeVar
 
 
 from cs_image_system.base import utils
-from cs_image_system.base.constants import OOPS_DEFAULTS
-from cs_image_system.base.utils import HclRaw, hcl_expr, render_module_call
+from cs_image_system.contract.constants import OOPS_DEFAULTS
+from cs_image_system.contract.hcl import HclRaw, hcl_expr, render_module_call
 from cs_image_system.base.basic.abstract_version_checker import AbstractVersionChecker
-from cs_image_system.base.basic.asset import AssetSet
+from cs_image_system.contract.assets import AssetSet
 from cs_image_system.base.basic.builder_base_instance import InstanceBuilderBase
 from cs_image_system.base.capabilities import group_builder_of
 from cs_image_system.base.launch_params import (
@@ -20,9 +20,9 @@ from cs_image_system.base.launch_params import (
     compute_launch_params,
     user_data_template,
 )
-from cs_image_system.base.lifecycle import ExecutionLifecyclePhase
+from cs_image_system.contract.lifecycle import ExecutionLifecyclePhase
 from cs_image_system.base.models.executable import ExecutableModel
-from cs_image_system.base.models.executable_adds import CFExecutables
+from cs_image_system.contract.executables import CFExecutables
 from cs_image_system.base.models.instance import Instance
 from cs_image_system.hashicorp_utils.collector import TerraformCollector, TerraformVariable
 from cs_image_system.hashicorp_utils.roots import TerraformRootMixin
@@ -593,7 +593,7 @@ class TofuInstanceBuilder(InstanceBuilderBase[Q], TerraformRootMixin):
         # generated/retention/, where no instance root exists and nothing
         # reads it (never staged, it lingered untracked after every release
         # run). Only the lifecycle that generates instance roots gets it.
-        from cs_image_system.base.lifecycles import Lifecycle
+        from cs_image_system.contract.lifecycles import Lifecycle
         current = getattr(ctx, "current_lifecycle", None)      # a bare harness context has none
         if current is not None and str(current.value) != Lifecycle.INSTANCE_IMAGE.value:
             return

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/src/cs_image_system/tf_ebs_instance_plugin/tf_instance_models.py

@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import field
-from cs_image_system.base.models.model_config import CSIS_MODEL_CONFIG
+from cs_image_system.contract.model_config import CSIS_MODEL_CONFIG
 from pydantic.dataclasses import dataclass  # stage 23: validation at construction
 
-from cs_image_system.base.constants import DEFAULT, VCT
-from cs_image_system.base.helpers.field_helpers import fk_field
+from cs_image_system.contract.constants import DEFAULT, VCT
+from cs_image_system.contract.fields import fk_field
 from cs_image_system.base.models.instance_builder import InstanceBuilderModel
 from cs_image_system.hashicorp_utils.hashicorp_models import TFTofuPluginModel
 

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/src/cs_image_system/tf_ebs_instance_plugin/tf_storage_builder.py

@@ -8,18 +8,18 @@ from typing import Any, TypeVar, cast
 
 
 from cs_image_system.base import utils
-from cs_image_system.base.utils import HclRaw, render_module_call
+from cs_image_system.contract.hcl import HclRaw, render_module_call
 from cs_image_system.base.basic.abstract_version_checker import AbstractVersionChecker
-from cs_image_system.base.basic.asset import AssetSet
+from cs_image_system.contract.assets import AssetSet
 from cs_image_system.base.basic.builder_base_group import GroupBuilderBase
 from cs_image_system.base.basic.builder_base_storage import (
     CARDINALITY_MANY,
     CARDINALITY_SINGLE,
     StorageBuilderBase,
 )
-from cs_image_system.base.lifecycle import ExecutionLifecyclePhase
+from cs_image_system.contract.lifecycle import ExecutionLifecyclePhase
 from cs_image_system.base.models.executable import ExecutableModel
-from cs_image_system.base.models.executable_adds import CFExecutables
+from cs_image_system.contract.executables import CFExecutables
 from cs_image_system.base.models.storage import STORAGE_STATE_ACTIVE, STORAGE_STATE_ARCHIVED, STORAGE_STATE_DESTROYED, Storage
 from cs_image_system.hashicorp_utils.blocks import OutputSpec, Raw, render_blocks
 from cs_image_system.hashicorp_utils.collector import TerraformCollector
@@ -59,11 +59,11 @@ class RecordedStorage:
         return f"RecordedStorage({self.name!r}, {self.recorded_state!r})"
 
 
-def _groups(storage: Any) -> list[str]:
+def storage_groups(storage: Any) -> list[str]:
     return list(getattr(storage, "groups", []) or [])
 
 
-def _public_read(storage: Any) -> bool:
+def storage_public_read(storage: Any) -> bool:
     return bool(getattr(storage, "public_read", False))
 
 
@@ -162,7 +162,7 @@ class TofuStorageBuilder(StorageBuilderBase[Q], TerraformRootMixin):
         """Identity workspaces whose gids this root consumes, by workspace name."""
         out: dict[str, GroupBuilderBase] = {}
         for storage in self.live_storages():
-            for group in _groups(storage):
+            for group in storage_groups(storage):
                 gb = self._group_builder_for(group)
                 ws = gb.gid_workspace() if gb is not None else None   # stage 75 step 3
                 if gb is not None and ws is not None:
@@ -188,7 +188,7 @@ class TofuStorageBuilder(StorageBuilderBase[Q], TerraformRootMixin):
         return {
             group: {"gid": self.gid_reference(group), "path": f"/{group}",
                     "permissions": getattr(storage, "share_mode", "2770")}
-            for group in sorted(_groups(storage))
+            for group in sorted(storage_groups(storage))
         }
 
     def generate_items_before(self, phase: ExecutionLifecyclePhase) -> AssetSet:
@@ -248,9 +248,9 @@ class TofuStorageBuilder(StorageBuilderBase[Q], TerraformRootMixin):
             items.add(rpath,
                       f"# Terraform module call for storage {storage.get_name()} "
                       f"generated by {self.__class__.__name__} ({self.name})")
-            if _groups(storage):
-                items.add(rpath, f"# allowed groups: {', '.join(_groups(storage))} "
-                                 f"(gids by remote-state reference); public_read={str(_public_read(storage)).lower()}; "
+            if storage_groups(storage):
+                items.add(rpath, f"# allowed groups: {', '.join(storage_groups(storage))} "
+                                 f"(gids by remote-state reference); public_read={str(storage_public_read(storage)).lower()}; "
                                  f"requested state: {_state(storage)}")
             items.add_list(rpath, render_module_call(
                 f"storage_{label}", src, self.module_args(storage),
@@ -632,10 +632,10 @@ class TofuEfsStorageBuilder(TofuStorageBuilder[S]):
             args["transition_to_ia"] = f"AFTER_{int(spec['ia_days'])}_DAYS"
         if spec.get("archive_days"):
             args["transition_to_archive"] = f"AFTER_{int(spec['archive_days'])}_DAYS"
-        if _groups(storage):
+        if storage_groups(storage):
             # EFS access points realize gid-owned subtrees natively (Q3).
             args["access_points"] = self.group_subtrees(storage)
-        if _public_read(storage):
+        if storage_public_read(storage):
             args["public_read"] = True
         # Mount targets (stage 19): an EFS filesystem is reachable only through
         # an ENI in the VPC, one per availability zone, and without them
@@ -789,9 +789,9 @@ class TofuS3StorageBuilder(TofuStorageBuilder[B]):
                 "transition_days": int(spec.get("transition_days") or 0),
                 "storage_class": str(spec.get("storage_class") or ""),
                 "expire_days": int(spec.get("expire_days") or 0)}]
-        if _groups(storage):
-            args["group_prefixes"] = sorted(_groups(storage))
-        if _public_read(storage):
+        if storage_groups(storage):
+            args["group_prefixes"] = sorted(storage_groups(storage))
+        if storage_public_read(storage):
             args["public_read"] = True
         tags = _tags_for(self, storage)
         if tags:

{cs_image_system_tf_ebs_instance_plugin-0.1.2 → cs_image_system_tf_ebs_instance_plugin-0.1.4}/src/cs_image_system/tf_ebs_instance_plugin/tf_storage_models.py

@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import field
-from cs_image_system.base.models.model_config import CSIS_MODEL_CONFIG
+from cs_image_system.contract.model_config import CSIS_MODEL_CONFIG
 from pydantic.dataclasses import dataclass  # stage 23: validation at construction
 
-from cs_image_system.base.constants import DEFAULT, VCT
-from cs_image_system.base.helpers.field_helpers import fk_field
+from cs_image_system.contract.constants import DEFAULT, VCT
+from cs_image_system.contract.fields import fk_field
 from cs_image_system.base.models.module_variables import ModuleVariables
 from cs_image_system.base.models.storage_builder import StorageBuilderModel
 from cs_image_system.hashicorp_utils.hashicorp_models import TFTofuPluginModel