Integrate render command with an active cluster

Author: renovate[bot]

crossplane/pythonic/composite.py

@@ -242,12 +242,18 @@ def __init__(self, composite, name):
         self.autoReady = None
         self.usages = 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:
@@ -408,12 +414,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:

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