feat: Add "space-variants" feature

.github/workflows/code-quality.yaml

@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v3
         with:
           path: .venv
           key: venv-${{ hashFiles('poetry.lock') }}

README.md

@@ -885,6 +885,9 @@ namespaces:
       - node-name: src:001:name
         description: Description about sources related to name
         external_id: src:001:name
+          # optional since 3.5.0:
+          # creates additional variants by adding a suffix separated by '-' to the end (after '-spc'!)
+        space-variants: ["i", "m"]
   - ns-name: in
     - ns-nodes:
       - node-name: in:001:name

action.yml

@@ -35,7 +35,7 @@ inputs:
 
 runs:
   using: "docker"
-  image: docker://cognite/bootstrap-cli:v3.4.1
+  image: docker://cognite/bootstrap-cli:v3.5.0
   env:
     BOOTSTRAP_TOKEN_URL: ${{ inputs.token-url }}
     BOOTSTRAP_PROJECT: ${{ inputs.cdf-project-name }}

configs/config-deploy-example-v3.yml

@@ -136,7 +136,9 @@ bootstrap:
           external-id: src:001:sap
         - node-name: src:002:weather
           description: Sources 002; from Weather.com
-          # external-id will be auto generated in this case.
+          # if omitted 'external-id' will be auto generated in this case.
+          # creates additional variants with adding a suffix separated by '-' to the end (after '-spc'!)
+          space-variants: ["i", "m"]
 
     - ns-name: in
       description: End user data-input provided through deployed CDF driven solutions

pyproject.toml

@@ -3,7 +3,7 @@ name = "inso-bootstrap-cli"
 # 230802 pa: switched to keep manually in sync with
 # 1. src/bootstrap/__init__.py => __version__ = "3.0.6"
 # 2. action.yml => image: docker://cognite/bootstrap-cli:v3.0.6
-version = "3.4.1"
+version = "3.5.0"
 description = "A CLI to deploy a CDF Project to bootstrap CDF Groups scoped with Data Sets and RAW DBs"
 authors = [
     "Peter Arwanitis <peter.arwanitis@cognite.com>",
@@ -21,7 +21,7 @@ python-dotenv = "^0.21.1"
 pydantic-settings = "^2"
 dependency-injector = { version = "^4.41.0", extras = ["yaml"] }
 click = "^8.1.6"
-cognite-sdk = { version = "^6.39", extras = ["pandas"] }
+cognite-sdk = { version = "^7", extras = ["pandas"] }
 rich = "^13"
 
 [tool.poetry.dev-dependencies]

src/bootstrap/__init__.py

@@ -10,4 +10,4 @@
 # 230301 pa: automated by adding it to pyproject.toml > [tool.semantic_release] > version_variable
 
 # 230802 pa: switched to manual updates, after issues with semver gh-actions
-__version__ = "3.4.1"
+__version__ = "3.5.0"

src/bootstrap/app_cache.py

@@ -8,7 +8,8 @@
 from cognite.client.data_classes import Database, DataSet, Group
 from cognite.client.data_classes._base import CogniteResource, CogniteResourceList
 from cognite.client.data_classes.data_modeling.spaces import Space
-from cognite.client.utils._time import convert_time_attributes_to_datetime
+from cognite.client.utils import _json
+from cognite.client.utils._time import convert_and_isoformat_time_attrs
 
 
 class CogniteResourceCache(UserList):
@@ -41,13 +42,13 @@ def __init__(
         self.data = [r for r in resources] if isinstance(resources, CogniteResourceList) else [resources]
 
     def __str__(self) -> str:
-        """From CogniteResourceList v6.2.1
+        """From CogniteResourceList v7.73.9
 
         Returns:
             _type_: _description_
         """
-        item = convert_time_attributes_to_datetime(self.dump())
-        return json.dumps(item, default=utils._auxiliary.json_dump_default, indent=4)
+        item = convert_and_isoformat_time_attrs(self.dump(camel_case=False))
+        return _json.dumps(item, indent=4)
 
     def dump(self, camel_case: bool = False) -> list[dict[str, Any]]:
         """Dump the instance into a json serializable Python data type.

src/bootstrap/app_config.py

@@ -171,7 +171,7 @@ class IdpCdfMapping(Model):
 
 class IdpCdfMappingProjects(Model):
     cdf_project: str
-    create_only_mapped_cdf_groups: Optional[bool] = True
+    create_only_mapped_cdf_groups: bool = True
     mappings: list[IdpCdfMapping]
 
 
@@ -180,15 +180,16 @@ class SharedNode(Model):
 
 
 class SharedAccess(Model):
-    owner: Optional[list[SharedNode]] = []
-    read: Optional[list[SharedNode]] = []
+    owner: list[SharedNode] = []
+    read: list[SharedNode] = []
 
 
 class NamespaceNode(Model):
     node_name: str
     external_id: Optional[str] = None
     metadata: Optional[dict[str, Any]] = None
-    description: Optional[str] = ""
+    space_variants: list[str] = []
+    description: str = ""
     shared_access: Optional[SharedAccess] = SharedAccess(owner=[], read=[])
 
 
@@ -199,15 +200,15 @@ class Namespace(Model):
 
 
 class BootstrapFeatures(Model):
-    with_raw_capability: Optional[bool] = True
-    with_datamodel_capability: Optional[bool] = True
-    with_undocumented_capabilities: Optional[bool] = False
-    group_prefix: Optional[str] = "cdf"
-    aggregated_level_name: Optional[str] = "allprojects"
-    dataset_suffix: Optional[str] = "dataset"
-    space_suffix: Optional[str] = "space"
-    rawdb_suffix: Optional[str] = "rawdb"
-    rawdb_additional_variants: Optional[list[str]] = ["state"]
+    with_raw_capability: bool = True
+    with_datamodel_capability: bool = True
+    with_undocumented_capabilities: bool = False
+    group_prefix: str = "cdf"
+    aggregated_level_name: str = "allprojects"
+    dataset_suffix: str = "dataset"
+    space_suffix: str = "space"
+    rawdb_suffix: str = "rawdb"
+    rawdb_additional_variants: list[str] = ["state"]
 
 
 class BootstrapCoreConfig(Model):
@@ -276,7 +277,7 @@ class BootstrapDeleteConfig(Model):
     Configuration parameters for CDF Project Bootstrap 'delete' command
     """
 
-    datasets: Optional[list] = []
-    groups: Optional[list] = []
-    raw_dbs: Optional[list] = []
-    spaces: Optional[list] = []
+    datasets: list = []
+    groups: list = []
+    raw_dbs: list = []
+    spaces: list = []