Skip to content

Commit e9364fc

Browse files
committed
Fix docker build warning for test script
1 parent b8e3db9 commit e9364fc

File tree

7 files changed

+108
-47
lines changed

7 files changed

+108
-47
lines changed

.github/workflows/live_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
do
8989
randomString=$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 10 2>/dev/null || echo RANDOM)
9090
{
91-
echo "FROM alpine as builder"
91+
echo "FROM alpine AS builder"
9292
echo "RUN echo \"$randomString\" > test.txt"
9393
echo "FROM scratch"
9494
echo "COPY --from=builder /test.txt ."

Cargo.lock

Lines changed: 84 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ clap = { version = "4.5.4", features = ["derive", "env"]}
1212
chrono = { version="0.4.37" , features=["serde", "clock"], default-features = false}
1313
color-eyre = { version = "0.6.3", default-features = false }
1414
humantime = "2.1.0"
15-
indicatif = { version = "0.17.8", default-features = false }
15+
indicatif = { version = "0.18.0", default-features = false }
1616
regex = { version = "1.10.4", default-features = false }
1717
reqwest = {version = "0.12.2", features = ["json", "rustls-tls"], default-features = false }
18-
secrecy = { version = "0.8.0" }
18+
secrecy = { version = "0.10.3" }
1919
serde = { version = "1.0.197", features = ["derive"], default-features = false }
2020
serde_json = { version = "1.0.115", default-features = false }
21-
tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"], default-features = false }
21+
tokio = { version = "1.47.1", features = ["rt-multi-thread", "macros"], default-features = false }
2222
tower = { version = "0.5.2", default-features = false, features = ["limit", "util"] }
2323
tracing = { version = "0.1.40", default-features = false }
2424
tracing-subscriber = { version = "0.3.18", features = ["env-filter"], default-features = false }
25-
tracing-indicatif = "0.3.6"
25+
tracing-indicatif = "0.3.13"
2626
url = { version = "2.5.0" , default-features = false}
2727
urlencoding = { version="2.1.3" }
2828
wildmatch = { version = "2.3.3" }

src/cli/args.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pub struct Input {
117117
mod tests {
118118
use super::*;
119119
use clap::ValueEnum;
120-
use secrecy::Secret;
120+
use secrecy::SecretString;
121121

122122
#[test]
123123
fn test_vec_of_string_from_str() {
@@ -188,11 +188,15 @@ mod tests {
188188
fn parse_token() {
189189
assert_eq!(
190190
Token::try_from_str("ghs_U4fUiyjT4gUZKJeUEI3AX501oTqIvV0loS62").unwrap(),
191-
Token::Temporal(Secret::new("ghs_U4fUiyjT4gUZKJeUEI3AX501oTqIvV0loS62".to_string()))
191+
Token::Temporal(SecretString::new(Box::from(
192+
"ghs_U4fUiyjT4gUZKJeUEI3AX501oTqIvV0loS62".to_string()
193+
)))
192194
);
193195
assert_eq!(
194196
Token::try_from_str("ghp_sSIL4kMdtzfbfDdm1MC1OU2q5DbRqA3eSszT").unwrap(),
195-
Token::ClassicPersonalAccess(Secret::new("ghp_sSIL4kMdtzfbfDdm1MC1OU2q5DbRqA3eSszT".to_string()))
197+
Token::ClassicPersonalAccess(SecretString::new(Box::from(
198+
"ghp_sSIL4kMdtzfbfDdm1MC1OU2q5DbRqA3eSszT".to_string()
199+
)))
196200
);
197201
}
198202

src/cli/models.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clap::ValueEnum;
22
use regex::Regex;
3-
use secrecy::{ExposeSecret, Secret};
3+
use secrecy::{ExposeSecret, SecretString};
44
use tracing::debug;
55

66
#[derive(Debug, Clone, ValueEnum, PartialEq)]
@@ -23,8 +23,8 @@ pub enum TagSelection {
2323
/// for a list of existing token types.
2424
#[derive(Debug, Clone)]
2525
pub enum Token {
26-
ClassicPersonalAccess(Secret<String>),
27-
Temporal(Secret<String>),
26+
ClassicPersonalAccess(SecretString),
27+
Temporal(SecretString),
2828
}
2929

3030
impl PartialEq for Token {
@@ -51,7 +51,7 @@ impl PartialEq for Token {
5151
impl Token {
5252
pub fn try_from_str(value: &str) -> Result<Self, String> {
5353
let trimmed_value = value.trim_matches('"'); // Remove surrounding quotes
54-
let secret = Secret::new(trimmed_value.to_string());
54+
let secret = SecretString::new(Box::from(trimmed_value));
5555

5656
// Classic PAT
5757
if Regex::new(r"ghp_[a-zA-Z0-9]{36}$").unwrap().is_match(trimmed_value) {

src/client/builder.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl PackagesClientBuilder {
165165
mod tests {
166166
use super::*;
167167
use crate::cli::args::{DEFAULT_GITHUB_API_URL, DEFAULT_GITHUB_SERVER_URL};
168-
use secrecy::Secret;
168+
use secrecy::SecretString;
169169

170170
#[test]
171171
fn test_builder_init() {
@@ -183,7 +183,7 @@ mod tests {
183183
fn test_builder_set_http_headers() {
184184
let builder = PackagesClientBuilder::new();
185185
let builder = builder
186-
.set_http_headers(Token::Temporal(Secret::new("test".to_string())))
186+
.set_http_headers(Token::Temporal(SecretString::new(Box::from("test".to_string()))))
187187
.unwrap();
188188
assert!(builder.headers.is_some());
189189
assert!(builder.token.is_some());
@@ -241,13 +241,13 @@ mod tests {
241241
.is_err());
242242
assert!(PackagesClientBuilder::new()
243243
.generate_urls(github_server_url, github_api_url, &Account::User)
244-
.set_http_headers(Token::Temporal(Secret::new("test".to_string())))
244+
.set_http_headers(Token::Temporal(SecretString::new(Box::from("test".to_string()))))
245245
.unwrap()
246246
.build()
247247
.is_err());
248248
assert!(PackagesClientBuilder::new()
249249
.generate_urls(github_server_url, github_api_url, &Account::User)
250-
.set_http_headers(Token::Temporal(Secret::new("test".to_string())))
250+
.set_http_headers(Token::Temporal(SecretString::new(Box::from("test".to_string()))))
251251
.unwrap()
252252
.create_rate_limited_services()
253253
.build()

src/client/client.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ mod tests {
487487
use crate::cli::models::Account;
488488
use crate::client::builder::PackagesClientBuilder;
489489
use reqwest::header::HeaderValue;
490-
use secrecy::Secret;
490+
use secrecy::SecretString;
491491

492492
#[test]
493493
fn github_headers() {
@@ -533,7 +533,9 @@ mod tests {
533533
let test_string = "test".to_string();
534534

535535
let client_builder = PackagesClientBuilder::new()
536-
.set_http_headers(Token::ClassicPersonalAccess(Secret::new(test_string.clone())))
536+
.set_http_headers(Token::ClassicPersonalAccess(SecretString::new(Box::from(
537+
test_string.clone(),
538+
))))
537539
.unwrap();
538540

539541
let set_headers = client_builder.headers.clone().unwrap();

0 commit comments

Comments
 (0)