Skip to content

Commit 91b4166

Browse files
authored
Merge pull request #1233 from mulkieran/version-3.8.3
Version 3.8.3
2 parents 6a52b87 + 9c8b736 commit 91b4166

13 files changed

Lines changed: 97 additions & 778 deletions

File tree

.packit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ actions:
1212
- "git clone https://github.com/stratis-storage/ci --depth=1 ../distro"
1313
- "mv ../distro/mockbuild_test/stratis-cli.spec ../distro/stratis-cli.spec"
1414
create-archive:
15-
- "sh -c 'python3 ../distro/release_management/create_artifacts.py ../distro/ --pre-release --specfile-path=../distro/stratis-cli.spec stratis-cli'"
15+
- "sh -c 'python3 ../distro/release_management/create_artifacts.py ../distro/ --post-release --specfile-path=../distro/stratis-cli.spec stratis-cli'"
1616
fix-spec-file:
1717
- "echo 'skipping automatic fix-spec-file actions'"
1818
get-current-version:

CHANGES.txt

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
stratis-cli 3.8.3
2+
=================
3+
Required stratisd version: 3.8.2
4+
5+
Recommended development environment: Fedora 41
6+
7+
- man: Add token slot related information to man pages:
8+
https://github.com/stratis-storage/stratis-cli/pull/1203
9+
10+
- Improve get_errors method:
11+
https://github.com/stratis-storage/stratis-cli/pull/1214
12+
https://github.com/stratis-storage/stratis-cli/pull/1213
13+
14+
- Add SizeTriple class; remove size_triple function:
15+
https://github.com/stratis-storage/stratis-cli/pull/1229
16+
17+
- Distinguish between different NoReply stack traces:
18+
https://github.com/stratis-storage/stratis-cli/pull/1219
19+
20+
- Increase lowest supported Python version to 3.12:
21+
https://github.com/stratis-storage/stratis-cli/pull/1199
22+
23+
- Tidies and Maintenance:
24+
https://github.com/stratis-storage/stratis-cli/pull/1232
25+
https://github.com/stratis-storage/stratis-cli/pull/1231
26+
https://github.com/stratis-storage/stratis-cli/pull/1230
27+
https://github.com/stratis-storage/stratis-cli/pull/1228
28+
https://github.com/stratis-storage/stratis-cli/pull/1227
29+
https://github.com/stratis-storage/stratis-cli/pull/1226
30+
https://github.com/stratis-storage/stratis-cli/pull/1224
31+
https://github.com/stratis-storage/stratis-cli/pull/1221
32+
https://github.com/stratis-storage/stratis-cli/pull/1220
33+
https://github.com/stratis-storage/stratis-cli/pull/1218
34+
https://github.com/stratis-storage/stratis-cli/pull/1217
35+
https://github.com/stratis-storage/stratis-cli/pull/1216
36+
https://github.com/stratis-storage/stratis-cli/pull/1215
37+
https://github.com/stratis-storage/stratis-cli/pull/1212
38+
https://github.com/stratis-storage/stratis-cli/pull/1211
39+
https://github.com/stratis-storage/stratis-cli/pull/1210
40+
https://github.com/stratis-storage/stratis-cli/pull/1206
41+
https://github.com/stratis-storage/stratis-cli/pull/1205
42+
https://github.com/stratis-storage/stratis-cli/pull/1204
43+
https://github.com/stratis-storage/stratis-cli/pull/1202
44+
https://github.com/stratis-storage/stratis-cli/pull/1198
45+
https://github.com/stratis-storage/stratis-cli/pull/1197
46+
https://github.com/stratis-storage/stratis-cli/pull/1196
47+
https://github.com/stratis-storage/stratis-cli/pull/1195
48+
https://github.com/stratis-storage/stratis-cli/pull/1194
49+
https://github.com/stratis-storage/stratis-cli/pull/1193
50+
https://github.com/stratis-storage/stratis-cli/pull/1192
51+
https://github.com/stratis-storage/stratis-cli/pull/1190
52+
https://github.com/stratis-storage/stratis-cli/pull/1189
53+
https://github.com/stratis-storage/stratis-cli/pull/1188
54+
https://github.com/stratis-storage/stratis-cli/pull/1187
55+
https://github.com/stratis-storage/stratis-cli/pull/1167
56+
https://github.com/stratis-storage/stratis-cli/pull/1162
57+
58+
159
stratis-cli 3.8.2
260
=================
361
Required stratisd version: 3.8.2
@@ -12,6 +70,10 @@ Lowest supported Python interpreter: 3.9
1270
https://github.com/stratis-storage/stratis-cli/pull/1174
1371
https://github.com/stratis-storage/stratis-cli/pull/1172
1472

73+
- Catch error in case journal-size value is too large:
74+
https://github.com/stratis-storage/stratis-cli/issues/1178
75+
https://github.com/stratis-storage/stratis-cli/pull/1180
76+
1577
- Revert "Remove "pool encryption" subcommand":
1678
https://github.com/stratis-storage/stratis-cli/pull/1161
1779

docs/stratis.txt

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pool create [--key-desc <key_desc>] [--clevis <(nbde|tang|tpm2)> [--tang-url <ta
4343
pool stop <(--uuid <uuid> |--name <name>)>::
4444
Stop a pool, specifying the pool by its UUID or by its name. Tear down
4545
the storage stack but leave all metadata intact.
46-
pool start [--remove-cache] [--keyfile-path KEYFILE_PATH | --capture-key] --unlock-method <(any | clevis | keyring)> <(--uuid <uuid> |--name <name>)>::
46+
pool start [--keyfile-path KEYFILE_PATH | --capture-key] --unlock-method <(any | clevis | keyring)> <(--uuid <uuid> |--name <name>)>::
4747
Start a pool, specifying the pool by its UUID or by its name. Use the
4848
--unlock-method option to specify a method of unlocking the pool if it
4949
is encrypted. If an unlock method of any is specified the pool will be
@@ -54,9 +54,7 @@ pool start [--remove-cache] [--keyfile-path KEYFILE_PATH | --capture-key] --unlo
5454
option is required if --keyfile-path or --capture-key is used. If the
5555
value is any, the specified passphrase will be tried for all keyslots;
5656
otherwise the specified passphrase will be tried only for the keyslot
57-
corresponding to the specified method. If --remove-cache is specified,
58-
the pool's cache, if there is one, will not be set up and the Stratis
59-
metadata on each of the pool's cache devices, if any, will be removed.
57+
corresponding to the specified method.
6058
pool list [--stopped] [(--uuid <uuid> |--name <name>)]::
6159
List pools. If the --stopped option is used, list only stopped pools.
6260
Otherwise, list only started pools. If a UUID or name is specified, print
@@ -85,38 +83,22 @@ pool extend-data <pool_name> [--device-uuid <uuid>]::
8583
pool bind <(nbde|tang)> <pool name> <url> <(--thumbprint <thp> | --trust-url)>::
8684
Bind the devices in the specified pool to a supplementary encryption
8785
mechanism that uses NBDE (Network-Bound Disc Encryption). *tang* is
88-
an alias for *nbde*. MOVE NOTICE: The "bind" subcommand can also be found
89-
under the "pool encryption" subcommand. The "pool bind" subcommand that
90-
you are using now is deprecated and will be removed in stratis 3.10.0.
86+
an alias for *nbde*.
9187
pool bind tpm2 <pool name>::
9288
Bind the devices in the specified pool to a supplementary encryption
93-
mechanism that uses TPM 2.0 (Trusted Platform Module). MOVE NOTICE: The
94-
"tpm2" subcommand can also be found under the "pool encryption bind"
95-
subcommand. The "pool bind tpm2" subcommand that you are using now is
96-
deprecated and will be removed in stratis 3.10.0.
89+
mechanism that uses TPM 2.0 (Trusted Platform Module).
9790
pool bind keyring <pool name> <keydesc>::
9891
Bind the devices in the specified pool to a supplementary encryption
99-
mechanism using a key in the kernel keyring. MOVE NOTICE: The "keyring"
100-
subcommand can also be found under the "pool encryption bind" subcommand.
101-
The "pool bind keyring" subcommand that you are using now is deprecated
102-
and will be removed in stratis 3.10.0.
92+
mechanism using a key in the kernel keyring.
10393
pool rebind clevis <pool name> [--token-slot <token slot>]::
10494
Rebind the devices in the specified pool using the Clevis configuration
105-
with which the devices in the pool were previously bound. MOVE NOTICE:
106-
The "clevis" subcommand can also be found under the "pool encryption
107-
rebind" subcommand. The "pool rebind clevis" subcommand that you are
108-
using now is deprecated and will be removed in stratis 3.10.0.
95+
with which the devices in the pool were previously bound.
10996
pool rebind keyring <pool name> <keydesc> [--token-slot <token slot>]::
11097
Rebind the devices in the specified pool using the specified key
111-
description. MOVE NOTICE: The "keyring" subcommand can also be found
112-
under the "pool encryption rebind" subcommand. The "pool rebind keyring"
113-
subcommand that you are using now is deprecated and will be removed in
114-
stratis 3.10.0.
98+
description.
11599
pool unbind <(clevis|keyring)> <pool name> [--token-slot <token slot>]::
116100
Unbind the devices in the specified pool from the specified encryption
117-
mechanism. MOVE NOTICE: The "unbind" subcommand can also be found under
118-
the "pool encryption" subcommand. The "pool unbind" subcommand that you
119-
are using now is deprecated and will be removed in stratis 3.10.0.
101+
mechanism.
120102
pool set-fs-limit <pool name> <amount> ::
121103
Set the limit on the number of file systems allowed per-pool. This number
122104
may only be increased from its current value.

src/stratis_cli/_actions/_bind.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,9 @@
2828

2929
def _get_pool_id(namespace: Namespace) -> PoolId:
3030
"""
31-
Get id for pool, regardless of whether parser uses mandatory pool_name
32-
argument or --name/--uuid alternative.
33-
3431
:return: Id representing how to lookup the pool
3532
"""
36-
name = getattr(namespace, "pool_name", None)
37-
if name is None:
38-
result = PoolId.from_parser_namespace(namespace)
39-
assert result is not None
40-
return result
41-
42-
return PoolId(IdType.NAME, name)
33+
return PoolId(IdType.NAME, namespace.pool_name)
4334

4435

4536
class BindActions:

src/stratis_cli/_actions/_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
SECTOR_SIZE = 512
2424

2525
MAXIMUM_STRATISD_VERSION = "4.0.0"
26-
MINIMUM_STRATISD_VERSION = "3.9.0"
26+
MINIMUM_STRATISD_VERSION = "3.8.2"
2727
assert Version(MINIMUM_STRATISD_VERSION) < Version(MAXIMUM_STRATISD_VERSION)
2828

2929
REVISION = f"r{MINIMUM_STRATISD_VERSION.split('.')[1]}"

src/stratis_cli/_actions/_introspect.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</method>
77
</interface>
88
""",
9-
"org.storage.stratis3.Manager.r9": """
10-
<interface name="org.storage.stratis3.Manager.r9">
9+
"org.storage.stratis3.Manager.r8": """
10+
<interface name="org.storage.stratis3.Manager.r8">
1111
<method name="CreatePool">
1212
<arg name="name" type="s" direction="in" />
1313
<arg name="devices" type="as" direction="in" />
@@ -52,7 +52,6 @@
5252
<arg name="id_type" type="s" direction="in" />
5353
<arg name="unlock_method" type="(b(bu))" direction="in" />
5454
<arg name="key_fd" type="(bh)" direction="in" />
55-
<arg name="remove_cache" type="b" direction="in" />
5655
<arg name="result" type="(b(oaoao))" direction="out" />
5756
<arg name="return_code" type="q" direction="out" />
5857
<arg name="return_string" type="s" direction="out" />
@@ -76,8 +75,8 @@
7675
</property>
7776
</interface>
7877
""",
79-
"org.storage.stratis3.Report.r9": """
80-
<interface name="org.storage.stratis3.Report.r9">
78+
"org.storage.stratis3.Report.r8": """
79+
<interface name="org.storage.stratis3.Report.r8">
8180
<method name="GetReport">
8281
<arg name="name" type="s" direction="in" />
8382
<arg name="result" type="s" direction="out" />
@@ -86,8 +85,8 @@
8685
</method>
8786
</interface>
8887
""",
89-
"org.storage.stratis3.blockdev.r9": """
90-
<interface name="org.storage.stratis3.blockdev.r9">
88+
"org.storage.stratis3.blockdev.r8": """
89+
<interface name="org.storage.stratis3.blockdev.r8">
9190
<property name="Devnode" type="s" access="read">
9291
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
9392
</property>
@@ -114,8 +113,8 @@
114113
</property>
115114
</interface>
116115
""",
117-
"org.storage.stratis3.filesystem.r9": """
118-
<interface name="org.storage.stratis3.filesystem.r9">
116+
"org.storage.stratis3.filesystem.r8": """
117+
<interface name="org.storage.stratis3.filesystem.r8">
119118
<method name="SetName">
120119
<arg name="name" type="s" direction="in" />
121120
<arg name="result" type="(bs)" direction="out" />
@@ -142,8 +141,8 @@
142141
</property>
143142
</interface>
144143
""",
145-
"org.storage.stratis3.pool.r9": """
146-
<interface name="org.storage.stratis3.pool.r9">
144+
"org.storage.stratis3.pool.r8": """
145+
<interface name="org.storage.stratis3.pool.r8">
147146
<method name="AddCacheDevs">
148147
<arg name="devices" type="as" direction="in" />
149148
<arg name="results" type="(bao)" direction="out" />

src/stratis_cli/_actions/_pool.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ def start_pool(namespace: Namespace):
354354
| {
355355
"unlock_method": unlock_method,
356356
"key_fd": key_fd_arg,
357-
"remove_cache": namespace.remove_cache,
358357
},
359358
)
360359

0 commit comments

Comments
 (0)