Integrate render command with an active cluster

Author: renovate[bot]

README.md

@@ -236,8 +236,8 @@ The BaseComposite class provides the following fields for manipulating the Compo
 | self.conditions | Conditions | The composite desired and observed conditions, read from observed if not in desired |
 | self.results | Results | Returned results applied to the Composite and optionally on the Claim |
 | self.connectionSecret | Map | The name, namespace, and resourceName to use when generating the connection secret in Crossplane v2 |
-| self.connection | Map | The composite desired connection detials |
-| self.connection.observed | Map | The composite observed connection detials |
+| self.connection | Map | The composite desired connection details |
+| self.connection.observed | Map | The composite observed connection details |
 | self.ready | Boolean | The composite desired ready state |
 
 The BaseComposite also provides access to the following Crossplane Function level features:
@@ -254,9 +254,9 @@ The BaseComposite also provides access to the following Crossplane Function leve
 | self.environment | Map | The response environment, initialized from the request context environment |
 | self.requireds | Requireds | Request and read additional local Kubernetes resources |
 | self.resources | Resources | Define and process composed resources |
-| self.unknownsFatal | Boolean | Terminate the composition if already created resources are assigned unknown values, default True |
 | self.usages| Boolean | Generate Crossplane Usages for resource dependencies, default False |
 | self.autoReady | Boolean | Perform auto ready processing on all composed resources, default True |
+| self.unknownsFatal | Boolean | Terminate the composition if already created resources are assigned unknown values, default False |
 
 ### Composed Resources
 
@@ -281,9 +281,9 @@ Resource class:
 | Resource.conditions | Conditions | The resource conditions |
 | Resource.connection | Map | The resource observed connection details |
 | Resource.ready | Boolean | The resource ready state |
-| Resource.unknownsFatal | Boolean | Terminate the composition if this resource has been created and is assigned unknown values, default is Composite.unknownsFatal |
 | Resource.usages | Boolean | Generate Crossplane Usages for this resource, default is Composite.autoReady |
 | Resource.autoReady | Boolean | Perform auto ready processing on this resource, default is Composite.autoReady |
+| Resource.unknownsFatal | Boolean | Terminate the composition if this resource has been created and is assigned unknown values, default is Composite.unknownsFatal |
 
 ### Required Resources
 

crossplane/pythonic/auto_ready.py

@@ -2,10 +2,10 @@
 
 def process(composite):
     for name, resource in composite.resources:
-        if resource.observed:
-            if resource.autoReady or (resource.autoReady is None and composite.autoReady):
+        if resource.autoReady or (resource.autoReady is None and composite.autoReady):
+            if resource.observed:
                 if resource.ready is None:
-                    if _checks.get((resource.apiVersion, resource.kind), _check_default).ready(resource):
+                    if _checks.get((resource.observed.apiVersion, resource.observed.kind), _check_default).ready(resource):
                         resource.ready = True
 
 

crossplane/pythonic/command.py

@@ -33,6 +33,13 @@ def add_function_arguments(cls, parser):
             metavar='WIDTH',
             help='Width of the logger name in the log output, default 40.',
         )
+        parser.add_argument(
+            '--logger-level',
+            action='append',
+            default=[],
+            metavar='LOGGER=LEVEL',
+            help='Logger level, for example: botocore.hooks=INFO',
+        )
         parser.add_argument(
             '--python-path',
             action='append',
@@ -70,6 +77,11 @@ def initialize_function(self):
         logger = logging.getLogger()
         logger.handlers = [handler]
         logger.setLevel(logging.DEBUG if self.args.debug else logging.INFO)
+        for logger_level in self.args.logger_level:
+            for logger_level in logger_level.split(','):
+                logger_level = logger_level.split('=')
+                if len(logger_level) == 2:
+                    logging.getLogger(logger_level[0]).setLevel(logger_level[1].upper())
 
         for path in reversed(self.args.python_path):
             sys.path.insert(0, str(pathlib.Path(path).expanduser().resolve()))

crossplane/pythonic/composite.py

@@ -69,21 +69,22 @@ def __set__(self, composite, ttl):
 
 class Ready:
     def __get__(self, composite, objtype=None):
-        ready = composite.desired._parent.ready
-        if ready == fnv1.Ready.READY_TRUE:
+        if hasattr(composite, '_ready'):
+            return composite._ready
+        if composite.desired._parent.ready == fnv1.Ready.READY_TRUE:
             return True
-        if ready == fnv1.Ready.READY_FALSE:
+        if composite.desired._parent.ready == fnv1.Ready.READY_FALSE:
             return False
         return None
 
     def __set__(self, composite, ready):
+        composite._ready = ready
         if ready:
-            ready = fnv1.Ready.READY_TRUE
-        elif ready == None or (isinstance(ready, protobuf.Value) and ready._isUnknown):
-            ready = fnv1.Ready.READY_UNSPECIFIED
+            composite.desired._parent.ready = fnv1.Ready.READY_TRUE
+        elif ready is None:
+            composite.desired._parent.ready = fnv1.Ready.READY_UNSPECIFIED
         else:
-            ready = fnv1.Ready.READY_FALSE
-        composite.desired._parent.ready = ready
+            composite.desired._parent.ready = fnv1.Ready.READY_FALSE
 
 
 class BaseComposite:
@@ -111,9 +112,9 @@ def __init__(self, crossplane_v1, request, single_use, logger):
         self.environment = self.context['apiextensions.crossplane.io/environment']
         self.requireds = Requireds(self)
         self.resources = Resources(self)
-        self.unknownsFatal = True
         self.autoReady = True
         self.usages = False
+        self.unknownsFatal = False
 
         observed = self.request.observed.composite
         desired = self.response.desired.composite
@@ -238,16 +239,28 @@ def __init__(self, composite, name):
         self.desired = desired.resource
         self.conditions = Conditions(observed)
         self.connection = observed.connection_details
-        self.unknownsFatal = None
+        if self.desired._parent.ready == fnv1.Ready.READY_TRUE:
+            self._ready =  True
+        elif self.desired._parent.ready == fnv1.Ready.READY_FALSE:
+            self._ready = False
+        else:
+            self._ready = None
         self.autoReady = None
         self.usages = None
+        self.unknownsFatal = None
 
-    def __call__(self, apiVersion=_notset, kind=_notset, namespace=_notset, name=_notset):
+    def __call__(self, kind=_notset, apiVersion=_notset, namespace=_notset, name=_notset):
         self.desired()
+        if kind != _notset:
+            # Allow for apiVersion in the first arg and kind in the second arg
+            if '/' in kind or kind == 'v1':
+                if apiVersion != _notset:
+                    self.kind = apiVersion
+                apiVersion = kind
+            else:
+                self.kind = kind
         if apiVersion != _notset:
             self.apiVersion = apiVersion
-        if kind != _notset:
-            self.kind = kind
         if namespace != _notset:
             self.metadata.namespace = namespace
         if name != _notset:
@@ -296,6 +309,7 @@ def spec(self):
     def spec(self, spec):
         self.desired.spec = spec
 
+    # Used by Secret:v1
     @property
     def type(self):
         return self.desired.type
@@ -318,22 +332,26 @@ def status(self):
 
     @property
     def ready(self):
-        ready = self.desired._parent.ready
-        if ready == fnv1.Ready.READY_TRUE:
-            return True
-        if ready == fnv1.Ready.READY_FALSE:
-            return False
-        return None
+        return self._ready
 
     @ready.setter
     def ready(self, ready):
+        self._ready = ready
         if ready:
-            ready = fnv1.Ready.READY_TRUE
-        elif ready == None or (isinstance(ready, protobuf.Value) and ready._isUnknown):
-            ready = fnv1.Ready.READY_UNSPECIFIED
+            self.desired._parent.ready = fnv1.Ready.READY_TRUE
+        elif ready is None:
+            self.desired._parent.ready = fnv1.Ready.READY_UNSPECIFIED
         else:
-            ready = fnv1.Ready.READY_FALSE
-        self.desired._parent.ready = ready
+            self.desired._parent.ready = fnv1.Ready.READY_FALSE
+
+    def setConditionReady(self):
+        if self.conditions.Ready.status:
+            self.ready = self.observed.metadata.name
+        else:
+            if self.conditions.Ready.reason:
+                self.ready = self.status.notReady[self.conditions.Ready.reason]
+            else:
+                self.ready = self.status.notReady
 
 
 class Requireds:
@@ -408,12 +426,18 @@ def __init__(self, composite, name):
             self._resources = composite.request.required_resources[name]
         self._cache = {}
 
-    def __call__(self, apiVersion=_notset, kind=_notset, namespace=_notset, name=_notset, labels=_notset):
+    def __call__(self, kind=_notset, apiVersion=_notset, namespace=_notset, name=_notset, labels=_notset):
         self._selector()
+        if kind != _notset:
+            # Allow for apiVersion in the first arg and kind in the second arg
+            if '/' in kind or kind == 'v1':
+                if apiVersion != _notset:
+                    self.kind = apiVersion
+                apiVersion = kind
+            else:
+                self.kind = kind
         if apiVersion != _notset:
             self.apiVersion = apiVersion
-        if kind != _notset:
-            self.kind = kind
         if namespace != _notset:
             self.namespace = namespace
         if name != _notset:
@@ -802,60 +826,36 @@ def _resource_name(self):
 
     @property
     def observed(self):
-        if self._composite.crossplane_v1:
-            return self._composite.response.observed.composite.connection_details
-        data = protobuf.Map()
-        for key, value in self._composite.resources[self._resource_name].observed.data:
-            data[key] = protobuf.B64Decode(value)        
-        return data
+        return self._composite.response.observed.composite.connection_details
 
     def __getattr__(self, key):
         return self[key]
 
     def __getitem__(self, key):
-        if self._composite.crossplane_v1:
-            return self._composite.response.desired.composite.connection_details[key]
-        value = self._composite.resources[self._resource_name].data[key]
-        if value:
-            value = protobuf.B64Decode(value)
-        return value
+        return self._composite.response.desired.composite.connection_details[key]
 
     def __bool__(self):
-        if self._composite.crossplane_v1:
-            return bool(self._composite.response.desired.composite.connection_details)
-        return bool(self._composite.resources[self._resource_name].data)
+        return bool(self._composite.response.desired.composite.connection_details)
 
     def __len__(self):
-        if self._composite.crossplane_v1:
-            return len(self._composite.response.desired.composite.connection_details)
-        return len(self._composite.resources[self._resource_name].data)
+        return len(self._composite.response.desired.composite.connection_details)
 
     def __contains__(self, key):
-        if self._composite.crossplane_v1:
-            return key in self._composite.response.desired.composite.connection_details
+        return key in self._composite.response.desired.composite.connection_details
 
     def __iter__(self):
-        keys = set()
-        if self._composite.crossplane_v1:
-            for key, value in self._composite.response.desired.composite.connection_details:
-                yield key, value
-        for key, value in self._composite.resources[self._resource_name].data:
-            yield key, protobuf.B64Decode(value)
+        for key, value in self._composite.response.desired.composite.connection_details:
+            yield key, value
 
     def __str__(self):
         return format(self)
 
     def __format__(self, spec='yaml'):
-        if self._composite.crossplane_v1:
-            return format(self._composite.response.desired.composite.connection_details, spec)
-        data = protobuf.Map()
-        for key, value in self._composite.resources[self._resource_name].data:
-            data[key] = protobuf.B64Decode(value)
-        return format(data, spec)
+        return format(self._composite.response.desired.composite.connection_details, spec)
 
     def __call__(self, **kwargs):
+        self._composite.response.desired.composite.connection_details(**kwargs)
         if self._composite_v1:
-            self._composite.response.desired.composite.connection_details(**kwargs)
             return
         del self._composite.resources[self._resource_name]
         for key, value in kwargs:
@@ -872,16 +872,13 @@ def __setitem__(self, key, value):
                 if not value:
                     return
             value = str(value)
-        if self._composite.crossplane_v1:
-            self._composite.response.desired.composite.connection_details[key] = value
+        self._composite.response.desired.composite.connection_details[key] = value
+        if self._composite.crossplane_v1 or not self._composite.connectionSecret.name:
             return
-        #if not self._composite.connectionSecret.name:
-        #    return
         if self._resource_name in self._composite.resources:
             secret = self._composite.resources[self._resource_name]
         else:
             secret = self._composite.resources[self._resource_name]('v1', 'Secret')
-            print(bool(self._composite.connectionSecret.name), len(self._composite.connectionSecret.name))
             if self._composite.connectionSecret.name and len(self._composite.connectionSecret.name):
                 secret.metadata.name = self._composite.connectionSecret.name
             if not self._composite.metadata.namespace:
@@ -896,8 +893,8 @@ def __delattr__(self, key):
         del self[key]
 
     def __delitem__(self, key):
+        del self._composite.response.desired.composite.connection_details[key]
         if self._composite.crossplane_v1:
-            del self._composite.response.desired.composite.connection_details[key]
             return
         if self._resource_name in self._composite.resources:
             del self._composite.resources[self._resource_name].data[key]

crossplane/pythonic/protobuf.py

@@ -37,21 +37,29 @@ def Unknown():
 
 def Yaml(string, readOnly=None):
     if isinstance(string, (FieldMessage, Value)):
+        if not string:
+            return string
         string = str(string)
     return Value(None, None, yaml.safe_load(string), readOnly)
 
 def Json(string, readOnly=None):
     if isinstance(string, (FieldMessage, Value)):
+        if not string:
+            return string
         string = str(string)
     return Value(None, None, json.loads(string), readOnly)
 
 def B64Encode(string):
     if isinstance(string, (FieldMessage, Value)):
+        if not string:
+            return string
         string = str(string)
     return base64.b64encode(string.encode('utf-8')).decode('utf-8')
 
 def B64Decode(string):
     if isinstance(string, (FieldMessage, Value)):
+        if not string:
+            return string
         string = str(string)
     return base64.b64decode(string.encode('utf-8')).decode('utf-8')
 
@@ -684,10 +692,11 @@ def __getattr__(self, key):
 
     def __getitem__(self, key):
         key = self._validate_key(key)
-        if key in self._cache:
-            return self._cache[key]
-        if key in self._unknowns:
-            return self._unknowns[key]
+        if key != append:
+            if key in self._cache:
+                return self._cache[key]
+            if key in self._unknowns:
+                return self._unknowns[key]
         if isinstance(key, str):
             match self._kind:
                 case 'struct_value':
@@ -701,14 +710,26 @@ def __getitem__(self, key):
         elif isinstance(key, int):
             match self._kind:
                 case 'list_value':
+                    if key < 0:
+                        key = len(self._value.list_value.values) + key
+                        if key < 0:
+                            key = 0
                     if key < len(self._value.list_value.values):
                         value = self._value.list_value.values[key]
                     else:
+                        if key == append:
+                            key = len(self._value.list_value.values)
                         value = _Unknown
                 case 'ListValue':
+                    if key < 0:
+                        key = len(self._value.values) + key
+                        if key < 0:
+                            key = 0
                     if key < len(self._value.values):
                         value = self._value.values[key]
                     else:
+                        if key == append:
+                            key = len(self._value.values)
                         value = _Unknown
                 case 'Unknown':
                     value = _Unknown