connect-cli 27.7__tar.gz → 28.0__tar.gz

{connect_cli-27.7 → connect_cli-28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: connect-cli
-Version: 27.7
+Version: 28.0
 Summary: CloudBlue Connect Command Line Interface
 Home-page: https://connect.cloudblue.com
 License: Apache-2.0

{connect_cli-27.7 → connect_cli-28.0}/connect/cli/plugins/product/export.py

@@ -402,7 +402,7 @@ def _fill_item_row(ws, row_idx, item):
     ws.cell(row_idx, 5, value=item['description'])
     ws.cell(row_idx, 6, value=item['type'])
     ws.cell(row_idx, 7, value=item['precision'])
-    ws.cell(row_idx, 8, value=item['unit']['id'])
+    ws.cell(row_idx, 8, value=item['unit']['name'])
     period = item.get('period', 'monthly')
     if period.startswith('years_'):
         period = f'{period.rsplit("_")[-1]} years'

{connect_cli-27.7 → connect_cli-28.0}/connect/cli/plugins/product/sync/items.py

@@ -32,7 +32,15 @@ _RowData = namedtuple('RowData', fields)
 
 class ItemSynchronizer(ProductSynchronizer):
     def __init__(self, client, progress, stats):
-        self._units = list(client.ns('settings').units.all())
+        self._units = []
+        self._shared_units = []
+
+        for unit in client.ns('settings').units.all():
+            if 'owner' in unit:
+                self._units.append(unit)
+            else:
+                self._shared_units.append(unit)
+
         self._mstats = stats['Items']
         super().__init__(client, progress)
 
@@ -274,6 +282,12 @@ class ItemSynchronizer(ProductSynchronizer):
             if unit['type'] == data.type and unit['description'] == data.unit:
                 return unit['id']
 
+        for unit in self._shared_units:
+            if unit['id'] == data.unit:
+                return unit['id']
+            if unit['type'] == data.type and unit['description'] == data.unit:
+                return unit['id']
+
         created = create_unit(
             self._client,
             {

{connect_cli-27.7 → connect_cli-28.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connect-cli"
-version = "27.7"
+version = "28.0"
 description = "CloudBlue Connect Command Line Interface"
 authors = ["CloudBlue LLC"]
 license = "Apache-2.0"