crossplane-function-pythonic 0.1.2__tar.gz → 0.1.3__tar.gz

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crossplane-function-pythonic
-Version: 0.1.2
+Version: 0.1.3
 Summary: A Python centric Crossplane Function
 Project-URL: Documentation, https://github.com/fortra/function-pythonic#readme
 Project-URL: Issues, https://github.com/fortra/function-pythonic/issues
@@ -49,7 +49,7 @@ spec:
     functionRef:
       name: function-pythonic
     input:
-      apiVersion: pythonic.fn.crossplane.io/v1beta1
+      apiVersion: pythonic.fn.fortra.com/v1alpha1
       kind: Composite
       composite: |
         class VpcComposite(BaseComposite):
@@ -81,7 +81,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
 ```
 ## Composed Resource Dependencies
 
@@ -408,7 +408,7 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
 ```
 In one terminal session, run function-pythonic:
 ```shell
@@ -510,7 +510,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
   runtimeConfigRef:
     name: function-pythonic
 ---

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/README.md

@@ -25,7 +25,7 @@ spec:
     functionRef:
       name: function-pythonic
     input:
-      apiVersion: pythonic.fn.crossplane.io/v1beta1
+      apiVersion: pythonic.fn.fortra.com/v1alpha1
       kind: Composite
       composite: |
         class VpcComposite(BaseComposite):
@@ -57,7 +57,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
 ```
 ## Composed Resource Dependencies
 
@@ -384,7 +384,7 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
 ```
 In one terminal session, run function-pythonic:
 ```shell
@@ -486,7 +486,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
   runtimeConfigRef:
     name: function-pythonic
 ---

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/crossplane/pythonic/composite.py

@@ -140,12 +140,17 @@ class Credential:
 class Resources:
     def __init__(self, composite):
         self.__dict__['_composite'] = composite
+        self.__dict__['_cache'] = {}
 
     def __getattr__(self, key):
         return self[key]
 
     def __getitem__(self, key):
-        return Resource(self._composite, key)
+        resource = self._cache.get(key)
+        if not resource:
+            resource = Resource(self._composite, key)
+            self._cache[key] = resource
+        return resource
 
     def __bool__(self):
         return bool(self._composite.response.desired.resources)
@@ -165,6 +170,7 @@ class Resources:
 
     def __setitem__(self, key, resource):
         self._composite.response.desired.resources[key].resource = resource
+        self._cache.pop(key, None)
 
     def __delattr__(self, key):
         del self[key]
@@ -172,6 +178,7 @@ class Resources:
     def __delitem__(self, key):
         if key in self._composite.response.desired.resources:
             del self._composite.response.desired.resources[key]
+        self._cache.pop(key, None)
 
 
 class Resource:
@@ -276,12 +283,17 @@ class Resource:
 class Requireds:
     def __init__(self, composite):
         self._composite = composite
+        self._cache = {}
 
     def __getattr__(self, key):
         return self[key]
 
     def __getitem__(self, key):
-        return RequiredResources(self._composite, key)
+        required = self._cache.get(key)
+        if not required:
+            required = RequiredResources(self._composite, key)
+            self._cache[key] = required
+        return required
 
     def __bool__(self):
         return bool(len(self))
@@ -316,6 +328,7 @@ class RequiredResources:
         self.name = name
         self._selector = composite.response.requirements.extra_resources[name]
         self._resources = composite.request.extra_resources[name]
+        self._cache = {}
 
     def __call__(self, apiVersion=_notset, kind=_notset, namespace=_notset, name=_notset, labels=_notset):
         self._selector()
@@ -378,7 +391,11 @@ class RequiredResources:
                     self._selector.match_labels.labels[entry[0]] = entry[1]
 
     def __getitem__(self, ix):
-        return RequiredResource(self.name, ix, self._resources.items[ix])
+        resource = self._cache.get(ix)
+        if not resource:
+            resource = RequiredResource(self.name, ix, self._resources.items[ix])
+            self._cache[ix] = resource
+        return resource
 
     def __bool__(self):
         return bool(self._resources.items)

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/crossplane/pythonic/function.py

@@ -123,7 +123,7 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
 
     def fatal(self, request, logger, message, exception=None):
         if exception:
-            message += ' exceptiion'
+            message += ' exception'
             logger.exception(message)
             m = str(exception)
             if not m:
@@ -169,13 +169,14 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
                         source = self.trimFullName(source)
                         composite.logger.debug(f"Dependency: {destination} = {source}")
                 if resource.usages or (resource.usages is None and composite.usages):
+                    apiVersion = 'protection.crossplane.io/v1beta1' if composite.metadata.namespace else 'apiextensions.crossplane.io/v1beta1'
                     resources = {}
                     requireds = {}
                     for destination, source in sorted(dependencies.items()):
                         name = source.split('.')
                         if (len(name) > 5 and
-                            name[0] == 'request' and
-                            name[1] == 'observed' and
+                            name[0] in ('request', 'response') and
+                            name[1] in ('observed', 'desired') and
                             name[2] == 'resources' and
                             name[4] == 'resource'
                         ):
@@ -198,8 +199,7 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
                         if source.metadata.namespace:
                             name.append(str(source.metadata.namespace))
                         name.append(str(source.observed.metadata.name))
-                        usage = composite.resources['_'.join(name)]('apiextensions.crossplane.io/v1beta1', 'Usage')
-                        #usage = composite.resources['_'.join(name)]('protection.crossplane.io/v1beta1', 'Usage')
+                        usage = composite.resources['_'.join(name)](apiVersion, 'Usage')
                         if resource.metadata.namespace:
                             usage.metadata.namespace = resource.metadata.namespace
                         usage.spec.reason = '\n'.join(dependencies)
@@ -218,8 +218,7 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
                         if source.metadata.namespace:
                             name.append(str(source.metadata.namespace))
                         name.append(str(source.metadata.name))
-                        usage = composite.resources['_'.join(name)]('apiextensions.crossplane.io/v1beta1', 'Usage')
-                        #usage = composite.resources['_'.join(name)]('protection.crossplane.io/v1beta1', 'Usage')
+                        usage = composite.resources['_'.join(name)](apiVersion, 'Usage')
                         if resource.metadata.namespace:
                             usage.metadata.namespace = resource.metadata.namespace
                         usage.spec.reason = '\n'.join(dependencies)

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/.dev/functions.yaml

@@ -10,4 +10,4 @@ metadata:
     render.crossplane.io/runtime: Development
     render.crossplane.io/runtime-development-target: localhost:9443
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/aks-cluster/cluster-function-pythonic.yaml

@@ -3,7 +3,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
   runtimeConfigRef:
     name: function-pythonic
 ---

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/aks-cluster/functions.yaml

@@ -5,6 +5,6 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
   runtimeConfigRef:
     name: function-pythonic

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/eks-cluster/functions.yaml

@@ -5,4 +5,4 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/filing-system/function.yaml

@@ -3,7 +3,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
   runtimeConfigRef:
     apiVersion: pkg.crossplane.io/v1beta1
     kind: DeploymentRuntimeConfig

{crossplane_function_pythonic-0.1.2/examples/function-go-templating/context → crossplane_function_pythonic-0.1.3/examples/function-go-templating/conditions}/functions.yaml

@@ -15,7 +15,7 @@ metadata:
     # This tells crossplane beta render to connect to the function locally.
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
 ---
 apiVersion: pkg.crossplane.io/v1beta1
 kind: Function

{crossplane_function_pythonic-0.1.2/examples/function-go-templating/conditions → crossplane_function_pythonic-0.1.3/examples/function-go-templating/context}/functions.yaml

@@ -15,7 +15,7 @@ metadata:
     # This tells crossplane beta render to connect to the function locally.
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3
 ---
 apiVersion: pkg.crossplane.io/v1beta1
 kind: Function

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/function-go-templating/extra-resources/functions.yaml

@@ -6,4 +6,4 @@ metadata:
     # This tells crossplane beta render to connect to the function locally.
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2/examples/function-go-templating/functions/getComposedResource → crossplane_function_pythonic-0.1.3/examples/function-go-templating/functions/fromYaml}/functions.yaml

@@ -6,4 +6,4 @@ metadata:
     # This tells crossplane beta render to connect to the function locally.
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2/examples/function-go-templating/functions/getCompositeResource → crossplane_function_pythonic-0.1.3/examples/function-go-templating/functions/getComposedResource}/functions.yaml

@@ -6,4 +6,4 @@ metadata:
     # This tells crossplane beta render to connect to the function locally.
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2/examples/function-go-templating/functions/fromYaml → crossplane_function_pythonic-0.1.3/examples/function-go-templating/functions/getCompositeResource}/functions.yaml

@@ -6,4 +6,4 @@ metadata:
     # This tells crossplane beta render to connect to the function locally.
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.3/examples/function-go-templating/functions/getResourceCondition/functions.yaml

@@ -0,0 +1,9 @@
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-pythonic
+  annotations: 
+    # This tells crossplane beta render to connect to the function locally.
+    render.crossplane.io/runtime: Development
+spec:
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.3/examples/function-go-templating/functions/include/functions.yaml

@@ -0,0 +1,9 @@
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-pythonic
+  annotations: 
+    # This tells crossplane beta render to connect to the function locally.
+    render.crossplane.io/runtime: Development
+spec:
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.3/examples/function-go-templating/functions/toYaml/functions.yaml

@@ -0,0 +1,9 @@
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-pythonic
+  annotations: 
+    # This tells crossplane beta render to connect to the function locally.
+    render.crossplane.io/runtime: Development
+spec:
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.3/examples/function-go-templating/inline/functions.yaml

@@ -0,0 +1,9 @@
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-pythonic
+  annotations: 
+    # This tells crossplane beta render to connect to the function locally.
+    render.crossplane.io/runtime: Development
+spec:
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.3/examples/function-go-templating/recursive/functions.yaml

@@ -0,0 +1,9 @@
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-pythonic
+  annotations: 
+    # This tells crossplane beta render to connect to the function locally.
+    render.crossplane.io/runtime: Development
+spec:
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2/examples/single-purpose → crossplane_function_pythonic-0.1.3/examples/get-started-app}/functions.yaml

@@ -5,4 +5,4 @@ metadata:
   annotations: 
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2/examples/get-started-app → crossplane_function_pythonic-0.1.3/examples/helm-copy-secret}/functions.yaml

@@ -5,4 +5,4 @@ metadata:
   annotations: 
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/import-existing-vpc/composition.yaml

@@ -54,12 +54,7 @@ spec:
           def aws_client(self, service):
             if not self._aws_session:
               self._aws_session = get_session()
-              self._aws_clients = {}
-            client = self._aws_clients.get(service)
-            if not client:
-              client = self._aws_session.create_client(service, str(self.spec.region))
-              self._aws_clients[service] = client
-            return client
+            return self._aws_session.create_client(service, str(self.spec.region))
 
           def tags(self, *args, **kwargs):
             tags = {}

{crossplane_function_pythonic-0.1.2 → crossplane_function_pythonic-0.1.3}/examples/import-existing-vpc/functions.yaml

@@ -5,4 +5,4 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

{crossplane_function_pythonic-0.1.2/examples/helm-copy-secret → crossplane_function_pythonic-0.1.3/examples/single-purpose}/functions.yaml

@@ -5,4 +5,4 @@ metadata:
   annotations: 
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.3/examples/usages-extra/functions.yaml

@@ -0,0 +1,9 @@
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-pythonic
+  annotations: 
+    # This tells crossplane beta render to connect to the function locally.
+    render.crossplane.io/runtime: Development
+spec:
+  package: ghcr.io/fortra/function-pythonic:v0.1.3

crossplane_function_pythonic-0.1.2/examples/function-go-templating/functions/getResourceCondition/functions.yaml

@@ -1,9 +0,0 @@
-apiVersion: pkg.crossplane.io/v1beta1
-kind: Function
-metadata:
-  name: function-pythonic
-  annotations: 
-    # This tells crossplane beta render to connect to the function locally.
-    render.crossplane.io/runtime: Development
-spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2

crossplane_function_pythonic-0.1.2/examples/function-go-templating/functions/include/functions.yaml

@@ -1,9 +0,0 @@
-apiVersion: pkg.crossplane.io/v1beta1
-kind: Function
-metadata:
-  name: function-pythonic
-  annotations: 
-    # This tells crossplane beta render to connect to the function locally.
-    render.crossplane.io/runtime: Development
-spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2

crossplane_function_pythonic-0.1.2/examples/function-go-templating/functions/toYaml/functions.yaml

@@ -1,9 +0,0 @@
-apiVersion: pkg.crossplane.io/v1beta1
-kind: Function
-metadata:
-  name: function-pythonic
-  annotations: 
-    # This tells crossplane beta render to connect to the function locally.
-    render.crossplane.io/runtime: Development
-spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2

crossplane_function_pythonic-0.1.2/examples/function-go-templating/inline/functions.yaml

@@ -1,9 +0,0 @@
-apiVersion: pkg.crossplane.io/v1beta1
-kind: Function
-metadata:
-  name: function-pythonic
-  annotations: 
-    # This tells crossplane beta render to connect to the function locally.
-    render.crossplane.io/runtime: Development
-spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2

crossplane_function_pythonic-0.1.2/examples/function-go-templating/recursive/functions.yaml

@@ -1,9 +0,0 @@
-apiVersion: pkg.crossplane.io/v1beta1
-kind: Function
-metadata:
-  name: function-pythonic
-  annotations: 
-    # This tells crossplane beta render to connect to the function locally.
-    render.crossplane.io/runtime: Development
-spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2

crossplane_function_pythonic-0.1.2/examples/usages-extra/functions.yaml

@@ -1,9 +0,0 @@
-apiVersion: pkg.crossplane.io/v1beta1
-kind: Function
-metadata:
-  name: function-pythonic
-  annotations: 
-    # This tells crossplane beta render to connect to the function locally.
-    render.crossplane.io/runtime: Development
-spec:
-  package: ghcr.io/fortra/function-pythonic:v0.1.2