Skip to content

Commit 08693eb

Browse files
bryantbiggsbryantbiggs
authored
chore: Change name used on QuayIO environment variable and for client in test and examples (#2)
1 parent e8bbff9 commit 08693eb

File tree

19 files changed

+188
-167
lines changed

19 files changed

+188
-167
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ jobs:
7979
# - name: Run cargo test (test-net-private)
8080
# run: cargo test --features test-net,test-net-private
8181
# env:
82-
# DKREG_QUAY_USER: ${{ secrets.DKREG_QUAY_USER }}
83-
# DKREG_QUAY_PASSWD: ${{ secrets.DKREG_QUAY_PASSWD }}
82+
# DOCKER_REGISTRY_QUAY_USER: ${{ secrets.DOCKER_REGISTRY_QUAY_USER }}
83+
# DOCKER_REGISTRY_QUAY_PASSWD: ${{ secrets.DOCKER_REGISTRY_QUAY_PASSWD }}
8484

8585
lints:
8686
name: Lints
@@ -93,6 +93,8 @@ jobs:
9393

9494
- name: Install toolchain
9595
uses: dtolnay/rust-toolchain@nightly
96+
with:
97+
components: rustfmt, clippy
9698

9799
- name: Run cargo fmt
98100
run: cargo fmt --all -- --check

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ url = "2.5"
4949

5050
[dev-dependencies]
5151
dirs = "5.0"
52-
env_logger = "0.11"
5352
hyper = "1.4"
5453
mockito = "1.5"
5554
native-tls = "0.2"
5655
test-case = "3.3"
5756
tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
5857
tracing = "0.1"
58+
tracing-subscriber = "0.3"
5959

6060
[features]
6161
default = ["reqwest-default-tls"]

‎examples/checkregistry.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ use tracing::{error, info};
44

55
#[tokio::main]
66
async fn main() {
7+
tracing_subscriber::fmt()
8+
.pretty()
9+
.with_max_level(tracing::Level::INFO)
10+
.init();
11+
712
let registry = match std::env::args().nth(1) {
813
Some(x) => x,
914
None => "registry-1.docker.io".into(),
@@ -18,12 +23,12 @@ async fn main() {
1823
}
1924

2025
async fn run(host: &str) -> Result<bool, boxed::Box<dyn error::Error>> {
21-
let dclient = docker_registry::v2::Client::configure()
26+
let client = docker_registry::v2::Client::configure()
2227
.registry(host)
2328
.insecure_registry(false)
2429
.build()?;
2530

26-
let supported = dclient.is_v2_supported().await?;
31+
let supported = client.is_v2_supported().await?;
2732
if supported {
2833
info!("{host} supports v2");
2934
} else {

‎examples/image-labels.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ use tracing::{error, info, warn};
55

66
#[tokio::main]
77
async fn main() {
8+
tracing_subscriber::fmt()
9+
.pretty()
10+
.with_max_level(tracing::Level::INFO)
11+
.init();
12+
813
let dkr_ref = match std::env::args().nth(1) {
914
Some(ref x) => reference::Reference::from_str(x),
1015
None => reference::Reference::from_str("quay.io/steveej/cincinnati-test-labels:0.0.0"),
@@ -27,13 +32,13 @@ async fn main() {
2732
warn!("[{registry}] no credentials found in config.json");
2833
}
2934
} else {
30-
user = env::var("DKREG_USER").ok();
35+
user = env::var("DOCKER_REGISTRY_USER").ok();
3136
if user.is_none() {
32-
warn!("[{registry}] no $DKREG_USER for login user");
37+
warn!("[{registry}] no $DOCKER_REGISTRY_USER for login user");
3338
}
34-
password = env::var("DKREG_PASSWD").ok();
39+
password = env::var("DOCKER_REGISTRY_PASSWD").ok();
3540
if password.is_none() {
36-
warn!("[{registry}] no $DKREG_PASSWD for login password");
41+
warn!("[{registry}] no $DOCKER_REGISTRY_PASSWD for login password");
3742
}
3843
};
3944

@@ -61,8 +66,8 @@ async fn run(
6166
let login_scope = format!("repository:{image}:pull");
6267
let version = dkr_ref.version();
6368

64-
let dclient = client.authenticate(&[&login_scope]).await?;
65-
let manifest = dclient.get_manifest(&image, &version).await?;
69+
let client = client.authenticate(&[&login_scope]).await?;
70+
let manifest = client.get_manifest(&image, &version).await?;
6671

6772
if let Manifest::S1Signed(s1s) = manifest {
6873
let labels = s1s.get_labels(0);

‎examples/image.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ async fn main() -> Result<(), boxed::Box<dyn error::Error>> {
4949
warn!("[{registry}] no credentials found in config.json");
5050
}
5151
} else {
52-
user = env::var("DKREG_USER").ok();
52+
user = env::var("DOCKER_REGISTRY_USER").ok();
5353
if user.is_none() {
54-
warn!("[{registry}] no $DKREG_USER for login user");
54+
warn!("[{registry}] no $DOCKER_REGISTRY_USER for login user");
5555
}
56-
password = env::var("DKREG_PASSWD").ok();
56+
password = env::var("DOCKER_REGISTRY_PASSWD").ok();
5757
if password.is_none() {
58-
warn!("[{registry}] no $DKREG_PASSWD for login password");
58+
warn!("[{registry}] no $DOCKER_REGISTRY_PASSWD for login password");
5959
}
6060
};
6161

@@ -77,10 +77,10 @@ async fn run(
7777
passwd: Option<String>,
7878
path: &Path,
7979
) -> Result<(), boxed::Box<dyn error::Error>> {
80-
env_logger::Builder::new()
81-
.filter(Some("docker_registry"), log::LevelFilter::Trace)
82-
.filter(Some("trace"), log::LevelFilter::Trace)
83-
.try_init()?;
80+
tracing_subscriber::fmt()
81+
.pretty()
82+
.with_max_level(tracing::Level::INFO)
83+
.init();
8484

8585
let client = docker_registry::v2::Client::configure()
8686
.registry(registry)
@@ -91,15 +91,15 @@ async fn run(
9191

9292
let login_scope = format!("repository:{image}:pull");
9393

94-
let dclient = client.authenticate(&[&login_scope]).await?;
95-
let manifest = dclient.get_manifest(image, version).await?;
94+
let client = client.authenticate(&[&login_scope]).await?;
95+
let manifest = client.get_manifest(image, version).await?;
9696
let layers_digests = manifest.layers_digests(None)?;
9797

9898
info!("{} -> got {} layer(s)", &image, layers_digests.len(),);
9999

100100
let blob_futures = layers_digests
101101
.iter()
102-
.map(|layer_digest| dclient.get_blob(image, layer_digest))
102+
.map(|layer_digest| client.get_blob(image, layer_digest))
103103
.collect::<Vec<_>>();
104104

105105
let blobs = try_join_all(blob_futures).await?;

‎examples/login.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ use tracing::{error, warn};
44

55
#[tokio::main]
66
async fn main() {
7+
tracing_subscriber::fmt()
8+
.pretty()
9+
.with_max_level(tracing::Level::INFO)
10+
.init();
11+
712
let registry = match std::env::args().nth(1) {
813
Some(x) => x,
914
None => "registry-1.docker.io".into(),
@@ -14,13 +19,13 @@ async fn main() {
1419
None => "".into(),
1520
};
1621

17-
let user = std::env::var("DKREG_USER").ok();
22+
let user = std::env::var("DOCKER_REGISTRY_USER").ok();
1823
if user.is_none() {
19-
warn!("[{registry}] no $DKREG_USER for login user");
24+
warn!("[{registry}] no $DOCKER_REGISTRY_USER for login user");
2025
}
21-
let password = std::env::var("DKREG_PASSWD").ok();
26+
let password = std::env::var("DOCKER_REGISTRY_PASSWD").ok();
2227
if password.is_none() {
23-
warn!("[{registry}] no $DKREG_PASSWD for login password");
28+
warn!("[{registry}] no $DOCKER_REGISTRY_PASSWD for login password");
2429
}
2530

2631
let res = run(&registry, user, password, login_scope).await;
@@ -37,19 +42,14 @@ async fn run(
3742
passwd: Option<String>,
3843
login_scope: String,
3944
) -> Result<(), boxed::Box<dyn error::Error>> {
40-
env_logger::Builder::new()
41-
.filter(Some("docker_registry"), log::LevelFilter::Trace)
42-
.filter(Some("trace"), log::LevelFilter::Trace)
43-
.try_init()?;
44-
4545
let client = docker_registry::v2::Client::configure()
4646
.registry(host)
4747
.insecure_registry(false)
4848
.username(user)
4949
.password(passwd)
5050
.build()?;
5151

52-
let dclient = client.authenticate(&[&login_scope]).await?;
53-
dclient.is_auth().await?;
52+
let client = client.authenticate(&[&login_scope]).await?;
53+
client.is_auth().await?;
5454
Ok(())
5555
}

‎examples/tags.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ use tracing::{error, info, warn};
55

66
#[tokio::main]
77
async fn main() {
8+
tracing_subscriber::fmt()
9+
.pretty()
10+
.with_max_level(tracing::Level::INFO)
11+
.init();
12+
813
let registry = match std::env::args().nth(1) {
914
Some(x) => x,
1015
None => "registry-1.docker.io".into(),
@@ -16,13 +21,13 @@ async fn main() {
1621
};
1722
info!("[{registry}] requesting tags for image {image}");
1823

19-
let user = std::env::var("DKREG_USER").ok();
24+
let user = std::env::var("DOCKER_REGISTRY_USER").ok();
2025
if user.is_none() {
21-
warn!("[{registry}] no $DKREG_USER for login user");
26+
warn!("[{registry}] no $DOCKER_REGISTRY_USER for login user");
2227
}
23-
let password = std::env::var("DKREG_PASSWD").ok();
28+
let password = std::env::var("DOCKER_REGISTRY_PASSWD").ok();
2429
if password.is_none() {
25-
warn!("[{registry}] no $DKREG_PASSWD for login password");
30+
warn!("[{registry}] no $DOCKER_REGISTRY_PASSWD for login password");
2631
}
2732

2833
let res = run(&registry, user, password, &image).await;
@@ -39,11 +44,6 @@ async fn run(
3944
passwd: Option<String>,
4045
image: &str,
4146
) -> Result<(), boxed::Box<dyn error::Error>> {
42-
env_logger::Builder::new()
43-
.filter(Some("docker_registry"), log::LevelFilter::Trace)
44-
.filter(Some("trace"), log::LevelFilter::Trace)
45-
.try_init()?;
46-
4747
let client = docker_registry::v2::Client::configure()
4848
.registry(host)
4949
.insecure_registry(false)
@@ -53,9 +53,9 @@ async fn run(
5353

5454
let login_scope = format!("repository:{image}:pull");
5555

56-
let dclient = client.authenticate(&[&login_scope]).await?;
56+
let client = client.authenticate(&[&login_scope]).await?;
5757

58-
dclient
58+
client
5959
.get_tags(image, Some(7))
6060
.collect::<Vec<_>>()
6161
.await

‎examples/trace.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ use tracing::{error, info, warn};
55

66
#[tokio::main]
77
async fn main() {
8+
tracing_subscriber::fmt()
9+
.pretty()
10+
.with_max_level(tracing::Level::INFO)
11+
.init();
12+
813
let dkr_ref = match std::env::args().nth(1) {
914
Some(ref x) => reference::Reference::from_str(x),
1015
None => reference::Reference::from_str("quay.io/coreos/etcd"),
@@ -27,13 +32,13 @@ async fn main() {
2732
warn!("[{registry}] no credentials found in config.json");
2833
}
2934
} else {
30-
user = env::var("DKREG_USER").ok();
35+
user = env::var("DOCKER_REGISTRY_USER").ok();
3136
if user.is_none() {
32-
warn!("[{registry}] no $DKREG_USER for login user");
37+
warn!("[{registry}] no $DOCKER_REGISTRY_USER for login user");
3338
}
34-
password = env::var("DKREG_PASSWD").ok();
39+
password = env::var("DOCKER_REGISTRY_PASSWD").ok();
3540
if password.is_none() {
36-
warn!("[{registry}] no $DKREG_PASSWD for login password");
41+
warn!("[{registry}] no $DOCKER_REGISTRY_PASSWD for login password");
3742
}
3843
};
3944

@@ -50,11 +55,6 @@ async fn run(
5055
user: Option<String>,
5156
passwd: Option<String>,
5257
) -> Result<(), boxed::Box<dyn error::Error>> {
53-
env_logger::Builder::new()
54-
.filter(Some("docker_registry"), log::LevelFilter::Trace)
55-
.filter(Some("trace"), log::LevelFilter::Trace)
56-
.try_init()?;
57-
5858
let image = dkr_ref.repository();
5959
let version = dkr_ref.version();
6060

@@ -67,14 +67,14 @@ async fn run(
6767

6868
let login_scope = "";
6969

70-
let dclient = client.authenticate(&[login_scope]).await?;
71-
let manifest = dclient.get_manifest(&image, &version).await?;
70+
let client = client.authenticate(&[login_scope]).await?;
71+
let manifest = client.get_manifest(&image, &version).await?;
7272

7373
let layers_digests = manifest.layers_digests(None)?;
7474
info!("{} -> got {} layer(s)", &image, layers_digests.len(),);
7575

7676
for layer_digest in &layers_digests {
77-
let blob = dclient.get_blob(&image, layer_digest).await?;
77+
let blob = client.get_blob(&image, layer_digest).await?;
7878
info!("Layer {layer_digest}, got {} bytes.", blob.len());
7979
}
8080

‎src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
//!
1717
//! // Check whether a registry supports API v2.
1818
//! let host = "quay.io";
19-
//! let dclient = Client::configure()
19+
//! let client = Client::configure()
2020
//! .insecure_registry(false)
2121
//! .registry(host)
2222
//! .build()?;
23-
//! match dclient.is_v2_supported().await? {
23+
//! match client.is_v2_supported().await? {
2424
//! false => println!("{} does NOT support v2", host),
2525
//! true => println!("{} supports v2", host),
2626
//! };

‎src/v2/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
//! use docker_registry::v2::Client;
1717
//!
1818
//! // Retrieve an image manifest.
19-
//! let dclient = Client::configure().registry("quay.io").build()?;
20-
//! let manifest = dclient.get_manifest("coreos/etcd", "v3.1.0").await?;
19+
//! let client = Client::configure().registry("quay.io").build()?;
20+
//! let manifest = client.get_manifest("coreos/etcd", "v3.1.0").await?;
2121
//! #
2222
//! # Ok(())
2323
//! # };

0 commit comments

Comments
 (0)