Merge branch 'fortra:main' into main

Author: drew0ps

README.md

@@ -28,7 +28,7 @@ spec:
       apiVersion: pythonic.fn.crossplane.io/v1beta1
       kind: Composite
       composite: |
-        class Composite(BaseComposite):
+        class VpcComposite(BaseComposite):
           def compose(self):
             vpc = self.resources.vpc('ec2.aws.crossplane.io/v1beta1', 'VPC')
             vpc.spec.forProvider.region = self.spec.region
@@ -57,7 +57,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.0.7
+  package: ghcr.io/fortra/function-pythonic:v0.0.10
 ```
 ## Composed Resource Dependencies
 
@@ -158,13 +158,13 @@ proto = format(request, 'protobuf') # get the request as a protobuf string
 Composite composition is performed from a Composite orientation. A `BaseComposite` class
 is subclassed and the `compose` method is implemented.
 ```python
-class Composite(BaseComposite):
+class MyComposite(BaseComposite):
     def compose(self):
         # Compose the Composite
 ```
 The compose method can also declare itself as performing async io:
 ```python
-class Composite(BaseComposite):
+class MyAsyncComposite(BaseComposite):
     async def compose(self):
         # Compose the Composite using async io when needed
 ```
@@ -266,7 +266,7 @@ Each resource in the list is the following RequiredResource class:
 
 ### Conditions
 
-The `BaseCompsite.conditions`, `Resource.conditions`, and `RequiredResource.conditions` fields
+The `BaseComposite.conditions`, `Resource.conditions`, and `RequiredResource.conditions` fields
 are maps of that entity's status conditions array, with the map key being the condition type.
 The fields are read only for `Resource.conditions` and `RequiredResource.conditions`.
 
@@ -307,7 +307,7 @@ metadata:
   name: composite-example
 spec:
   composite: |
-    class Composite(BaseComposite):
+    class HelloComposite(BaseComposite):
       def compose(self):
         self.status.composite = 'Hello, World!'
 ```
@@ -349,7 +349,7 @@ spec:
       apiVersion: pythonic.fn.fortra.com/v1alpha1
       kind: Composite
       composite: |
-        class Composite(BaseComposite):
+        class GreetingComposite(BaseComposite):
           def compose(self):
             self.status.greeting = f"Hello, {self.spec.who}!"
 ```
@@ -362,7 +362,7 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.0.7
+  package: ghcr.io/fortra/function-pythonic:v0.0.10
 ```
 In one terminal session, run function-pythonic:
 ```shell
@@ -422,7 +422,7 @@ Then, in your Composition:
       kind: Composite
       composite: |
         from example.pythonic import features
-        class Composite(BaseComposite):
+        class FetureComposite(BaseComposite):
             def compose(self):
                 anything = features.anything()
     ...
@@ -464,7 +464,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.0.7
+  package: ghcr.io/fortra/function-pythonic:v0.0.10
   runtimeConfigRef:
     name: function-pythonic
 ---
@@ -493,12 +493,6 @@ kind: ClusterRole
 metadata:
   name: function-pythonic
 rules:
-- apiGroups:
-  - ''
-  resources:
-  - events
-  verbs:
-  - create
 - apiGroups:
   - ''
   resources:
@@ -507,6 +501,12 @@ rules:
   - list
   - watch
   - patch
+- apiGroups:
+  - ''
+  resources:
+  - events
+  verbs:
+  - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

crossplane/pythonic/function.py

@@ -87,7 +87,18 @@ async def run_function(self, request):
                     logger.exception('Exec exception')
                     crossplane.function.response.fatal(response, f"Exec exception: {e}")
                     return response
-                composite = ['<script>', 'Composite']
+                for field in dir(module):
+                    value = getattr(module, field)
+                    if inspect.isclass(value) and issubclass(value, BaseComposite) and value != BaseComposite:
+                        if clazz:
+                            logger.error('Composite script has multiple BaseComposite classes')
+                            crossplane.function.response.fatal(response, 'Composite script has multiple BaseComposite classes')
+                            return response
+                        clazz = value
+                if not clazz:
+                    logger.error('Composite script does not have have a BaseComposite class')
+                    crossplane.function.response.fatal(response, 'Composite script does have have a BaseComposite class')
+                    return response
             else:
                 composite = composite.rsplit('.', 1)
                 if len(composite) == 1:
@@ -100,20 +111,20 @@ async def run_function(self, request):
                     logger.error(str(e))
                     crossplane.function.response.fatal(response, f"Import module exception: {e}")
                     return response
-            clazz = getattr(module, composite[1], None)
-            if not clazz:
-                logger.error(f"{composite[0]} did not define: {composite[1]}")
-                crossplane.function.response.fatal(response, f"{composite[0]} did not define: {composite[1]}")
-                return response
-            composite = '.'.join(composite)
-            if not inspect.isclass(clazz):
-                logger.error(f"{composite} is not a class")
-                crossplane.function.response.fatal(response, f"{composite} is not a class")
-                return response
-            if not issubclass(clazz, BaseComposite):
-                logger.error(f"{composite} is not a subclass of BaseComposite")
-                crossplane.function.response.fatal(response, f"{composite} is not a subclass of BaseComposite")
-                return response
+                clazz = getattr(module, composite[1], None)
+                if not clazz:
+                    logger.error(f"{composite[0]} did not define: {composite[1]}")
+                    crossplane.function.response.fatal(response, f"{composite[0]} did not define: {composite[1]}")
+                    return response
+                composite = '.'.join(composite)
+                if not inspect.isclass(clazz):
+                    logger.error(f"{composite} is not a class")
+                    crossplane.function.response.fatal(response, f"{composite} is not a class")
+                    return response
+                if not issubclass(clazz, BaseComposite):
+                    logger.error(f"{composite} is not a subclass of BaseComposite")
+                    crossplane.function.response.fatal(response, f"{composite} is not a subclass of BaseComposite")
+                    return response
             self.clazzes[composite] = clazz
 
         try:

crossplane/pythonic/protobuf.py

@@ -25,10 +25,16 @@
 
 
 def Map(**kwargs):
-    return Values(None, None, None, Values.Type.MAP)(**kwargs)
+    map = Values(None, None, None, Values.Type.MAP)
+    for name, value in kwargs.items():
+        map[name] = value
+    return map
 
 def List(*args):
-    return Values(None, None, None, Values.Type.LIST)(*args)
+    list = Values(None, None, None, Values.Type.LIST)
+    for ix, value in enumerate(args):
+        list[ix] = value
+    return list
 
 def Unknown():
     return Values(None, None, None, Values.Type.UNKNOWN)
@@ -683,36 +689,16 @@ def _create_child(self, key, type):
     def __call__(self, *args, **kwargs):
         if self._readOnly:
             raise ValueError(f"{self._readOnly} is read only")
+        self.__dict__['_values'] = None
+        self.__dict__['_type'] = self.Type.UNKNOWN
         self._cache.clear()
         self._unknowns.clear()
         if len(kwargs):
-            if not self._isMap:
-                if not self._isUnknown:
-                    raise ValueError('Cannot specify kwargs on lists')
-                self.__dict__['_type'] = self.Type.MAP
             if len(args):
-                raise ValueError('Connect specify args on maps')
-            if self._values is None:
-                if self._parent is None:
-                    self.__dict__['_values'] = google.protobuf.struct_pb2.Struct()
-                else:
-                    self.__dict__['_values'] = self._parent._create_child(self._key, self._type)
-            self._values.Clear()
+                raise ValueError('Connect specify both kwargs and args')
             for key, value in kwargs.items():
                 self[key] = value
         elif len(args):
-            if not self._isList:
-                if not self._isUnknown:
-                    raise ValueError('Cannot specify args on maps')
-                self.__dict__['_type'] = self.Type.LIST
-            if len(kwargs):
-                raise ValueError('Connect specify kwargs on lists')
-            if self._values is None:
-                if self._parent is None:
-                    self.__dict__['_values'] = google.protobuf.struct_pb2.ListValue()
-                else:
-                    self.__dict__['_values'] = self._parent._create_child(self._key, self._type)
-            self._values.Clear()
             for key in range(len(args)):
                 self[key] = args[key]
         return self
@@ -767,17 +753,21 @@ def __setitem__(self, key, value):
             values[key].number_value = value
         elif isinstance(value, dict):
             values[key].struct_value.Clear()
-            self[key](**value)
+            for k, v in value.items():
+                self[key][k] = v
         elif isinstance(value, (list, tuple)):
             values[key].list_value.Clear()
-            self[key](*value)
+            for ix, v in enumerate(value):
+                self[key][ix] = v
         elif isinstance(value, Values):
             if value._isMap:
                 values[key].struct_value.Clear()
-                self[key](**{k:v for k,v in value})
+                for k, v in value:
+                    self[key][k] = v
             elif value._isList:
                 values[key].list_value.Clear()
-                self[key](*[v for v in value])
+                for ix, v in enumerate(value):
+                    self[key][ix] = v
             else:
                 self._unknowns[key] = value
                 if self._isMap:

examples/eks-cluster/functions.yaml

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

examples/filing-system/function.yaml

@@ -3,7 +3,7 @@ kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/iciclespider/function-pythonic:v0.0.0-20250811193238-f8d5c82deb9b
+  package: ghcr.io/fortra/function-pythonic:v0.0.10
   runtimeConfigRef:
     apiVersion: pkg.crossplane.io/v1beta1
     kind: DeploymentRuntimeConfig

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.0.7
+  package: ghcr.io/fortra/function-pythonic:v0.0.10

scripts/setup-local.sh

@@ -189,15 +189,14 @@ spec:
 EOF
 
 #  package: ghcr.io/fortra/function-pythonic:v0.0.0-20250819201108-49cfb066579f
-#  package: ghcr.io/fortra/function-pythonic:v0.0.7
 
 kubectl apply -f - <<EOF
 apiVersion: pkg.crossplane.io/v1
 kind: Function
 metadata:
   name: function-pythonic
 spec:
-  package: ghcr.io/fortra/function-pythonic:v0.0.7
+  package: ghcr.io/fortra/function-pythonic:v0.0.10
   runtimeConfigRef:
     apiVersion: pkg.crossplane.io/v1beta1
     kind: DeploymentRuntimeConfig

tests/fn_cases/buckets.yaml

@@ -1,7 +1,7 @@
 request:
   input:
     composite: |
-      class Composite(BaseComposite):
+      class BucketComposite(BaseComposite):
         def compose(self):
 
           self.resources.bucket1.apiVersion = 's3.aws.upbound.io/v1beta2'

tests/fn_cases/composed.yaml

@@ -20,7 +20,7 @@ request:
   input:
     composite: |
       apiVersion = 'dbforpostgresql.azure.upbound.io/v1beta1'
-      class Composite(BaseComposite):
+      class ComposedComposite(BaseComposite):
         def compose(self):
           self.ttl = (5 * 60) + 30
           s = self.resources.flexServer(apiVersion, 'FlexibleServer')

tests/fn_cases/conditions.yaml

@@ -21,7 +21,7 @@ request:
               lastTransitionTime: '2023-11-03T09:07:31Z'
   input:
     composite: |
-      class Composite(BaseComposite):
+      class ConditionsComposite(BaseComposite):
         def compose(self):
           self.status.compositeCondition = self.conditions.Ready
           self.status.compositeNotFound = self.conditions.Other