[CDF-21470, CDF-21469] Prep release 0.1.4

CHANGELOG.cdf-tk.md

@@ -15,6 +15,15 @@ Changes are grouped as follows:
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+## [0.1.4] - 2024-04-30
+
+### Fixed
+
+- When running `cdf-tk deploy` with container `YAML` from before `cogniet-sdk<7.37`, the user would get an error
+  `Missing required field: 'list'.` for the `direct` container properties. This is now fixed.
+- When running `cdf-tk init --upgrade`, the user would get an error `IndexError: list index out of range`.
+  This is now fixed.
+
 ## [0.1.3] - 2024-04-28
 
 ### Fixed

CHANGELOG.templates.md

@@ -15,6 +15,10 @@ Changes are grouped as follows:
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+## [0.1.4] - 2024-04-30
+
+No changes to templates.
+
 ## [0.1.3] - 2024-04-29
 
 ### Fixed

cognite_toolkit/_cdf_tk/load/_resource_loaders.py

@@ -1553,22 +1553,29 @@ def get_id(cls, item: ContainerApply | Container) -> ContainerId:
     def load_resource(
         self, filepath: Path, ToolGlobals: CDFToolConfig, skip_validation: bool
     ) -> ContainerApply | ContainerApplyList | None:
-        loaded = super().load_resource(filepath, ToolGlobals, skip_validation)
-        if loaded is None:
-            return None
-        items = loaded if isinstance(loaded, ContainerApplyList) else [loaded]
+        raw_yaml = load_yaml_inject_variables(filepath, ToolGlobals.environment_variables())
+        if not isinstance(raw_yaml, list):
+            raw_yaml = [raw_yaml]
+        # When upgrading to SDK 7.37.0 there was a breaking change in the SDK requiring 'list' for direct relations.
+        # This patches the yaml to include the list key for direct relations if it is missing.
+        for raw_instance in raw_yaml:
+            for prop in raw_instance.get("properties", {}).values():
+                type_ = prop.get("type", {})
+                if type_.get("type") == "direct" and "list" not in type_:
+                    type_["list"] = False
+        items = ContainerApplyList.load(raw_yaml)
         if not skip_validation:
             ToolGlobals.verify_spaces(list({item.space for item in items}))
         for item in items:
             # Todo Bug in SDK, not setting defaults on load
             for prop_name in item.properties.keys():
                 prop_dumped = item.properties[prop_name].dump()
                 if prop_dumped.get("nullable") is None:
-                    prop_dumped["nullable"] = False
+                    prop_dumped["nullable"] = False  # type: ignore[assignment]
                 if prop_dumped.get("autoIncrement") is None:
-                    prop_dumped["autoIncrement"] = False
+                    prop_dumped["autoIncrement"] = False  # type: ignore[assignment]
                 item.properties[prop_name] = ContainerProperty.load(prop_dumped)
-        return loaded
+        return items
 
     def create(self, items: Sequence[ContainerApply]) -> ContainerList:
         return self.client.data_modeling.containers.apply(items)

cognite_toolkit/_cdf_tk/templates/_migration.yaml

@@ -1,8 +1,13 @@
+- version: 0.1.3
+  cognite_modules: {}
+  resources: {}
+  tool: {}
+  cognite_modules_hash: "de5b3ba4639c9e8fca4c0b33622ce706cce2cd9f9347fbf5770de3f9097a366f"
 - version: 0.1.2
   cognite_modules: {}
   resources: {}
   tool: {}
-  cognite_modules_hash: ""
+  cognite_modules_hash: "2ba2d52530d69a2ad23d5fedd1c5ccc58c28f7ac0d11b7f57552ea930bf982f2"
 - version: 0.1.1
   cognite_modules: {}
   resources: {}

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"

cognite_toolkit/cognite_modules/_system.yaml

@@ -25,4 +25,4 @@ packages:
     - example_pump_data_model
 
 # This part is used by cdf-toolkit to keep track of the version and help you upgrade.
-cdf_toolkit_version: 0.1.3
+cdf_toolkit_version: 0.1.4

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite_toolkit"
-version = "0.1.3"
+version = "0.1.4"
 description = "Official Cognite Data Fusion tool for project templates and configuration deployment"
 authors = ["Cognite AS <support@cognite.com>"]
 license = "Apache-2"

tests/tests_unit/test_cdf_tk/project_for_test/cognite_modules/_system.yaml

@@ -4,4 +4,4 @@ packages:
     - child_module
 
 # This part is used by cdf-toolkit to keep track of the version and help you upgrade.
-cdf_toolkit_version: 0.1.3
+cdf_toolkit_version: 0.1.4

tests/tests_unit/test_cdf_tk/run_data/cognite_modules/_system.yaml

@@ -25,4 +25,4 @@ packages:
     - example_pump_data_model
 
 # This part is used by cdf-toolkit to keep track of the version and help you upgrade.
-cdf_toolkit_version: 0.1.3
+cdf_toolkit_version: 0.1.4