Merge pull request #384 from ucdavis/swe/Issue289

Leave sshkey out of yaml when disabled/not relevant
ucdavis · Jul 19, 2024 · 4087f57 · 4087f57
2 parents 01c9aab + 0508673
commit 4087f57
Showing 1 changed file with 32 additions and 14 deletions.
diff --git a/Hippo.Core/Services/AccountUpdateYamlService.cs b/Hippo.Core/Services/AccountUpdateYamlService.cs
@@ -47,23 +47,41 @@ private string GetYaml(QueuedEventModel queuedEventModel)
         var group = queuedEventModel.Data.Groups.SingleOrDefault();
         var serializer = new Serializer();
         return serializer.Serialize(
-            new
-            {
-                groups = group != null ? new[] { group.Name } : new string[] { },
-                account = new
+            string.IsNullOrWhiteSpace(account.Key)
+                ? new
                 {
-                    name = account.Name,
-                    email = account.Email,
-                    kerb = account.Kerberos,
-                    iam = account.Iam,
-                    mothra = account.Mothra,
-                    key = account.Key
-                },
-                meta = new
+                    groups = group != null ? new[] { group.Name } : new string[] { },
+                    account = new
+                    {
+                        name = account.Name,
+                        email = account.Email,
+                        kerb = account.Kerberos,
+                        iam = account.Iam,
+                        mothra = account.Mothra,
+                        // no key in this request, so excluding it from yaml
+                    },
+                    meta = new
+                    {
+                        cluster = queuedEventModel.Data.Cluster
+                    }
+                }
+                : new
                 {
-                    cluster = queuedEventModel.Data.Cluster
+                    groups = group != null ? new[] { group.Name } : new string[] { },
+                    account = new
+                    {
+                        name = account.Name,
+                        email = account.Email,
+                        kerb = account.Kerberos,
+                        iam = account.Iam,
+                        mothra = account.Mothra,
+                        key = account.Key
+                    },
+                    meta = new
+                    {
+                        cluster = queuedEventModel.Data.Cluster
+                    }
                 }
-            }
         );
     }