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
6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ async-trait = "0.1.83"
axum = "0.8.1"
candid = "0.10.10"
clap = { version = "4.5.20", features = ["derive", "string", "env"] }
# Lock it down for now so that our fork (which has 0.14.1)
# is selected during patching in ic-gateway etc
cloudflare = { version = ">=0.14.0,<=0.14.1", default-features = false, features = [
"rustls-tls",
] }
derive-new = "0.7.0"
fqdn = { version = "0.5.2" }
hickory-proto = "0.26.1"
Expand Down Expand Up @@ -63,6 +58,7 @@ reqwest = { version = "0.13.2", default-features = false, features = [
"json",
"stream",
"gzip",
"query",
] }
rcgen = { version = "0.14.3", default-features = false, features = [
"crypto",
Expand Down
3 changes: 1 addition & 2 deletions ic-bn-lib-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license.workspace = true
readme.workspace = true
keywords.workspace = true
description = "A collection of traits & types commonly used by ic-bn-lib and others"
version = "0.2.1"
version = "0.2.2"
documentation = "https://docs.rs/ic-bn-lib-common"

[dependencies]
Expand All @@ -14,7 +14,6 @@ async-trait = { workspace = true }
axum = { workspace = true }
candid = { workspace = true }
clap = { workspace = true }
cloudflare = { workspace = true }
derive-new = { workspace = true }
fqdn = { workspace = true }
hickory-proto = { workspace = true }
Expand Down
14 changes: 1 addition & 13 deletions ic-bn-lib-common/src/types/acme.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::{fmt::Display, str::FromStr};

use anyhow::{Context, anyhow};
use cloudflare::endpoints::dns::dns::DnsContent;
use anyhow::Context;
use instant_acme::{
AuthorizationStatus, ChallengeType, Error as AcmeError, Identifier, LetsEncrypt, OrderStatus,
};
Expand Down Expand Up @@ -67,17 +66,6 @@ pub enum Record {
Txt(String),
}

impl TryFrom<DnsContent> for Record {
type Error = anyhow::Error;

fn try_from(value: DnsContent) -> Result<Self, Self::Error> {
match value {
DnsContent::TXT { content } => Ok(Self::Txt(content)),
_ => Err(anyhow!("not supported")),
}
}
}

#[cfg(test)]
mod test {
use super::*;
Expand Down
8 changes: 6 additions & 2 deletions ic-bn-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ acme = [
"dep:hex",
"dep:sha2",
]
acme-dns = ["acme", "dep:cloudflare"]
acme-dns = ["acme"]
acme-alpn = ["acme", "dep:rustls-acme"]
clients-hyper = ["dep:hyper-rustls"]
custom-domains = []
Expand All @@ -46,7 +46,6 @@ bytes = "1.10.0"
candid = { workspace = true }
clap = { workspace = true }
chacha20poly1305 = "0.10.1"
cloudflare = { workspace = true, optional = true }
derive-new = { workspace = true }
flate2 = { version = "1.0", optional = true }
fqdn = { workspace = true }
Expand Down Expand Up @@ -159,3 +158,8 @@ required-features = ["vector"]
[package.metadata.cargo-all-features]
# Limit feature combinations to reduce test duration
max_combination_size = 2

[[bin]]
name = "cloudflare-test"
path = "tools/cloudflare-test.rs"
required-features = ["acme-dns"]
Loading
Loading