From 29583afab1d1d208cf7a3578c06d332206d0d9ad Mon Sep 17 00:00:00 2001
From: Jonathan Innis <jonathan.innis.ji@gmail.com>
Date: Mon, 29 Nov 2021 16:56:15 -0800
Subject: [PATCH] Update deployed object format

---
 .../azext_k8s_configuration/format.py         | 90 +++++++++++--------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/k8s-configuration/azext_k8s_configuration/format.py b/src/k8s-configuration/azext_k8s_configuration/format.py
index a21a3956760..954a661b5fd 100644
--- a/src/k8s-configuration/azext_k8s_configuration/format.py
+++ b/src/k8s-configuration/azext_k8s_configuration/format.py
@@ -16,14 +16,16 @@ def sourcecontrol_show_table_format(result):
 
 
 def __get_sourcecontrolconfig_table_row(result):
-    return OrderedDict([
-        ('name', result['name']),
-        ('repositoryUrl', result['repositoryUrl']),
-        ('operatorName', result['operatorInstanceName']),
-        ('operatorNamespace', result['operatorNamespace']),
-        ('scope', result['operatorScope']),
-        ('provisioningState', result['provisioningState'])
-    ])
+    return OrderedDict(
+        [
+            ("name", result["name"]),
+            ("repositoryUrl", result["repositoryUrl"]),
+            ("operatorName", result["operatorInstanceName"]),
+            ("operatorNamespace", result["operatorNamespace"]),
+            ("scope", result["operatorScope"]),
+            ("provisioningState", result["provisioningState"]),
+        ]
+    )
 
 
 def fluxconfig_list_table_format(results):
@@ -35,14 +37,16 @@ def fluxconfig_show_table_format(result):
 
 
 def __get_fluxconfig_table_row(result):
-    return OrderedDict([
-        ('name', result['name']),
-        ('namespace', result['namespace']),
-        ('scope', result['scope']),
-        ('provisioningState', result['provisioningState']),
-        ('complianceState', result['complianceState']),
-        ('lastSourceSyncedAt', result['lastSourceSyncedAt']),
-    ])
+    return OrderedDict(
+        [
+            ("namespace", result["namespace"]),
+            ("name", result["name"]),
+            ("scope", result["scope"]),
+            ("provisioningState", result["provisioningState"]),
+            ("complianceState", result["complianceState"]),
+            ("lastSourceSyncedAt", result["lastSourceSyncedAt"]),
+        ]
+    )
 
 
 def fluxconfig_kustomization_list_table_format(results):
@@ -55,19 +59,21 @@ def fluxconfig_kustomization_show_table_format(results):
 
 def __get_fluxconfig_kustomization_table_row(key, value):
     deps = []
-    for dep in value.get('dependsOn') or []:
-        if dep.get('kustomizationName'):
-            deps.append(dep['kustomizationName'])
-
-    return OrderedDict([
-        ('name', key),
-        ('path', value['path']),
-        ('dependsOn', ','.join(deps)),
-        ('syncInterval', format_duration(value['syncIntervalInSeconds'])),
-        ('timeout', format_duration(value['timeoutInSeconds'])),
-        ('prune', value['prune']),
-        ('force', value['force'])
-    ])
+    for dep in value.get("dependsOn") or []:
+        if dep.get("kustomizationName"):
+            deps.append(dep["kustomizationName"])
+
+    return OrderedDict(
+        [
+            ("name", key),
+            ("path", value["path"]),
+            ("dependsOn", ",".join(deps)),
+            ("syncInterval", format_duration(value["syncIntervalInSeconds"])),
+            ("timeout", format_duration(value["timeoutInSeconds"])),
+            ("prune", value["prune"]),
+            ("force", value["force"]),
+        ]
+    )
 
 
 def fluxconfig_deployed_object_list_table_format(results):
@@ -79,13 +85,19 @@ def fluxconfig_deployed_object_show_table_format(result):
 
 
 def __get_fluxconfig_deployed_object_table_row(result):
-    applied_by = 'None'
-    if result['appliedBy']:
-        applied_by = result['appliedBy']['namespace'] + result['appliedBy']['name']
-    return OrderedDict([
-        ('kind', result['kind']),
-        ('name', result['name']),
-        ('namespace', result['namespace']),
-        ('complianceState', result['complianceState']),
-        ('appliedBy', applied_by)
-    ])
+    message = "None"
+    for condition in result.get("statusConditions") or []:
+        if condition.get("type") == "Ready":
+            message = condition.get("message")
+            if len(message) > 60:
+                message = message[:60] + "..."
+            break
+    return OrderedDict(
+        [
+            ("kind", result["kind"]),
+            ("namespace", result["namespace"]),
+            ("name", result["name"]),
+            ("complianceState", result["complianceState"]),
+            ("message", message),
+        ]
+    )