nyl 0.0.7__tar.gz → 0.0.8__tar.gz

{nyl-0.0.7 → nyl-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nyl
-Version: 0.0.7
+Version: 0.0.8
 Summary: Default template for PDM package
 Author-Email: Niklas Rosenstein <rosensteinniklas@gmail.com>
 License: MIT

{nyl-0.0.7 → nyl-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nyl"
-version = "0.0.7"
+version = "0.0.8"
 description = "Default template for PDM package"
 authors = [
     { name = "Niklas Rosenstein", email = "rosensteinniklas@gmail.com" },

{nyl-0.0.7 → nyl-0.0.8}/src/nyl/commands/__init__.py

@@ -15,6 +15,7 @@ from nyl.tools.typer import new_typer
 app = new_typer(help=__doc__)
 
 
+from . import argocd  # noqa: E402
 from . import crds  # noqa: F401,E402
 from . import new  # noqa: E402
 from . import profile  # noqa: E402
@@ -22,6 +23,7 @@ from . import secrets  # noqa: E402
 from . import template  # noqa: F401,E402
 from . import tun  # noqa: E402
 
+app.add_typer(argocd.app)
 app.add_typer(new.app)
 app.add_typer(profile.app)
 app.add_typer(secrets.app)

nyl-0.0.8/src/nyl/commands/argocd.py

@@ -0,0 +1,35 @@
+"""
+Helper commands for the ArgoCD integration.
+"""
+
+import sys
+
+from loguru import logger
+from nyl.project.config import ProjectConfig
+from nyl.secrets.config import SecretsConfig
+from nyl.tools.typer import new_typer
+
+
+app = new_typer(name="argocd", help=__doc__)
+
+
+@app.command()
+def discovery() -> None:
+    """
+    Discover whether the current working directory uses Nyl. This is when either a `nyl-project.yaml` or
+    `nyl-secrets.yaml` file is present in the directory or any of its parent directories.
+    """
+
+    found = False
+    if (file := ProjectConfig.load().file) is not None:
+        print(file.absolute())
+        found = True
+    if (file := SecretsConfig.load().file) is not None:
+        print(file.absolute())
+        found = True
+
+    if not found:
+        logger.info("No Nyl project or secrets configuration found.")
+    else:
+        logger.info("Found Nyl project and/or secrets configuration.")
+    sys.exit(0 if found else 1)

{nyl-0.0.7 → nyl-0.0.8}/src/nyl/commands/template.py

@@ -13,6 +13,7 @@ from kubernetes.config.incluster_config import load_incluster_config
 from kubernetes.config.kube_config import load_kube_config
 from kubernetes.client.api_client import ApiClient
 from nyl.project.config import ProjectConfig
+from nyl.resources import API_VERSION_INLINE, NylResource
 from nyl.resources.applyset import APPLYSET_LABEL_PART_OF, ApplySet
 from nyl.secrets.config import SecretsConfig
 from nyl.tools.kubectl import Kubectl
@@ -59,6 +60,7 @@ def template(
         "This option must be disabled when passing the generated manifests to `kubectl apply --applyset=...`, as it "
         "would otherwise cause an error due to the label being present on the input data.",
     ),
+    inline: bool = Option(True, help="Evaluate Nyl inlined resources."),
 ) -> None:
     """
     Render a package template into full Kubernetes resources.
@@ -128,11 +130,12 @@ def template(
         logger.opt(ansi=True).info("Rendering manifests from <blue>{}</>.", source.file)
 
         source.manifests = cast(Manifests, template_engine.evaluate(source.manifests))
-        source.manifests = reconcile_generator(
-            generator,
-            source.manifests,
-            on_generated=lambda m: cast(Manifest, template_engine.evaluate(m)),
-        )
+        if inline:
+            source.manifests = reconcile_generator(
+                generator,
+                source.manifests,
+                on_generated=lambda m: cast(Manifest, template_engine.evaluate(m)),
+            )
 
         # Find the namespaces that are defined in the file. If we find any manifests without a namespace, we will
         # inject that namespace name into them.
@@ -193,6 +196,12 @@ def template(
         # Find all manifests without a namespace and inject the namespace name into them.
         # If there is an applyset, ensure they are marked as part of the applyset.
         for manifest in source.manifests:
+            # Inline resources often don't have metadata and they are not persisted to the cluster, hence
+            # we don't need to process them here.
+            if NylResource.matches(manifest, API_VERSION_INLINE):
+                assert not inline, "Inline resources should have been processed by this timepdm lint."
+                continue
+
             if applyset is not None and applyset_part_of:
                 if APPLYSET_LABEL_PART_OF not in (labels := manifest["metadata"].setdefault("labels", {})):
                     labels[APPLYSET_LABEL_PART_OF] = applyset.id
@@ -231,7 +240,9 @@ def template(
                     manifest["metadata"]["namespace"],
                 )
 
-            if not apply:
+        if not apply:
+            # If we're not going to be applying the manifests immediately via `kubectl`, we print them to stdout.
+            for manifest in source.manifests:
                 print("---")
                 print(yaml.safe_dump(manifest))
 

{nyl-0.0.7 → nyl-0.0.8}/src/nyl/resources/__init__.py

@@ -4,7 +4,7 @@ This package contains Nyl's own Kubernetes-esque resources.
 
 from abc import ABC
 from dataclasses import dataclass
-from typing import ClassVar, cast
+from typing import ClassVar, Collection, cast
 from typing_extensions import Self
 from databind.json import load as deser, dump as ser
 
@@ -81,13 +81,18 @@ class NylResource(ABC):
         return None
 
     @classmethod
-    def matches(cls, manifest: Manifest) -> bool:
+    def matches(cls, manifest: Manifest, apiVersion: str | Collection[str] | None = None) -> bool:
         """
         Check if the manifest is a NylResource of the correct `apiVersion` and possibly `kind` (if called on a
         `NylResource` subclass).
         """
 
-        if manifest.get("apiVersion") not in (API_VERSION_K8S, API_VERSION_INLINE):
+        if apiVersion is None:
+            apiVersion = {API_VERSION_K8S, API_VERSION_INLINE}
+        elif isinstance(apiVersion, str):
+            apiVersion = {apiVersion}
+
+        if manifest.get("apiVersion") not in apiVersion:
             return False
 
         if cls is not NylResource and manifest["kind"] != cls.KIND:

{nyl-0.0.7 → nyl-0.0.8}/src/nyl/secrets/config.py

@@ -51,6 +51,7 @@ class SecretProvider(ABC):
 class SecretsConfig:
     FILENAME = "nyl-secrets.yaml"
 
+    file: Path | None
     provider: SecretProvider
 
     @staticmethod
@@ -67,9 +68,9 @@ class SecretsConfig:
         if file is None:
             file = find_config_file(SecretsConfig.FILENAME, required=False)
         if file is None:
-            return SecretsConfig(NullSecretsProvider())
+            return SecretsConfig(None, NullSecretsProvider())
         else:
             logger.debug("Loading secrets configuration from '{}'", file)
             provider = deser(safe_load(file.read_text()), SecretProvider, filename=str(file))
             provider.init(file)
-            return SecretsConfig(provider)
+            return SecretsConfig(file, provider)