Merge branch 'main' into dependabot/cargo/lazy_static-1.5.0

Author: mmartinv

.github.qkg1.topmitlint.config.js .github.qkg1.topmitlint.config.mjs.github.qkg1.topmitlint.config.js renamed to .github.qkg1.topmitlint.config.mjs

@@ -8,15 +8,15 @@ const validateBodyMaxLengthIgnoringDeps = async (parsedCommit) => {
       && body != null
       && body.includes('Updates the requirements on');
 
-  const bodyMaxLineLength = 100;
+  const bodyMaxLineLength = 1000;
 
   return [
     isDepsCommit || !body || maxLineLength(body, bodyMaxLineLength),
     `body's lines must not be longer than ${bodyMaxLineLength}`,
   ]
 }
 
-module.exports = {
+export default {
   extends: ['@commitlint/config-conventional'],
   plugins: ['commitlint-plugin-function-rules'],
   rules: {

.github/dependabot.yml

@@ -7,12 +7,12 @@ updates:
     commit-message:
       prefix: "chore: "
     reviewers:
-    - "fedora-iot/fdo-rs-maintainers"
+    - "fdo-rs/fdo-team"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "chore: "
     reviewers:
-    - "fedora-iot/fdo-rs-maintainers"
+    - "fdo-rs/fdo-team"

.github/workflows/ci.yml

@@ -163,7 +163,7 @@ jobs:
         env:
           NODE_PATH: ${{ github.workspace }}/node_modules
         with:
-          configFile: .github.qkg1.topmitlint.config.js
+          configFile: .github.qkg1.topmitlint.config.mjs
           failOnWarnings: true
 
   manpages:

.gitignore

@@ -11,4 +11,12 @@
 /docs/_site/
 /docs/.jekyll-cache/
 /docs/Gemfile.lock
+# RPM build directory
 /rpmbuild
+
+# Vendor directory
+/vendor
+
+# Source and vendor tar files
+fido-device-onboard-rs-*.tar.gz
+fido-device-onboard-rs-*-vendor-patched.tar.xz

.packit.yaml

@@ -4,8 +4,12 @@
 specfile_path: fido-device-onboard.spec
 
 files_to_sync:
-    - fido-device-onboard.spec
-    - .packit.yaml
+  - src:
+      - ".packit.yaml"
+      - "fido-device-onboard.spec"
+      - "fido-device-onboard-rs-*-vendor-patched.tar.xz"
+      - "patches/0001-use-released-aws-nitro-enclaves-cose-version.patch"
+    dest: .
 
 upstream_package_name: fido-device-onboard
 downstream_package_name: fido-device-onboard
@@ -14,66 +18,86 @@ upstream_tag_template: v{version}
 copy_upstream_release_description: true
 
 srpm_build_deps:
-    - cargo
-    - openssl-devel
+  - cargo
+  - openssl-devel
+
+packages:
+  fido-device-onboard-fedora:
+    downstream_package_name: fido-device-onboard
+    upstream_package_name: fido-device-onboard
+  fido-device-onboard-centos:
+    downstream_package_name: fido-device-onboard
+    upstream_package_name: fido-device-onboard
+    pkg_tool: centpkg
 
 actions:
-    create-archive:
-        - bash -c "cp ./patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch ."
-        - bash -c "git archive --prefix=fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}/ --format=tar HEAD > fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
-        - bash -c "./make-vendored-tarfile.sh ${PACKIT_PROJECT_VERSION}"
-        - bash -c "tar -xvf fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
-        - bash -c "ls -1 ./fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
+  # for the propose-downstream CLI command
+  pre-sync:
+    - bash -c "make vendor-tarball VERSION=${PACKIT_PROJECT_VERSION}"
+  # for the srpm and copr builds
+  create-archive:
+    - bash -c "make packit-create-archive VERSION=${PACKIT_PROJECT_VERSION}"
 
 jobs:
-    - &fdo_copr_build
-      job: copr_build
-      trigger: pull_request
-      targets:
-          centos-stream-9: {}
-          fedora-latest-stable: {}
-          fedora-latest: {}
-          fedora-rawhide: {}
-#          fedora-eln:
-#              additional_repos:
-#                  - https://kojipkgs.fedoraproject.org/repos/eln-build/latest/$basearch/
-
-    - job: tests
-      trigger: pull_request
-      identifier: onboarding
-      fmf_path: test/fmf
-      tmt_plan: plans/onboarding
-      targets:
-          centos-stream-9: {}
-          fedora-latest-stable: {}
-          fedora-latest: {}
-          fedora-rawhide: {}
-#          fedora-eln: {}
-
-    - job: sync_from_downstream
-      trigger: commit
-
-    - job: propose_downstream
-      trigger: release
-      dist_git_branches:
-        - fedora-development
-        - fedora-latest-stable
-
-    - job: koji_build
-      trigger: commit
-      dist_git_branches:
-        - fedora-development
-        - fedora-latest-stable
-
-    - job: bodhi_update
-      trigger: commit
-      dist_git_branches:
-        - fedora-development
-        - fedora-latest-stable
-
-    - <<: *fdo_copr_build
-      trigger: commit
-      branch: main
-      owner: "@fedora-iot"  # copr repo namespace
-      project: fedora-iot   # copr repo name so you can consume the builds
-...
+
+  # Fedora jobs
+
+  - &fdo_copr_build_fedora
+    job: copr_build
+    packages: [fido-device-onboard-fedora]
+    trigger: pull_request
+    targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"]
+
+  - <<: *fdo_copr_build_fedora
+    trigger: commit
+    branch: main
+    owner: "@fedora-iot"
+    project: fedora-iot
+
+  - job: tests
+    trigger: pull_request
+    identifier: onboarding-fedora
+    fmf_path: test/fmf
+    tmt_plan: plans/onboarding
+    packages: [fido-device-onboard-fedora]
+    targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"]
+
+  - job: sync_from_downstream
+    trigger: commit
+
+  - job: propose_downstream
+    trigger: release
+    packages: [fido-device-onboard-fedora]
+    dist_git_branches: ["fedora-development", "fedora-latest-stable"]
+
+  - job: koji_build
+    trigger: commit
+    allowed_pr_authors: [all_committers]
+    dist_git_branches: ["fedora-development", "fedora-latest-stable"]
+
+  - job: bodhi_update
+    trigger: commit
+    allowed_builders: [all_committers]
+    dist_git_branches: ["fedora-development", "fedora-latest-stable"]
+
+  # CentOS jobs
+
+  - &fdo_copr_build_centos
+    job: copr_build
+    packages: [fido-device-onboard-centos]
+    trigger: pull_request
+    targets: ["centos-stream-9", "centos-stream-10"]
+
+  - <<: *fdo_copr_build_centos
+    trigger: commit
+    branch: main
+    owner: "@fedora-iot"
+    project: fedora-iot
+
+  - job: tests
+    trigger: pull_request
+    identifier: onboarding-centos
+    fmf_path: test/fmf
+    tmt_plan: plans/onboarding
+    packages: [fido-device-onboard-centos]
+    targets: ["centos-stream-9", "centos-stream-10"]

CONTRIBUTING.md

@@ -9,7 +9,7 @@ If you want to suggest any changes to the process, please feel free to open a Pu
 
 ### Developing / building
 
-There are a number of ways in which you can set up development environments for working on FDO (FIDO Device Onboarding). 
+There are a number of ways in which you can set up development environments for working on FDO (FIDO Device Onboarding).
 
 #### On Fedora host system
 
@@ -19,7 +19,7 @@ Previous Fedora releases *might* need a different set of dependencies than the o
 In order to make a test build of this crate, when using Fedora, you can run:
 
 ``` bash
-sudo yum install -y cargo rust rust-src git-core openssl-devel clippy rustfmt golang tpm2-tss-devel clevis clevis-luks cryptsetup cryptsetup-devel clang-devel cracklib-dicts
+sudo yum install -y cargo rust rust-src git-core openssl-devel clippy rustfmt golang tpm2-tss-devel clevis clevis-luks cryptsetup cryptsetup-devel clang-devel cracklib-dicts sqlite-devel libpq-devel
 git clone https://github.com/fedora-iot/fido-device-onboard-rs.git
 cd fido-device-onboard-rs
 cargo build --release
@@ -32,26 +32,26 @@ After making changes, you can use `cargo test` to run the test suite, `cargo fmt
 
 If your host operating system is other than Fedora, following two ways are suggested for devlopement setup.
 1.VSCODE remote containers
-2.Toolbox 
+2.Toolbox
 
 ##### 1. VSCODE remote container setup:
 
 Pre-requisites:
-- Install VSCODE for your host operating system. 
+- Install VSCODE for your host operating system.
 - Install ‘Remote-containers’ extension OR you can also install the ‘Remote Development’ extension which contains three extensions useful for remote container development.
 - Download and install Docker Desktop for your operating system. You need to keep running docker desktop to use VSCODE container feature. Check docker status by running ‘docker info’ on command line.
 
 Setup:
 - Open VSCODE and enter ‘Remote-Containers: Clone Repository in Container Volume...’.
-- Select ‘Github’ then enter the repository name and finally the branch name to be cloned. Make sure you clone repo in remote-containers option and not ‘Git clone repository’ which will clone locally and have your host system’ filesystem. 
+- Select ‘Github’ then enter the repository name and finally the branch name to be cloned. Make sure you clone repo in remote-containers option and not ‘Git clone repository’ which will clone locally and have your host system’ filesystem.
 Repo name : fedora-iot/fido-device-onboard-rs or your forked fido repo name
 Branch: main
 - Once the repo is cloned ,it can be accessed via terminal/cmd line in the VSCODE debug console. (It might take a bit longer to download everything at first).
 - Inside terminal, /workspaces/fido-device-onboard-rs (default directory) run following commands to build and run test suite after successful build:
 ``` bash
 cargo build
-cargo test 
-``` 
+cargo test
+```
 
 ##### 2. ToolBox
 
@@ -67,9 +67,9 @@ You can find the name of the container using : 'toolbox list' command.
 Once you enter tool , download required packages for fdo:
 
 ``` bash
-sudo yum install -y cargo rust rust-src git-core openssl-devel clippy rustfmt golang tpm2-tss-devel clevis clevis-luks cryptsetup cryptsetup-devel clang-devel
+sudo yum install -y cargo rust rust-src git-core openssl-devel clippy rustfmt golang tpm2-tss-devel clevis clevis-luks cryptsetup cryptsetup-devel clang-devel cracklib-dicts sqlite-devel libpq-devel
 git clone git@github.com:fedora-iot/fido-device-onboard-rs.git
-cd fido-device-onboard-rs 
+cd fido-device-onboard-rs
 cargo build
 cargo test
 ```