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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cs-image-system-gcloud-runtime-plugin
-Version: 0.1.3
+Version: 0.1.4
 Summary: The gcloud runtime type: Google Compute Engine 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
@@ -9,8 +9,9 @@ Author-email: Mykel Alvis <mykelalvis@infrastructurebuilder.org>
 License-Expression: Apache-2.0
 License-File: LICENSE
 Requires-Python: >=3.13
-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: google-api-core>=2.31
 Requires-Dist: google-auth>=2.55
 Requires-Dist: google-cloud-compute>=1.49

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

@@ -4,7 +4,7 @@
 
 [project]
 name = "cs-image-system-gcloud-runtime-plugin"
-version = "0.1.3"
+version = "0.1.4"
 description = "The gcloud runtime type: Google Compute Engine 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",
     "google-cloud-compute>=1.49",
     "google-api-core>=2.31",
     "google-auth>=2.55",

{cs_image_system_gcloud_runtime_plugin-0.1.3 → cs_image_system_gcloud_runtime_plugin-0.1.4}/src/cs_image_system/gcloud_runtime/gcp_packer_source.py

@@ -26,7 +26,7 @@ from typing import Any
 import hcl2
 from hcl2 import Builder
 
-from cs_image_system.base.constants import OOPS_DEFAULTS, SELF
+from cs_image_system.contract.constants import OOPS_DEFAULTS, SELF
 from cs_image_system.hashicorp_utils.hashicorp import FO
 
 log = logging.getLogger(__name__)

{cs_image_system_gcloud_runtime_plugin-0.1.3 → cs_image_system_gcloud_runtime_plugin-0.1.4}/src/cs_image_system/gcloud_runtime/gcp_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 .gcp_provider_specific_image import GcpProviderSpecificImage
 from .gcp_runtime_models import GCPCloudBuilderModel
@@ -208,13 +208,13 @@ class GCPCloudBuilder(CloudBuilderBase[GCPCloudBuilderModel], PluginArtifactProt
     def serial_console(self, instance_name: str) -> str:
         """The instance's serial port 1 output (read-only)."""
         from .gcp_packer_source import gce_name
-        from .gcp_utils import _make_credentials, resolve_project
+        from .gcp_utils import make_credentials, resolve_project
         from google.cloud import compute_v1  # noqa: PLC0415
         cfg = self.model.self_to_gcp_client_config()
         project, zone = resolve_project(cfg), getattr(self.model, "zone", None)
         if not project or not zone:
             raise RuntimeError(f"GCP runtime {self.get_name()}: no project/zone to read a serial console")
-        creds = _make_credentials(cfg)
+        creds = make_credentials(cfg)
         kw = {"credentials": creds} if creds else {}
         out = compute_v1.InstancesClient(**kw).get_serial_port_output(
             project=project, zone=zone, instance=gce_name(instance_name))
@@ -354,12 +354,12 @@ class GCPCloudBuilder(CloudBuilderBase[GCPCloudBuilderModel], PluginArtifactProt
         93), so the emptiness check counts this configuration's alone."""
         import subprocess  # noqa: PLC0415
         from google.cloud import compute_v1  # noqa: PLC0415
-        from .gcp_utils import _make_credentials, resolve_project
+        from .gcp_utils import make_credentials, resolve_project
         cfg = self.model.self_to_gcp_client_config()
         project, zone = resolve_project(cfg), getattr(self.model, "zone", None)
         if not project or not zone:
             raise RuntimeError(f"GCP runtime {self.get_name()}: no project/zone to inventory")
-        creds = _make_credentials(cfg)
+        creds = make_credentials(cfg)
         kw = {"credentials": creds} if creds else {}
         from cs_image_system.base.lineage import CONFIG_TAG
         owners: dict[str, dict[str, str]] = {"instances": {}, "images": {}, "disks": {}, "buckets": {}}
@@ -440,7 +440,7 @@ class GCPCloudBuilder(CloudBuilderBase[GCPCloudBuilderModel], PluginArtifactProt
         Read-only; None when the instance, disk, zone or project cannot be
         resolved, so the caller makes no claim."""
         from .gcp_packer_source import gce_name
-        from .gcp_utils import _make_credentials, resolve_project
+        from .gcp_utils import make_credentials, resolve_project
         try:
             from google.cloud import compute_v1  # noqa: PLC0415
             cfg = self.model.self_to_gcp_client_config()
@@ -448,7 +448,7 @@ class GCPCloudBuilder(CloudBuilderBase[GCPCloudBuilderModel], PluginArtifactProt
             zone = getattr(self.model, "zone", None)
             if not project or not zone:
                 return None
-            creds = _make_credentials(cfg)
+            creds = make_credentials(cfg)
             kw = {"credentials": creds} if creds else {}
             inst = compute_v1.InstancesClient(**kw).get(project=project, zone=zone,
                                                         instance=gce_name(instance_name))
@@ -486,13 +486,13 @@ class GCPCloudBuilder(CloudBuilderBase[GCPCloudBuilderModel], PluginArtifactProt
     def _instances_client(self):
         """(client, project, zone) for instance calls, or None when the
         runtime is not resolvable."""
-        from .gcp_utils import _make_credentials, resolve_project
+        from .gcp_utils import make_credentials, resolve_project
         from google.cloud import compute_v1  # noqa: PLC0415
         cfg = self.model.self_to_gcp_client_config()
         project, zone = resolve_project(cfg), getattr(self.model, "zone", None)
         if not project or not zone:
             return None
-        creds = _make_credentials(cfg)
+        creds = make_credentials(cfg)
         kw = {"credentials": creds} if creds else {}
         return compute_v1.InstancesClient(**kw), str(project), str(zone)
 

{cs_image_system_gcloud_runtime_plugin-0.1.3 → cs_image_system_gcloud_runtime_plugin-0.1.4}/src/cs_image_system/gcloud_runtime/gcp_runtime_models.py

@@ -3,18 +3,18 @@
 # 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 typing import Any
 
 import logging
 
 from cs_image_system.gcloud_runtime import gcp_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
 
 
@@ -27,11 +27,7 @@ class GCPCloudNetworkingModel(CloudNetworkingConfig):
     # closest GCP analog to AWS security group ids.
     network_tags: 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_gcloud_runtime_plugin-0.1.3 → cs_image_system_gcloud_runtime_plugin-0.1.4}/src/cs_image_system/gcloud_runtime/gcp_utils.py

@@ -15,7 +15,7 @@ from typing import Any, Sequence, cast
 from google.api_core import exceptions as gcp_exceptions
 from google.cloud import compute_v1
 
-from cs_image_system.base.constants import SELF
+from cs_image_system.contract.constants import SELF
 from cs_image_system.base.models.os_builder_runtime_config import OSBuilderBaseImageBuilderSubconfig
 
 log = logging.getLogger(__name__)
@@ -125,7 +125,7 @@ def _generic_architecture(value: Any) -> str:
     return v if v in ("x86_64", "arm64") else "x86_64"
 
 
-def _make_credentials(session_config: Mapping[str, Any]) -> Any | None:
+def make_credentials(session_config: Mapping[str, Any]) -> Any | None:
     creds_cfg = session_config.get("credentials") or {}
     key_file = creds_cfg.get("service_account_key_file")
     if key_file:
@@ -136,7 +136,7 @@ def _make_credentials(session_config: Mapping[str, Any]) -> Any | None:
 
 
 def _make_images_client(session_config: Mapping[str, Any]) -> compute_v1.ImagesClient:
-    creds = _make_credentials(session_config)
+    creds = make_credentials(session_config)
     return compute_v1.ImagesClient(credentials=creds) if creds else compute_v1.ImagesClient()
 
 
@@ -429,7 +429,7 @@ def get_network_map_and_default_network(
             "the GCP runtime."
         )
     try:
-        creds = _make_credentials(session_config)
+        creds = make_credentials(session_config)
         kwargs: dict[str, Any] = {"credentials": creds} if creds else {}
         clients = clients or {}
         networks_client = clients.get("networks") or compute_v1.NetworksClient(**kwargs)

{cs_image_system_gcloud_runtime_plugin-0.1.3 → cs_image_system_gcloud_runtime_plugin-0.1.4}/src/cs_image_system/gcloud_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 .gcp_runtime_builders import GCP_RUNTIME, GCPCLIVersionChecker, GCPCloudBuilder
 from .gcp_runtime_models import GCPCloudBuilderModel
 
 log = logging.getLogger(__name__)
 
-class GcpRuntimePluginMetadata(AbstractPluginMetadata,PluginMetadataProtocol):
+class GcpRuntimePluginMetadata(AbstractPluginMetadata):
   def __init__(self) -> None:
     super().__init__( "1", "3.13",
                      {GCP_RUNTIME: [