crossplane-function-pythonic 0.4.0__tar.gz → 0.4.1__tar.gz

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crossplane-function-pythonic
-Version: 0.4.0
+Version: 0.4.1
 Summary: A Python centric Crossplane Function
 Project-URL: Documentation, https://github.com/crossplane-contrib/function-pythonic#readme
 Project-URL: Issues, https://github.com/crossplane-contrib/function-pythonic/issues
@@ -19,7 +19,7 @@ Requires-Dist: inflect==7.5.0
 Requires-Dist: kr8s==0.20.15
 Requires-Dist: pyyaml==6.0.3
 Provides-Extra: packages
-Requires-Dist: kopf==1.42.5; extra == 'packages'
+Requires-Dist: kopf==1.43.0; extra == 'packages'
 Provides-Extra: pip-install
 Requires-Dist: pip==26.0.1; extra == 'pip-install'
 Description-Content-Type: text/markdown
@@ -83,7 +83,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
 ```
 
 ### Crossplane V1
@@ -95,7 +95,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
   runtimeConfigRef:
     name: function-pythonic
 --
@@ -616,7 +616,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
   runtimeConfigRef:
     name: function-pythonic
 ---

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/README.md

@@ -57,7 +57,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
 ```
 
 ### Crossplane V1
@@ -69,7 +69,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
   runtimeConfigRef:
     name: function-pythonic
 --
@@ -590,7 +590,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
   runtimeConfigRef:
     name: function-pythonic
 ---

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/crossplane/pythonic/__about__.py

@@ -1,2 +1,2 @@
 # This is set at build time, using "hatch version"
-__version__ = "0.4.0"
+__version__ = "0.4.1"

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/crossplane/pythonic/command.py

@@ -77,6 +77,11 @@ class Command:
         logger = logging.getLogger()
         logger.handlers = [handler]
         logger.setLevel(logging.DEBUG if self.args.debug else logging.INFO)
+        # Suppress noisy libraries, these can be overriden using --logger-level
+        logging.getLogger('asyncio').setLevel(logging.INFO)
+        logging.getLogger('httpcore').setLevel(logging.INFO)
+        logging.getLogger('httpx').setLevel(logging.WARNING)
+        logging.getLogger('kr8s').setLevel(logging.INFO)
         for logger_level in self.args.logger_level:
             for logger_level in logger_level.split(','):
                 logger_level = logger_level.split('=')

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/crossplane/pythonic/composite.py

@@ -43,7 +43,7 @@ class Connection:
 
     def __set__(self, composite, values):
         connection = self.__get__(composite)
-        coneection()
+        connection()
         for key, value in values:
             connection[key] = value
 
@@ -384,7 +384,7 @@ class Resource:
                     field = resource.observed.metadata.name
                 else:
                     field = resource.status.notReady
-        self.metadata.annotations[f"Dependency{resource.name}"] = field
+        self.metadata.annotations[f"pythonic.dependency/{resource.name}"] = field
 
 class Requireds:
     def __init__(self, composite):
@@ -757,7 +757,7 @@ class Results:
         return len(self) > 0
 
     def __len__(self):
-        len(self._results)
+        return len(self._results)
 
     def __getitem__(self, key):
         if key >= len(self._results):
@@ -832,7 +832,7 @@ class Result:
 
     @property
     def claim(self):
-        return bool(self) and self._result == fnv1.Target.TARGET_COMPOSITE_AND_CLAIM
+        return bool(self) and self._result.target == fnv1.Target.TARGET_COMPOSITE_AND_CLAIM
 
     @claim.setter
     def claim(self, claim):
@@ -887,10 +887,10 @@ class _Connection:
 
     def __call__(self, **kwargs):
         self._composite.response.desired.composite.connection_details(**kwargs)
-        if self._composite_v1:
+        if self._composite.crossplane_v1:
             return
         del self._composite.resources[self._resource_name]
-        for key, value in kwargs:
+        for key, value in kwargs.items():
             self[key] = value
 
     def __setattr__(self, key, value):

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/crossplane/pythonic/protobuf.py

@@ -406,12 +406,26 @@ class RepeatedMessage:
 
     def __getitem__(self, key):
         key = self._validate_key(key)
-        if key in self._cache:
-            return self._cache[key]
-        if self._messages is _Unknown or key >= len(self._messages):
+        if key == append:
+            if self._messages is _Unknown:
+                key = 0
+            else:
+                key = len(self._messages)
             value = _Unknown
         else:
-            value = self._messages[key]
+            if key < 0:
+                if self._messages is _Unknown:
+                    key = 0
+                else:
+                    key = len(self._messages) + key
+                    if key < 0:
+                        key = 0
+            if key in self._cache:
+                return self._cache[key]
+            if self._messages is _Unknown or key >= len(self._messages):
+                value = _Unknown
+            else:
+                value = self._messages[key]
         if value is None and self._field.has_default_value:
             value = self._field.default_value
         if self._field.type == self._field.TYPE_MESSAGE:

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/crossplane/pythonic/render.py

@@ -356,13 +356,13 @@ class Command(command.Command):
             if not self.kube_context:
                 print('"composition" argument required', file=sys.stderr)
                 sys.exit(1)
-            if self.args.crossplane_v1:
-                revision = self.composite.spec.compositionRevisionRef
-            else:
-                revision = self.composite.spec.crossplane.compositionRevisionRef
+            revision = self.composite.spec.crossplane.compositionRevisionRef
             if not revision.name:
-                print('Composite does not contain a CompositionRevision name', file=sys.stderr)
-                sys.exit(1)
+                # Crossplane V1 location
+                revision = self.composite.spec.compositionRevisionRef
+                if not revision.name:
+                    print('Composite does not contain a CompositionRevision name', file=sys.stderr)
+                    sys.exit(1)
             self.composition = await self.kube_get('CompositionRevision', 'apiextensions.crossplane.io/v1', None, str(revision.name))
             return
         if self.args.composition.is_file():
@@ -434,10 +434,9 @@ class Command(command.Command):
         # Obtain observed resources if using external cluster
         if self.kube_context:
             async with asyncio.TaskGroup() as group:
-                if self.args.crossplane_v1:
+                refs = self.composite.spec.crossplane.resourceRefs
+                if not refs:
                     refs = self.composite.spec.resourceRefs
-                else:
-                    refs = self.composite.spec.crossplane.resourceRefs
                 for ref in refs:
                     group.create_task(self.setup_observed_resource(ref))
 
@@ -536,12 +535,12 @@ class Command(command.Command):
                         else:
                             await self.setup_resource(required, items[protobuf.append])
         if not len(items) and self.kube_context:
-            if selector.match_name:
+            if len(selector.match_name):
                 required = await self.kube_get(selector.kind, selector.api_version, selector.namespace, selector.match_name, False)
                 if required:
                     await self.setup_resource(required, items[protobuf.append])
-            elif selector.match_labels.labels:
-                for requiest in await kube_list(selector.kind, selector.api_version, selector.namespace, selector.match_labels.labels):
+            elif len(selector.match_labels.labels):
+                for required in await self.kube_list(selector.kind, selector.api_version, selector.namespace, selector.match_labels.labels):
                     await self.setup_resource(required, items[protobuf.append])
 
     def copy_resource(self, source, destination):
@@ -610,11 +609,12 @@ class Command(command.Command):
         resources = [
             protobuf.Value(None, None, resource.raw)
             async for resource in clazz.list(
-                    namespace=str(namespace) if namespace and len(namespace) else None,
-                    label_selector={
-                        label: str(value)
-                        for label, value in labelSelector
-                    },
+                namespace=str(namespace) if namespace and len(namespace) else None,
+                label_selector={
+                    label: str(value)
+                    for label, value in labelSelector
+                },
+                api=self.kube_context,
             )
         ]
         if self.logger.isEnabledFor(logging.DEBUG):

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/examples/aks-cluster/cluster-function-pythonic.yaml

@@ -3,7 +3,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.0
+  package: xpkg.upbound.io/crossplane-contrib/function-pythonic:v0.4.1
   runtimeConfigRef:
     name: function-pythonic
 ---

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/examples/function-go-templating/functions/include/composition.yaml

@@ -21,7 +21,7 @@ spec:
               'some-text': self.spec.val1,
               'other-text': self.spec.val2,
             }
-            r = self.resources.test1('Deployment', 'apps/v1', 'Deployment')
+            r = self.resources.test1('Deployment', 'apps/v1')
             r.metadata.labels = labels
             r.spec.replicas = 3
             r.spec.selector.matchLabels = labels

{crossplane_function_pythonic-0.4.0 → crossplane_function_pythonic-0.4.1}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-packages = ["kopf==1.42.5"]
+packages = ["kopf==1.43.0"]
 pip-install = ["pip==26.0.1"]
 
 [project.urls]