Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ base64 = "0.21.0"
pem = "3.0.2"
x509-certificate = "0.21.0"
lazy_static = "1.4.0"
rsa = "0.9.0"
rsa = "0.9.10"
pkcs1 = "0.7.5"
bytes = "1.4.0"
etcd-client = { version = "0.12.1" }
Expand Down
2 changes: 2 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ fn main() -> Result<()> {
fn generate_protobuf_code() -> Result<()> {
let mut prost_build = prost_build::Config::new();

prost_build.type_attribute(".", "#[allow(dead_code)]");

prost_build.type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]");
prost_build.type_attribute(".", "#[serde(rename_all = \"camelCase\")]");

Expand Down
2 changes: 1 addition & 1 deletion src/cluster_crypto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ fn collect_all_pairs_in_tree(pair: &Rc<RefCell<CertKeyPair>>, out: &mut HashSet<
let signees = { pair.borrow().signees.clone() };
for signee in signees {
if let signee::Signee::CertKeyPair(child) = &signee {
collect_all_pairs_in_tree(&child, out, visited);
collect_all_pairs_in_tree(child, out, visited);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/cluster_crypto/crypto_objects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use std::{
};
use x509_certificate::InMemorySigningKeyPair;

#[allow(clippy::large_enum_variant)]
pub(crate) enum CryptoObject {
PrivateKey(PrivateKey, PublicKey),
PublicKey(PublicKey),
Expand Down
2 changes: 2 additions & 0 deletions src/cluster_crypto/json_crawl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ fn process_data_url_value(value: &Value) -> Result<Option<String>> {
let url = data_url::DataUrl::process(string_value).ok().context("dataurl failed processing")?;

let (decoded, _fragment) = url.decode_to_vec().ok().context("non-unicode dataurl")?;

#[allow(clippy::manual_ok_err)]
if let Ok(decoded) = String::from_utf8(decoded) {
Some(decoded)
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/ocp_postprocess/ip_rename/etcd_rename.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ fn fix_storage_config(config: &mut Value, original_ip: &str, ip: &str) -> Result
let expected_url = format!("https://{original_ip_formatted}:2379");

// Only replace if the original IP is found in the URLs
let contains_original = current_urls.iter().any(|url| url.as_str().map_or(false, |s| s == expected_url));
let contains_original = current_urls.iter().any(|url| url.as_str().is_some_and(|s| s == expected_url));

if contains_original {
let new_ip = if ip.contains(':') { format!("[{ip}]") } else { ip.to_string() };
Expand Down
14 changes: 14 additions & 0 deletions src/protobuf_gen/github.com.openshift.api.oauth.v1.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/protobuf_gen/github.com.openshift.api.route.v1.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading