From f285251eaf3b6a69d277742d612d8df3c0e0c1ed Mon Sep 17 00:00:00 2001
From: jbtrystram <jbtrystram@redhat.com>
Date: Tue, 21 Sep 2021 09:59:11 +0200
Subject: [PATCH] remove intermediate alias

---
 device-management-service/src/service/mod.rs |  2 +-
 device-management-service/tests/devices.rs   | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/device-management-service/src/service/mod.rs b/device-management-service/src/service/mod.rs
index eb76ee2ef..48e204628 100644
--- a/device-management-service/src/service/mod.rs
+++ b/device-management-service/src/service/mod.rs
@@ -152,7 +152,7 @@ where
         aliases.insert(TypedAlias("name".into(), device.metadata.name.clone()));
 
         if let Some(Ok(aliases_spec)) = device.section::<registry::v1::DeviceSpecAliases>() {
-            for alias in aliases_spec.aliases {
+            for alias in aliases_spec.0 {
                 aliases.insert(TypedAlias("alias".into(), alias));
             }
         }
diff --git a/device-management-service/tests/devices.rs b/device-management-service/tests/devices.rs
index 0ee4e4d15..a3d2d1b3b 100644
--- a/device-management-service/tests/devices.rs
+++ b/device-management-service/tests/devices.rs
@@ -60,9 +60,7 @@ async fn test_create_device() -> anyhow::Result<()> {
                         { "pass": "foo" }
                     ]
                 },
-                "alias": {
-                    "aliases": ["baz", "42", "waldo"]
-                }
+                "alias": ["baz", "42", "waldo"]
             },
         })).send_request(&app).await;
 
@@ -221,9 +219,7 @@ async fn test_crud_device() -> anyhow::Result<()> {
                         {"user": {"username": "foo", "password": "bar"}}
                     ]
                 },
-                "alias": {
-                    "aliases": ["baz", "42", "waldo"]
-                }
+                "alias": ["baz", "42", "waldo"]
             }
         })).send_request(&app).await;
 
@@ -266,9 +262,7 @@ async fn test_crud_device() -> anyhow::Result<()> {
                         {"user": {"username": "foo", "password": "bar"}}
                     ]
                 },
-                "alias": {
-                    "aliases": ["baz", "42", "waldo"]
-                }
+                "alias": ["baz", "42", "waldo"]
             }
         }));
 
@@ -284,9 +278,7 @@ async fn test_crud_device() -> anyhow::Result<()> {
                         {"pass": "foo"},
                     ]
                 },
-                "alias": {
-                    "aliases": ["baz"]
-                }
+                "alias": ["baz"]
             }
         })).send_request(&app).await;
 
@@ -340,9 +332,7 @@ async fn test_crud_device() -> anyhow::Result<()> {
                         {"pass": "foo"},
                     ]
                 },
-                "alias": {
-                    "aliases": ["baz"]
-                }
+                "alias": ["baz"]
             }
         }));