-
Notifications
You must be signed in to change notification settings - Fork 2.1k
fix(tee): lowercase enum TEE types #2798
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
9425d3a
fix(tee): lowercase enum tee types
pbeza 20d5d30
Add envy test (as suggested by Harald)
pbeza f123295
Fix tests
pbeza e524817
Address code review
pbeza cf4ab4a
Merge remote-tracking branch 'origin/main' into tee/fix/lowercase-enu…
pbeza 72f9693
Remove envy test
pbeza b69249c
Merge remote-tracking branch 'origin/main' into tee/fix/lowercase-enu…
pbeza d7e938f
fixup! Remove envy test
pbeza ae10700
Fixes
pbeza 65740b7
Fixes of fixes of fixes of fixes
pbeza File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,58 @@ | ||
use std::{fmt, str::FromStr}; | ||
|
||
use serde::{Deserialize, Serialize}; | ||
use strum::{Display, EnumString}; | ||
|
||
#[derive(Debug, Clone, Copy, PartialEq, EnumString, Display, Serialize, Deserialize)] | ||
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] | ||
#[serde(rename_all = "lowercase")] | ||
#[non_exhaustive] | ||
pub enum TeeType { | ||
#[strum(serialize = "sgx")] | ||
Sgx, | ||
} | ||
|
||
impl fmt::Display for TeeType { | ||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
match self { | ||
TeeType::Sgx => write!(f, "sgx"), | ||
} | ||
} | ||
} | ||
|
||
impl FromStr for TeeType { | ||
type Err = String; | ||
pbeza marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
serde_json::from_str(&format!("\"{}\"", s.to_lowercase())) | ||
.map_err(|_| format!("Invalid value for TeeType: {}", s)) | ||
} | ||
pbeza marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use serde_json; | ||
|
||
use super::*; | ||
|
||
#[test] | ||
fn test_deserialize_teetype() { | ||
let json_str = "\"sgx\""; | ||
let tee_type: TeeType = serde_json::from_str(json_str).unwrap(); | ||
assert_eq!(tee_type, TeeType::Sgx); | ||
|
||
for json_str in &["\"Sgx\"", "\"SGX\""] { | ||
let result: Result<TeeType, _> = serde_json::from_str(json_str); | ||
assert!(result.is_err()); | ||
} | ||
} | ||
|
||
#[test] | ||
fn test_enumstring_teetype() { | ||
assert_eq!(TeeType::from_str("sgx").unwrap(), TeeType::Sgx); | ||
assert_eq!(TeeType::from_str("Sgx").unwrap(), TeeType::Sgx); | ||
assert_eq!(TeeType::from_str("SGX").unwrap(), TeeType::Sgx); | ||
} | ||
|
||
#[test] | ||
fn test_display_teetype() { | ||
assert_eq!(TeeType::Sgx.to_string(), "sgx"); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.