Adding impl From for Wrapped Enums

Adding Default

Signed-off-by: Larry Dewey <[email protected]>

Author: larrydewey

src/comid.rs

@@ -149,6 +149,12 @@ pub enum TagIdTypeChoice<'a> {
     Uuid(UuidType),
 }
 
+impl<'a> From<&'a str> for TagIdTypeChoice<'a> {
+    fn from(value: &'a str) -> Self {
+        TagIdTypeChoice::Tstr(Tstr::from(value))
+    }
+}
+
 /// Information about an entity associated with the tag
 #[derive(Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
@@ -205,7 +211,7 @@ pub enum TagRelTypeChoice {
 }
 
 /// Collection of different types of triples describing the module characteristics
-#[derive(Debug, Serialize, Deserialize, From)]
+#[derive(Default, Debug, Serialize, Deserialize, From)]
 #[repr(C)]
 pub struct TriplesMap<'a> {
     /// Optional reference triples that link to external references

src/core.rs

@@ -66,6 +66,11 @@ pub type Int = i32;
 /// Integer is an alias for Int type
 pub type Integer = Int;
 
+pub enum StrWrapper<'a, T> {
+    Tstr(Tstr<'a>),
+    Other(T),
+}
+
 /// ExtensionMap represents the possible types that can be used in extensions
 #[derive(Debug, Serialize, Deserialize, Ord, PartialOrd, Eq, PartialEq, From, TryFrom)]
 pub enum ExtensionMap<'a> {
@@ -86,7 +91,7 @@ pub enum ExtensionMap<'a> {
 }
 
 /// UUID type representing a 16-byte unique identifier
-#[derive(Debug, Serialize, Deserialize, From, AsRef, AsMut, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, AsRef, AsMut, Constructor)]
 pub struct UuidType {
     #[serde(flatten)]
     pub field: [u8; 16],
@@ -209,7 +214,7 @@ pub enum AttributeValue<'a> {
 }
 
 /// Represents global attributes with optional language tag and arbitrary attributes
-#[derive(Debug, Clone, Default, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Clone, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct GlobalAttributes<'a> {
     /// Optional language tag (ex. en_US)
@@ -311,7 +316,7 @@ pub struct CoseKey<'a> {
     pub extension: Option<ExtensionMap<'a>>,
 }
 
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 /// Raw value data structure with associated mask
 pub struct MaskedRawValue {

src/corim.rs

@@ -76,8 +76,9 @@
 //! and optional fields defined in the standard.
 
 use crate::{
-    core::Bytes, generate_tagged, Digest, ExtensionMap, Int, OidType, OneOrMany, TaggedBytes,
-    TaggedConciseMidTag, TaggedConciseSwidTag, TaggedConciseTlTag, Text, Time, Tstr, Uri, UuidType,
+    comid::ConciseMidTag, core::Bytes, coswid::ConciseSwidTag, cotl::ConciseTlTag, generate_tagged,
+    Digest, ExtensionMap, Int, OidType, OneOrMany, TaggedBytes, TaggedConciseMidTag,
+    TaggedConciseSwidTag, TaggedConciseTlTag, Text, Time, Tstr, Uri, UuidType,
 };
 
 use derive_more::{Constructor, From, TryFrom};
@@ -153,6 +154,12 @@ pub enum CorimIdTypeChoice<'a> {
     Uuid(UuidType),
 }
 
+impl<'a> From<&'a str> for CorimIdTypeChoice<'a> {
+    fn from(s: &'a str) -> Self {
+        CorimIdTypeChoice::Tstr(s.into())
+    }
+}
+
 /// Types of tags that can be included in a CoRIM
 #[repr(C)]
 #[derive(Debug, Serialize, Deserialize, From, TryFrom)]
@@ -165,6 +172,22 @@ pub enum ConciseTagTypeChoice<'a> {
     Tl(TaggedConciseTlTag<'a>),
 }
 
+impl<'a> From<ConciseSwidTag<'a>> for ConciseTagTypeChoice<'a> {
+    fn from(value: ConciseSwidTag<'a>) -> Self {
+        Self::Swid(value.into())
+    }
+}
+impl<'a> From<ConciseMidTag<'a>> for ConciseTagTypeChoice<'a> {
+    fn from(value: ConciseMidTag<'a>) -> Self {
+        Self::Mid(value.into())
+    }
+}
+impl<'a> From<ConciseTlTag<'a>> for ConciseTagTypeChoice<'a> {
+    fn from(value: ConciseTlTag<'a>) -> Self {
+        Self::Tl(value.into())
+    }
+}
+
 /// Location and optional thumbprint of a dependent CoRIM
 #[repr(C)]
 #[derive(Debug, Serialize, Deserialize, From, Constructor)]
@@ -188,7 +211,7 @@ pub enum ProfileTypeChoice<'a> {
 
 /// Defines the validity period for a CoRIM or signature
 #[repr(C)]
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 pub struct ValidityMap {
     /// Optional start time of the validity period
     #[serde(rename = "not-before")]
@@ -249,7 +272,7 @@ pub struct COSESign1Corim<'a> {
 }
 
 /// Protected header for a signed CoRIM
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct ProtectedCorimHeaderMap<'a> {
     /// Algorithm identifier for the signature
@@ -269,7 +292,7 @@ pub struct ProtectedCorimHeaderMap<'a> {
 }
 
 /// Metadata about the CoRIM signing operation
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct CorimMetaMap<'a> {
     /// Information about the signer
@@ -280,7 +303,7 @@ pub struct CorimMetaMap<'a> {
 }
 
 /// Information about the entity that signed the CoRIM
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct CorimSignerMap<'a> {
     /// Name of the signing entity

src/coswid.rs

@@ -140,7 +140,7 @@ pub struct ConciseSwidTag<'a> {
 /// useful for identification, deployment, or management purposes. All fields
 /// are optional except for global attributes.
 #[repr(C)]
-#[derive(Debug, Serialize, Deserialize, From)]
+#[derive(Default, Debug, Serialize, Deserialize, From)]
 pub struct SoftwareMetaEntry<'a> {
     /// Current activation status of the software (e.g., "trial", "full", "deleted")
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -338,15 +338,15 @@ pub enum PayloadOrEvidence<'a> {
 }
 
 /// Container for payload information
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct Payload<'a> {
     /// The payload entry containing resource information
     payload: PayloadEntry<'a>,
 }
 
 /// Detailed payload information about software resources
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct PayloadEntry<'a> {
     /// Collection of resources in the software
@@ -367,7 +367,7 @@ pub struct PayloadEntry<'a> {
 /// This structure groups together all the resources that are part of the
 /// software, including files, directories, processes, and other resource types.
 /// It forms the core content description of what comprises the software.
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct ResourceCollection<'a> {
     /// Group of filesystem path elements
@@ -387,7 +387,7 @@ pub struct ResourceCollection<'a> {
 }
 
 /// Group of filesystem path elements in a resource collection
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct PathElementsGroup<'a> {
     /// Optional list of directory entries
@@ -399,7 +399,7 @@ pub struct PathElementsGroup<'a> {
 }
 
 /// Information about a directory in the filesystem
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct DirectoryEntry<'a> {
     /// Basic filesystem item information
@@ -426,7 +426,7 @@ pub struct DirectoryEntry<'a> {
 }
 
 /// Basic information about a filesystem item (file or directory)
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct FileSystemItem<'a> {
     /// Indicates if this is a key/critical filesystem item
@@ -444,7 +444,7 @@ pub struct FileSystemItem<'a> {
 }
 
 /// Information about a file in the filesystem
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct FileEntry<'a> {
     /// Basic filesystem item information
@@ -471,7 +471,7 @@ pub struct FileEntry<'a> {
 }
 
 /// Information about a running process
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct ProcessEntry<'a> {
     /// Name of the process
@@ -490,7 +490,7 @@ pub struct ProcessEntry<'a> {
 }
 
 /// Information about a general resource
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct ResourceEntry<'a> {
     /// Type identifier for the resource
@@ -505,15 +505,15 @@ pub struct ResourceEntry<'a> {
 }
 
 /// Container for evidence information about observed software state
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct Evidence<'a> {
     /// The evidence entry containing observed resource information
     pub evidence: EvidenceEntry<'a>,
 }
 
 /// Detailed evidence information about observed software state
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct EvidenceEntry<'a> {
     /// Collection of observed resources

src/fixed_bytes.rs

@@ -113,6 +113,12 @@ impl<const N: usize> std::fmt::Debug for FixedBytes<N> {
     }
 }
 
+impl<const N: usize> Default for FixedBytes<N> {
+    fn default() -> Self {
+        Self([0; N])
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/macros.rs

@@ -39,7 +39,7 @@
 /// use corim_rs::generate_tagged;
 ///
 /// // Define a simple type to wrap
-/// #[derive(Debug, PartialEq, Serialize, Deserialize)]
+/// #[derive(Default, Debug, PartialEq, Serialize, Deserialize)]
 /// pub struct MyType(u32);
 ///
 /// // Generate the tagged wrapper

src/triples.rs

@@ -126,7 +126,7 @@ pub struct EnvironmentMap<'a> {
 }
 
 /// Classification information for an environment
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct ClassMap<'a> {
     /// Optional class identifier
@@ -263,7 +263,7 @@ pub enum GroupIdTypeChoice {
 }
 
 /// Map containing measurement values and metadata
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct MeasurementMap<'a> {
     /// Optional measurement key identifier
@@ -290,8 +290,14 @@ pub enum MeasuredElementTypeChoice<'a> {
     Tstr(Tstr<'a>),
 }
 
+impl<'a> From<&'a str> for MeasuredElementTypeChoice<'a> {
+    fn from(value: &'a str) -> Self {
+        Self::Tstr(value.into())
+    }
+}
+
 /// Collection of measurement values and attributes
-#[derive(Debug, Default, Serialize, Deserialize, From)]
+#[derive(Default, Debug, Serialize, Deserialize, From)]
 #[repr(C)]
 pub struct MeasurementValuesMap<'a> {
     /// Optional version information
@@ -341,7 +347,7 @@ pub struct MeasurementValuesMap<'a> {
 }
 
 /// Version information with optional versioning scheme
-#[derive(Debug, Serialize, Deserialize, From, Constructor)]
+#[derive(Default, Debug, Serialize, Deserialize, From, Constructor)]
 #[repr(C)]
 pub struct VersionMap<'a> {
     /// Version identifier string
@@ -367,7 +373,7 @@ pub enum SvnTypeChoice {
 pub type DigestType<'a> = OneOrMany<Digest<'a>>;
 
 /// Status flags indicating various security and configuration states
-#[derive(Debug, Serialize, Deserialize, From)]
+#[derive(Default, Debug, Serialize, Deserialize, From)]
 #[repr(C)]
 pub struct FlagsMap<'a> {
     /// Whether the environment is configured