remove intermediate alias

drogue-iot · Sep 21, 2021 · f285251 · f285251
1 parent a3936aa
commit f285251
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git 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
@@ -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"]
  }
  }));