cs-image-system-aws-runtime-plugin 0.1.3__tar.gz → 0.1.4__tar.gz

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cs-image-system-aws-runtime-plugin
-Version: 0.1.3
+Version: 0.1.4
 Summary: The aws runtime type: Amazon EC2 as a place where images bake and instances run
 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
@@ -11,8 +11,9 @@ License-File: LICENSE
 Requires-Python: >=3.13
 Requires-Dist: boto3>=1.43
 Requires-Dist: botocore>=1.43
-Requires-Dist: cs-image-system-hashicorp-utils==0.1.3
-Requires-Dist: cs-image-system-system==0.1.3
+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
 Requires-Dist: python-hcl2>=8.1
 Description-Content-Type: text/markdown
@@ -1139,7 +1140,7 @@ when the installed version is below it.
 - [default-os-plugin](../default-os-plugin/README.md): the OS builders whose runtime entries this plugin resolves to AMIs.
 - [packer-plugin](../packer-plugin/README.md): the image builder that asks this plugin for the `amazon-ebs` source and the session provisioners.
 - [tf-ebs-instance-plugin](../tf-ebs-instance-plugin/README.md): the instance and storage roots that read this model's networking, profile and session profile.
-- [dummy-plugin](../dummy-plugin/README.md): the extension template; an unregistered copy of its group model sits at the bottom of this package's models module.
+- [dummy-plugin](../dummy-plugin/README.md): the extension template (an unregistered copy of its group model sat at the bottom of this package's models module until stage 63).
 - Base classes: [runtime.py](../base/src/cs_image_system/base/models/runtime.py), [cloud_builder.py](../base/src/cs_image_system/base/models/cloud_builder.py), [credentials.py](../base/src/cs_image_system/base/models/credentials.py), [provider_specific_image.py](../base/src/cs_image_system/base/models/provider_specific_image.py), [builder_base_runtime.py](../base/src/cs_image_system/base/basic/builder_base_runtime.py), [abstract_version_checker.py](../base/src/cs_image_system/base/basic/abstract_version_checker.py).
 - Consumers of the hooks: [state_query.py](../base/src/cs_image_system/base/state_query.py), [retention.py](../base/src/cs_image_system/base/retention.py), [dispose.py](../base/src/cs_image_system/base/commands/dispose.py), [verify_instance.py](../base/src/cs_image_system/base/commands/verify_instance.py), [unmount.py](../base/src/cs_image_system/base/commands/unmount.py), [relabel.py](../base/src/cs_image_system/base/commands/relabel.py), [release.py](../base/src/cs_image_system/base/release.py), [power_state.py](../base/src/cs_image_system/base/power_state.py), [provider_aliases.py](../base/src/cs_image_system/base/provider_aliases.py), [runtime_facts.py](../base/src/cs_image_system/base/commands/runtime_facts.py).
 - [docs/OPERATIONS.md](../../docs/OPERATIONS.md) for the credential contract and the operator's cycles; [docs/DESIGN.md](../../docs/DESIGN.md) for the design; [docs/PLUGINS.md](../../docs/PLUGINS.md) for the package index.

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/README.md

@@ -1120,7 +1120,7 @@ when the installed version is below it.
 - [default-os-plugin](../default-os-plugin/README.md): the OS builders whose runtime entries this plugin resolves to AMIs.
 - [packer-plugin](../packer-plugin/README.md): the image builder that asks this plugin for the `amazon-ebs` source and the session provisioners.
 - [tf-ebs-instance-plugin](../tf-ebs-instance-plugin/README.md): the instance and storage roots that read this model's networking, profile and session profile.
-- [dummy-plugin](../dummy-plugin/README.md): the extension template; an unregistered copy of its group model sits at the bottom of this package's models module.
+- [dummy-plugin](../dummy-plugin/README.md): the extension template (an unregistered copy of its group model sat at the bottom of this package's models module until stage 63).
 - Base classes: [runtime.py](../base/src/cs_image_system/base/models/runtime.py), [cloud_builder.py](../base/src/cs_image_system/base/models/cloud_builder.py), [credentials.py](../base/src/cs_image_system/base/models/credentials.py), [provider_specific_image.py](../base/src/cs_image_system/base/models/provider_specific_image.py), [builder_base_runtime.py](../base/src/cs_image_system/base/basic/builder_base_runtime.py), [abstract_version_checker.py](../base/src/cs_image_system/base/basic/abstract_version_checker.py).
 - Consumers of the hooks: [state_query.py](../base/src/cs_image_system/base/state_query.py), [retention.py](../base/src/cs_image_system/base/retention.py), [dispose.py](../base/src/cs_image_system/base/commands/dispose.py), [verify_instance.py](../base/src/cs_image_system/base/commands/verify_instance.py), [unmount.py](../base/src/cs_image_system/base/commands/unmount.py), [relabel.py](../base/src/cs_image_system/base/commands/relabel.py), [release.py](../base/src/cs_image_system/base/release.py), [power_state.py](../base/src/cs_image_system/base/power_state.py), [provider_aliases.py](../base/src/cs_image_system/base/provider_aliases.py), [runtime_facts.py](../base/src/cs_image_system/base/commands/runtime_facts.py).
 - [docs/OPERATIONS.md](../../docs/OPERATIONS.md) for the credential contract and the operator's cycles; [docs/DESIGN.md](../../docs/DESIGN.md) for the design; [docs/PLUGINS.md](../../docs/PLUGINS.md) for the package index.

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "cs-image-system-aws-runtime-plugin"
-version = "0.1.3"
+version = "0.1.4"
 description = "The aws runtime type: Amazon EC2 as a place where images bake and instances run"
 readme = "README.md"
 authors = [{ name = "Mykel Alvis", email = "mykelalvis@infrastructurebuilder.org" }]
@@ -12,8 +12,9 @@ license = "Apache-2.0"
 license-files = ["LICENSE"]
 requires-python = ">=3.13"
 dependencies = [
-    "cs-image-system-system==0.1.3",
-    "cs-image-system-hashicorp-utils==0.1.3",
+    "cs-image-system-contract==0.1.4",
+    "cs-image-system-base==0.1.4",
+    "cs-image-system-hashicorp-utils==0.1.4",
     "boto3>=1.43",
     "botocore>=1.43",
     "python-hcl2>=8.1",

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/src/cs_image_system/aws_runtime/aws_packer_source.py

@@ -18,7 +18,7 @@ from typing import Any
 import hcl2
 from hcl2 import Builder
 
-from cs_image_system.base.constants import OOPS_DEFAULTS
+from cs_image_system.contract.constants import OOPS_DEFAULTS
 from cs_image_system.hashicorp_utils.hashicorp import FO
 
 from .aws_runtime_models import AwsCloudBuilderModel, AwsCloudNetworkingModel

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/src/cs_image_system/aws_runtime/aws_runtime_builders.py

@@ -8,14 +8,14 @@ from typing import Any
 
 
 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_cloud import CloudBuilderBase
-from cs_image_system.base.constants import VCT
-from cs_image_system.base.lifecycle import ExecutionLifecyclePhase
+from cs_image_system.contract.constants import VCT
+from cs_image_system.contract.lifecycle import ExecutionLifecyclePhase
 from cs_image_system.base.models.os_builder_runtime_config import OSBuilderBaseImageBuilderSubconfig
 from cs_image_system.base.models.provider_specific_image import ProviderSpecificImage
 from cs_image_system.base import power_state
-from cs_image_system.base.protocols.plugin_metadata import PluginArtifactProtocol
+from cs_image_system.contract.core import PluginArtifactProtocol
 
 from .aws_provider_specific_image import AwsProviderSpecificImage
 from .aws_runtime_models import AWS_CLI, AwsCloudBuilderModel

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/src/cs_image_system/aws_runtime/aws_runtime_models.py

@@ -4,18 +4,18 @@
 
 from dataclasses import field
 from cs_image_system.base.models.credentials import CredentialsBase
-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 typing import Any
 
 import logging
 
 from cs_image_system.aws_runtime import aws_utils
-from cs_image_system.base.helpers.field_helpers import fk_field
+from cs_image_system.contract.fields import fk_field, parent_field
 log = logging.getLogger(__name__)
 
 
-from cs_image_system.base.constants import DEFAULT, OOPS_DEFAULTS, VCT
+from cs_image_system.contract.constants import DEFAULT, OOPS_DEFAULTS, VCT
 from cs_image_system.base.models.cloud_builder import CloudBuilderModel, CloudNetworkingConfig
 
 
@@ -35,11 +35,7 @@ class AwsCloudNetworkingModel(CloudNetworkingConfig):
     # ingress to the shared networks' address space).
     ssh_ingress_security_group_ids: list[str] = field(default_factory=list)
     
-    _model_id: str | None = fk_field(target=VCT.RUNTIME_BUILDER_MODEL,
-                                     init=False, 
-                                     default=None, metadata={
-                "description": "The name of the runtime model this object is associated with",
-            })
+    _model_id: str | None = parent_field(VCT.RUNTIME_BUILDER_MODEL, description="The name of the runtime model this object is associated with")
 
     def __post_init__(self) -> None:
         super().__post_init__()

{cs_image_system_aws_runtime_plugin-0.1.3 → cs_image_system_aws_runtime_plugin-0.1.4}/src/cs_image_system/aws_runtime/main.py

@@ -5,13 +5,12 @@
 import logging
 
 from cs_image_system.base.basic.abstract_plugin_metadata import AbstractPluginMetadata
-from cs_image_system.base.protocols.plugin_metadata import PluginMetadataProtocol
 from .aws_runtime_builders import AWS_RUNTIME, AwsCLIVersionChecker, AwsCloudBuilder
 from .aws_runtime_models import AwsCloudBuilderModel
 
 log = logging.getLogger(__name__)
 
-class AwsRuntimePluginMetadata(AbstractPluginMetadata,PluginMetadataProtocol):
+class AwsRuntimePluginMetadata(AbstractPluginMetadata):
   def __init__(self) -> None:
     super().__init__( "1", "3.13",
                      {AWS_RUNTIME: [