Skip to content

Commit

Permalink
bad merge -- rm git_commit_timestamp
Browse files Browse the repository at this point in the history
  • Loading branch information
maceip committed Oct 28, 2024
1 parent de6d25e commit 3d92843
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions crates/notary/server/src/domain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ pub struct InfoResponse {
pub public_key: String,
/// Current git commit hash of notary-server
pub git_commit_hash: String,
/// Current git commit timestamp of notary-server
pub git_commit_timestamp: String,
/// Hardware attestation
#[cfg(feature = "tee_quote")]
pub quote: Quote,
Expand Down
2 changes: 0 additions & 2 deletions crates/notary/server/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ pub async fn run_server(config: &NotaryServerProperties) -> Result<(), NotarySer
// Parameters needed for the info endpoint
let public_key = std::fs::read_to_string(&config.notary_key.public_key_pem_path)
.map_err(|err| eyre!("Failed to load notary public signing key for notarization: {err}"))?;

let version = env!("CARGO_PKG_VERSION").to_string();
let git_commit_hash = env!("GIT_COMMIT_HASH").to_string();

Expand Down Expand Up @@ -142,7 +141,6 @@ pub async fn run_server(config: &NotaryServerProperties) -> Result<(), NotarySer
version,
public_key,
git_commit_hash,
git_commit_timestamp,
#[cfg(feature = "tee_quote")]
quote: quote().await,

Check warning on line 145 in crates/notary/server/src/server.rs

View check run for this annotation

Codecov / codecov/patch

crates/notary/server/src/server.rs#L144-L145

Added lines #L144 - L145 were not covered by tests
}),
Expand Down

0 comments on commit 3d92843

Please sign in to comment.