Merge pull request #3058 from mulkieran/v3.1.2-release

Version 3.1.2

.github/workflows/cargo.yml

@@ -28,8 +28,8 @@ jobs:
           - task: |
               COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../stratisd_proc_macros/Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
               COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../stratisd_proc_macros/Cargo.toml FEDORA_RELEASE=f35 IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
-              COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
-              COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f35 IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
+              COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f ../../Makefile check-fedora-versions
+              COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f35 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f ../../Makefile check-fedora-versions
     runs-on: ubuntu-18.04
     container:
       image: fedora:36  # CURRENT DEVELOPMENT ENVIRONMENT

.github/workflows/fedora.yml

@@ -45,6 +45,11 @@ jobs:
           - task: make -f Makefile test
             toolchain: 1.62.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
+          - task: >-
+              TANG_URL=localhost
+              make -f Makefile test-clevis-loop-should-fail
+            toolchain: 1.62.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            components: cargo
           - task: make -f Makefile release
             toolchain: 1.62.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo

.github/workflows/ubuntu.yml

@@ -53,7 +53,7 @@ jobs:
             components: cargo
     runs-on: ubuntu-18.04
     container:
-      image: ubuntu:hirsute
+      image: ubuntu:jammy
       options: --privileged -v /dev:/dev
     steps:
       - uses: actions/checkout@v2
@@ -89,7 +89,7 @@ jobs:
             components: cargo
     runs-on: ubuntu-18.04
     container:
-      image: ubuntu:hirsute
+      image: ubuntu:jammy
       options: --privileged -v /dev:/dev
     steps:
       - uses: actions/checkout@v2

CHANGES.txt

@@ -1,3 +1,14 @@
+stratisd 3.1.2
+==============
+Recommended Rust toolchain version: 1.62.0
+Lowest supported Rust toolchain version: 1.58.1
+
+Recommended development platform for Python development: Fedora 36
+
+- Cherry-picked commits from 3.3.0:
+  https://github.com/stratis-storage/stratisd/pull/3059
+
+
 stratisd 3.1.1
 ==============
 Recommended Rust toolchain version: 1.62.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stratisd"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
 edition = "2018"
 build = "build.rs"
@@ -46,6 +46,7 @@ byteorder = "1.2.3"
 clap = "2.23.0"
 crc = "2.0.0"
 data-encoding = "2.3.0"
+devicemapper = "0.32.1"
 either = "1.5.0"
 env_logger="0.9.0"
 futures = "0.3.11"
@@ -71,17 +72,12 @@ version = "0.4.16"
 default-features = false
 features = ["clock", "std"]
 
-[dependencies.devicemapper]
-version = "0.32.0"
-git = "https://github.com/stratis-storage/devicemapper-rs"
-branch = "crates-io-patch-0.32.0"
-
 [dependencies.stratisd_proc_macros]
 version = "0.1.0"
 path = "./stratisd_proc_macros"
 
 [dependencies.libcryptsetup-rs]
-version = "0.5.0"
+version = "0.5.1"
 features = ["mutex"]
 
 [dependencies.tokio]

Makefile

@@ -301,10 +301,16 @@ test:
 	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 cargo test --all-features -- --skip real_ --skip loop_ --skip clevis_
 
 test-clevis-real:
-	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test clevis_real_
+	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test clevis_real_ -- --skip clevis_real_should_fail
+
+test-clevis-real-should-fail:
+	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test clevis_real_should_fail
 
 test-clevis-loop:
-	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test clevis_loop_
+	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test clevis_loop_ -- --skip clevis_loop_should_fail_
+
+test-clevis-loop-should-fail:
+	RUSTFLAGS="${DENY}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test clevis_loop_should_fail_
 
 yamllint:
 	yamllint --strict .github/workflows/*.yml
@@ -382,7 +388,9 @@ check-fedora-versions: test-compare-fedora-versions
 	test-loop
 	test-real
 	test-clevis-loop
+	test-clevis-loop-should-fail
 	test-clevis-real
+	test-clevis-real-should-fail
 	test-compare-fedora-versions
 	test-set-lower-bounds
 	verify-dependency-bounds

src/bin/stratis-utils.rs

@@ -196,7 +196,7 @@ fn predict_pool_usage(
         .transpose()?;
 
     let crypt_metadata_size = if encrypted {
-        Bytes(u128::from(crypt_metadata_size()))
+        crypt_metadata_size()
     } else {
         Bytes(0)
     };

src/dbus_api/types.rs

@@ -139,9 +139,6 @@ where
     E: Engine,
 {
     /// Convert changed properties from a pool to a series of D-Bus actions.
-    ///
-    /// Precondition: Filtering of diffs that show no change has already been
-    /// done in the engine.
     pub fn from_pool_diffs(diffs: HashMap<PoolUuid, PoolDiff>) -> Vec<Self> {
         diffs
             .into_iter()
@@ -170,9 +167,6 @@ where
     }
 
     /// Convert changed properties from filesystems to a series of D-Bus actions.
-    ///
-    /// Precondition: Filtering of diffs that show no change has already been
-    /// done in the engine.
     pub fn from_fs_diffs(diffs: HashMap<FilesystemUuid, StratFilesystemDiff>) -> Vec<Self> {
         diffs
             .into_iter()