inmanta-module-git-ops 0.3.1__tar.gz → 0.5.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (71) hide show
  1. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/CHANGELOG.md +9 -1
  2. {inmanta_module_git_ops-0.3.1/inmanta_module_git_ops.egg-info → inmanta_module_git_ops-0.5.0}/PKG-INFO +1 -1
  3. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/inmanta_plugins/example/slices/fs.py +7 -5
  4. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/model/slices/fs/_init.cf +18 -17
  5. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/model/slices/fs/unroll.cf +21 -19
  6. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/tests/test_unroll.py +13 -8
  7. inmanta_module_git_ops-0.5.0/inmanta_git_ops/cli.py +593 -0
  8. inmanta_module_git_ops-0.5.0/inmanta_git_ops/const.py +81 -0
  9. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_git_ops/generator.py +106 -15
  10. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0/inmanta_module_git_ops.egg-info}/PKG-INFO +1 -1
  11. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/__init__.py +5 -0
  12. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/model/slice/_init.cf +9 -1
  13. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/processors.py +6 -2
  14. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/setup.cfg +1 -1
  15. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/slice.py +301 -21
  16. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/store.py +125 -12
  17. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/setup.cfg +1 -1
  18. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/tests/test_basics.py +1 -1
  19. inmanta_module_git_ops-0.5.0/tests/test_cli.py +209 -0
  20. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/tests/test_example.py +4 -8
  21. inmanta_module_git_ops-0.5.0/tests/test_slice_schema.py +211 -0
  22. inmanta_module_git_ops-0.3.1/inmanta_git_ops/cli.py +0 -287
  23. inmanta_module_git_ops-0.3.1/inmanta_git_ops/const.py +0 -41
  24. inmanta_module_git_ops-0.3.1/tests/test_cli.py +0 -48
  25. inmanta_module_git_ops-0.3.1/tests/test_slice_schema.py +0 -88
  26. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/MANIFEST.in +0 -0
  27. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/README.md +0 -0
  28. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/README.md +0 -0
  29. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/.editorconfig +0 -0
  30. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/.gitignore +0 -0
  31. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/MANIFEST.in +0 -0
  32. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/README.md +0 -0
  33. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/files/.gitkeep +0 -0
  34. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/files/slices/fs.json +0 -0
  35. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/inmanta_plugins/example/__init__.py +0 -0
  36. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/inmanta_plugins/example/slices/__init__.py +0 -0
  37. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/inmanta_plugins/example/slices/recursive.py +0 -0
  38. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/inmanta_plugins/example/slices/simple.py +0 -0
  39. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/model/_init.cf +0 -0
  40. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/model/slices/_init.cf +0 -0
  41. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/model/slices/recursive/_init.cf +0 -0
  42. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/model/slices/simple/_init.cf +0 -0
  43. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/pyproject.toml +0 -0
  44. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/requirements.dev.txt +0 -0
  45. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/requirements.txt +0 -0
  46. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/setup.cfg +0 -0
  47. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/templates/.gitkeep +0 -0
  48. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/docs/example/tests/test_basics.py +0 -0
  49. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_git_ops/__init__.py +0 -0
  50. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_git_ops/py.typed +0 -0
  51. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_module_git_ops.egg-info/SOURCES.txt +0 -0
  52. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_module_git_ops.egg-info/dependency_links.txt +0 -0
  53. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_module_git_ops.egg-info/entry_points.txt +0 -0
  54. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_module_git_ops.egg-info/not-zip-safe +0 -0
  55. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_module_git_ops.egg-info/requires.txt +0 -0
  56. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_module_git_ops.egg-info/top_level.txt +0 -0
  57. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/config.py +0 -0
  58. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/files/.gitkeep +0 -0
  59. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/model/_init.cf +0 -0
  60. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/model/processors.cf +0 -0
  61. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/py.typed +0 -0
  62. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/inmanta_plugins/git_ops/templates/.gitkeep +0 -0
  63. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/pyproject.toml +0 -0
  64. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/pytest_inmanta_git_ops/__init__.py +0 -0
  65. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/pytest_inmanta_git_ops/plugin.py +0 -0
  66. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/pytest_inmanta_git_ops/project.py +0 -0
  67. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/pytest_inmanta_git_ops/py.typed +0 -0
  68. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/pytest_inmanta_git_ops/slice.py +0 -0
  69. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/tests/test_migrations.py +0 -0
  70. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/tests/test_processors.py +0 -0
  71. {inmanta_module_git_ops-0.3.1 → inmanta_module_git_ops-0.5.0}/tests/test_unroll.py +0 -0
@@ -1,10 +1,18 @@
1
1
  # Changelog
2
2
 
3
+ ## v0.5.0 - 2026-06-06
4
+
5
+ - Add `git-ops project slice` command group to create, list and inspect the slices of a project.
6
+ - Address some compiler warnings in plugin annotations
7
+
8
+ ## v0.4.0 - 2026-05-30
9
+
10
+ - Add support for polymorphism in embedded slice definition
11
+
3
12
  ## v0.3.1 - 2026-05-12
4
13
 
5
14
  - Fix initial compile of a store with registered migrations on a fresh active folder.
6
15
 
7
-
8
16
  ## v0.3.0 - 2026-05-10
9
17
 
10
18
  - Add slice migration support
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: inmanta-module-git-ops
3
- Version: 0.3.1
3
+ Version: 0.5.0
4
4
  Summary: Declarative parametrization, extension and validation of Inmanta DSL models.
5
5
  Author: Guillaume Everarts de Velp
6
6
  Author-email: edvgui@gmail.com
@@ -54,6 +54,7 @@ class File(PathABC):
54
54
  A text file in a folder, with its textual content.
55
55
  """
56
56
 
57
+ type: typing.Literal["file"] = "file"
57
58
  content: str = pydantic.Field(
58
59
  default="", description="The textual content of the file."
59
60
  )
@@ -69,15 +70,16 @@ class Folder(PathABC):
69
70
  A folder in the filesystem tree, containing files and other folders.
70
71
  """
71
72
 
72
- files: Sequence[File] = pydantic.Field(
73
- default_factory=list, description="A list of files to manage in the folder."
74
- )
75
- directories: Sequence["Folder"] = pydantic.Field(
73
+ type: typing.Literal["folder"] = "folder"
74
+ content: Sequence["FolderContent"] = pydantic.Field(
76
75
  default_factory=list,
77
- description="A list of folder to manage within this folder.",
76
+ description="A list of files and folders to manage within this folder.",
78
77
  )
79
78
 
80
79
 
80
+ FolderContent = typing.Annotated[Folder | File, pydantic.Field(discriminator="type")]
81
+
82
+
81
83
  class RootFolder(slice.SliceObjectABC, Folder):
82
84
  """
83
85
  The root folder, and the root of the slice.
@@ -18,14 +18,14 @@ Contact: edvgui@gmail.com
18
18
  import git_ops::slice
19
19
  import std
20
20
 
21
- entity File extends PathABC:
21
+ entity File extends PathABC, FolderContent:
22
22
  """
23
23
  A text file in a folder, with its textual content.
24
24
 
25
25
  :attr content: The textual content of the file.
26
26
  :attr previous_content: The previous desired content of the file.
27
- :rel folder: Relation to parent
28
27
  """
28
+ string type = "file"
29
29
  string content
30
30
  string? previous_content = null
31
31
  end
@@ -36,24 +36,27 @@ entity Folder extends PathABC:
36
36
  """
37
37
  A folder in the filesystem tree, containing files and other folders.
38
38
 
39
- :rel files: A list of files to manage in the folder.
40
- :rel directories: A list of folder to manage within this folder.
39
+ :rel content: A list of files and folders to manage within this folder.
41
40
  """
41
+ string type = "folder"
42
42
  end
43
43
 
44
- Folder.directories [0:] -- FolderDirectories.folder [1]
44
+ Folder.content [0:] -- FolderContent.folder [1]
45
45
  """
46
- A list of folder to manage within this folder.
46
+ A list of files and folders to manage within this folder.
47
47
  Peer relation: Relation to parent
48
48
  """
49
49
 
50
- Folder.files [0:] -- File.folder [1]
51
- """
52
- A list of files to manage in the folder.
53
- Peer relation: Relation to parent
54
- """
50
+ entity FolderContent:
51
+ """
52
+ Base entity for the members of the FolderContent discriminated union.
55
53
 
56
- entity FolderDirectories extends Folder:
54
+ :rel folder: Relation to parent
55
+ """
56
+ string type
57
+ end
58
+
59
+ entity FolderFolder extends Folder, FolderContent:
57
60
  """
58
61
  This entity has been generated because it's base entity:
59
62
 
@@ -62,12 +65,10 @@ entity FolderDirectories extends Folder:
62
65
  has multiple parent. Or in other words, multiple entities
63
66
  have a relation to this base entity, making it impossible
64
67
  to define a unique parent relation.
65
-
66
- :rel folder: Relation to parent
67
68
  """
68
69
  end
69
70
 
70
- index FolderDirectories(folder, name)
71
+ index FolderFolder(folder, name)
71
72
 
72
73
  entity PathABC extends git_ops::slice::EmbeddedSliceObjectABC:
73
74
  """
@@ -97,13 +98,13 @@ entity RootFolder extends git_ops::slice::SliceObjectABC, Folder:
97
98
  string root
98
99
  end
99
100
 
100
- index RootFolder(name, root)
101
+ index RootFolder(root, name)
101
102
 
102
103
  implement File using std::none, parents
103
104
 
104
105
  implement Folder using std::none, parents
105
106
 
106
- implement FolderDirectories using parents
107
+ implement FolderFolder using parents
107
108
 
108
109
  implement PathABC using std::none, parents
109
110
 
@@ -29,27 +29,28 @@ FolderFactory.root_folder [1] -- Folder
29
29
 
30
30
 
31
31
  implementation construct_folder for FolderFactory:
32
- folder = FolderDirectories(
32
+ folder = FolderFolder(
33
33
  folder=self.parent,
34
34
  **git_ops::attributes("example::slices::fs::Folder", self.attributes),
35
- files=[
35
+ )
36
+
37
+ for item in self.attributes["content"]:
38
+ if item["type"] == "folder":
39
+ FolderFactory(attributes=item, parent=folder, root_folder=self.root_folder)
40
+ elif item["type"] == "file":
36
41
  File(
42
+ folder=folder,
37
43
  **git_ops::attributes(
38
44
  "example::slices::fs::File",
39
- file,
45
+ item,
40
46
  previous_content=git_ops::get_slice_previous_attribute(
41
47
  self.root_folder.slice_store,
42
48
  self.root_folder.slice_name,
43
- file["path"] + ".content",
49
+ item["path"] + ".content",
44
50
  ),
45
51
  )
46
52
  )
47
- for file in self.attributes["files"]
48
- ],
49
- )
50
-
51
- for child_folder in self.attributes["directories"]:
52
- FolderFactory(attributes=child_folder, parent=folder, root_folder=self.root_folder)
53
+ end
53
54
  end
54
55
  end
55
56
 
@@ -60,23 +61,24 @@ implement FolderFactory using construct_folder
60
61
  for slice in git_ops::unroll_slices("fs"):
61
62
  root = RootFolder(
62
63
  **git_ops::attributes("example::slices::fs::RootFolder", slice["attributes"]),
63
- files=[
64
+ )
65
+
66
+ for item in slice["attributes"]["content"]:
67
+ if item["type"] == "folder":
68
+ FolderFactory(attributes=item, parent=root, root_folder=root)
69
+ elif item["type"] == "file":
64
70
  File(
71
+ folder=root,
65
72
  **git_ops::attributes(
66
73
  "example::slices::fs::File",
67
- file,
74
+ item,
68
75
  previous_content=git_ops::get_slice_previous_attribute(
69
76
  root.slice_store,
70
77
  root.slice_name,
71
- file["path"] + ".content",
78
+ item["path"] + ".content",
72
79
  ),
73
80
  )
74
81
  )
75
- for file in slice["attributes"]["files"]
76
- ],
77
- )
78
-
79
- for child_folder in slice["attributes"]["directories"]:
80
- FolderFactory(attributes=child_folder, parent=root, root_folder=root)
82
+ end
81
83
  end
82
84
  end
@@ -39,38 +39,43 @@ def test_fs(git_ops_project: GitOpsProject) -> None:
39
39
  )
40
40
  assert git_ops_project.write_slice(slice1).version == 1
41
41
  assert len(slice1.get_versions()) == 1
42
- assert len(git_ops_project.get_instance(slice1).directories) == 0
42
+ assert len(git_ops_project.get_instance(slice1).content) == 0
43
43
 
44
44
  # Empty update on the slice, we should get the same version
45
45
  assert git_ops_project.write_slice(slice1).version == 1
46
46
  assert len(slice1.get_versions()) == 1
47
47
 
48
48
  # Add some folder
49
- slice1.slice.directories = [
49
+ slice1.slice.content = [
50
50
  fs.Folder(name="a"),
51
51
  fs.Folder(name="b"),
52
52
  fs.Folder(name="c"),
53
+ fs.File(name="d"),
53
54
  ]
54
55
  assert git_ops_project.write_slice(slice1).version == 2
55
56
  assert len(slice1.get_versions()) == 2
56
- assert len(git_ops_project.get_instance(slice1).directories) == 3
57
+ assert len(git_ops_project.get_instance(slice1).content) == 4
58
+ assert (
59
+ git_ops_project.get_instance(slice1).content[0].path
60
+ == "content[type=folder][name=a]"
61
+ )
57
62
 
58
63
  # Prune version after update
59
64
  git_ops_project.prune()
60
65
  assert len(slice1.get_versions()) == 1
61
66
 
62
67
  # Remove a folder
63
- slice1.slice.directories = [
68
+ slice1.slice.content = [
64
69
  fs.Folder(name="a"),
65
70
  fs.Folder(name="b"),
66
71
  ]
67
72
  assert git_ops_project.write_slice(slice1).version == 3
68
73
  assert len(slice1.get_versions()) == 2
69
- assert len(git_ops_project.get_instance(slice1).directories) == 3
74
+ assert len(git_ops_project.get_instance(slice1).content) == 4
70
75
  assert (
71
76
  next(
72
77
  dir
73
- for dir in git_ops_project.get_instance(slice1).directories
78
+ for dir in git_ops_project.get_instance(slice1).content
74
79
  if dir.operation == const.SLICE_DELETE
75
80
  ).name
76
81
  == "c"
@@ -80,12 +85,12 @@ def test_fs(git_ops_project: GitOpsProject) -> None:
80
85
  git_ops_project.prune()
81
86
  assert len(slice1.get_versions()) == 1
82
87
  git_ops_project.export()
83
- assert len(git_ops_project.get_instance(slice1).directories) == 2
88
+ assert len(git_ops_project.get_instance(slice1).content) == 2
84
89
 
85
90
  # Delete slice
86
91
  assert git_ops_project.remove_slice(slice1).version == 4
87
92
  assert git_ops_project.remove_slice(slice1).emit_slice(fs.STORE.name).deleted
88
- assert len(git_ops_project.get_instance(slice1).directories) == 2
93
+ assert len(git_ops_project.get_instance(slice1).content) == 2
89
94
 
90
95
  # Prune after delete
91
96
  git_ops_project.prune()