Skip to content

Commit 280301c

Browse files
Turbo87Turbo87
authored
Merge pull request #5558 from arlosi/normalize
Add normalize-index background job
2 parents f155cfe + 1a99f23 commit 280301c

File tree

48 files changed

+273
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+273
-177
lines changed

‎cargo-registry-index/lib.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub struct Crate {
116116
#[serde(skip_serializing_if = "Option::is_none")]
117117
pub features2: Option<BTreeMap<String, Vec<String>>>,
118118
pub yanked: Option<bool>,
119-
#[serde(default)]
119+
#[serde(skip_serializing_if = "Option::is_none")]
120120
pub links: Option<String>,
121121
/// The schema version for this entry.
122122
///
@@ -524,7 +524,12 @@ impl Repository {
524524
let output = command.output()?;
525525
if !output.status.success() {
526526
let stderr = String::from_utf8_lossy(&output.stderr);
527-
return Err(anyhow!("Running git command failed with: {}", stderr));
527+
let stdout = String::from_utf8_lossy(&output.stdout);
528+
return Err(anyhow!(
529+
"Running git command failed with: {}{}",
530+
stderr,
531+
stdout
532+
));
528533
}
529534

530535
Ok(())

‎src/admin/enqueue_job.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ pub enum Command {
1919
},
2020
DailyDbMaintenance,
2121
SquashIndex,
22+
NormalizeIndex {
23+
#[arg(long = "dry-run")]
24+
dry_run: bool,
25+
},
2226
}
2327

2428
pub fn run(command: Command) -> Result<()> {
@@ -46,5 +50,6 @@ pub fn run(command: Command) -> Result<()> {
4650
} => Ok(worker::dump_db(database_url, target_name).enqueue(&conn)?),
4751
Command::DailyDbMaintenance => Ok(worker::daily_db_maintenance().enqueue(&conn)?),
4852
Command::SquashIndex => Ok(worker::squash_index().enqueue(&conn)?),
53+
Command::NormalizeIndex { dry_run } => Ok(worker::normalize_index(dry_run).enqueue(&conn)?),
4954
}
5055
}

‎src/background_jobs.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub enum Job {
1818
IndexSquash(IndexSquashJob),
1919
IndexSyncToHttp(IndexSyncToHttpJob),
2020
IndexUpdateYanked(IndexUpdateYankedJob),
21+
NormalizeIndex(NormalizeIndexJob),
2122
RenderAndUploadReadme(RenderAndUploadReadmeJob),
2223
UpdateDownloads(UpdateDownloadsJob),
2324
}
@@ -29,6 +30,7 @@ impl Job {
2930
const INDEX_SQUASH: &str = "squash_index";
3031
const INDEX_SYNC_TO_HTTP: &str = "update_crate_index";
3132
const INDEX_UPDATE_YANKED: &str = "sync_yanked";
33+
const NORMALIZE_INDEX: &str = "normalize_index";
3234
const RENDER_AND_UPLOAD_README: &str = "render_and_upload_readme";
3335
const UPDATE_DOWNLOADS: &str = "update_downloads";
3436

@@ -40,6 +42,7 @@ impl Job {
4042
Job::IndexSquash(_) => Self::INDEX_SQUASH,
4143
Job::IndexSyncToHttp(_) => Self::INDEX_SYNC_TO_HTTP,
4244
Job::IndexUpdateYanked(_) => Self::INDEX_UPDATE_YANKED,
45+
Job::NormalizeIndex(_) => Self::NORMALIZE_INDEX,
4346
Job::RenderAndUploadReadme(_) => Self::RENDER_AND_UPLOAD_README,
4447
Job::UpdateDownloads(_) => Self::UPDATE_DOWNLOADS,
4548
}
@@ -53,6 +56,7 @@ impl Job {
5356
Job::IndexSquash(inner) => serde_json::to_value(inner),
5457
Job::IndexSyncToHttp(inner) => serde_json::to_value(inner),
5558
Job::IndexUpdateYanked(inner) => serde_json::to_value(inner),
59+
Job::NormalizeIndex(inner) => serde_json::to_value(inner),
5660
Job::RenderAndUploadReadme(inner) => serde_json::to_value(inner),
5761
Job::UpdateDownloads(inner) => serde_json::to_value(inner),
5862
}
@@ -80,6 +84,7 @@ impl Job {
8084
Self::INDEX_SQUASH => Job::IndexSquash(from_value(value)?),
8185
Self::INDEX_SYNC_TO_HTTP => Job::IndexSyncToHttp(from_value(value)?),
8286
Self::INDEX_UPDATE_YANKED => Job::IndexUpdateYanked(from_value(value)?),
87+
Self::NORMALIZE_INDEX => Job::NormalizeIndex(from_value(value)?),
8388
Self::RENDER_AND_UPLOAD_README => Job::RenderAndUploadReadme(from_value(value)?),
8489
Self::UPDATE_DOWNLOADS => Job::UpdateDownloads(from_value(value)?),
8590
job_type => Err(PerformError::from(format!("Unknown job type {job_type}")))?,
@@ -106,6 +111,7 @@ impl Job {
106111
Job::IndexUpdateYanked(args) => conn.with_connection(&|conn| {
107112
worker::perform_index_update_yanked(env, conn, &args.krate, &args.version_num)
108113
}),
114+
Job::NormalizeIndex(args) => worker::perform_normalize_index(env, args),
109115
Job::RenderAndUploadReadme(args) => conn.with_connection(&|conn| {
110116
worker::perform_render_and_upload_readme(
111117
conn,
@@ -150,6 +156,11 @@ pub struct IndexUpdateYankedJob {
150156
pub(super) version_num: String,
151157
}
152158

159+
#[derive(Serialize, Deserialize)]
160+
pub struct NormalizeIndexJob {
161+
pub dry_run: bool,
162+
}
163+
153164
#[derive(Serialize, Deserialize)]
154165
pub struct RenderAndUploadReadmeJob {
155166
pub(super) version_id: i32,

‎src/tests/http-data/krate_publish_features_version_2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"336"
47+
"323"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImJhciIsInJlcSI6Ij4gMCIsImZlYXR1cmVzIjpbXSwib3B0aW9uYWwiOmZhbHNlLCJkZWZhdWx0X2ZlYXR1cmVzIjp0cnVlLCJ0YXJnZXQiOm51bGwsImtpbmQiOiJub3JtYWwifV0sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7Im9sZF9mZWF0IjpbXX0sImZlYXR1cmVzMiI6eyJuZXdfZmVhdCI6WyJkZXA6YmFyIiwiYmFyPy9mZWF0Il19LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbCwidiI6Mn0K"
54+
"body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImJhciIsInJlcSI6Ij4gMCIsImZlYXR1cmVzIjpbXSwib3B0aW9uYWwiOmZhbHNlLCJkZWZhdWx0X2ZlYXR1cmVzIjp0cnVlLCJ0YXJnZXQiOm51bGwsImtpbmQiOiJub3JtYWwifV0sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7Im9sZF9mZWF0IjpbXX0sImZlYXR1cmVzMiI6eyJuZXdfZmVhdCI6WyJkZXA6YmFyIiwiYmFyPy9mZWF0Il19LCJ5YW5rZWQiOmZhbHNlLCJ2IjoyfQo="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_good_badges.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"163"
47+
"150"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vYmFkZ2VyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZm9vYmFkZ2VyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_good_categories.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"166"
47+
"153"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX2dvb2RfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZm9vX2dvb2RfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_good_keywords.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"166"
47+
"153"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX2dvb2Rfa2V5IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZm9vX2dvb2Rfa2V5IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_ignored_badges.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"171"
47+
"158"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfYmFkZ2UiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K"
54+
"body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfYmFkZ2UiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_ignored_categories.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"169"
47+
"156"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_crate_allow_empty_alternative_registry_dependency.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"272"
47+
"259"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImZvby1kZXAiLCJyZXEiOiI+IDAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
54+
"body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImZvby1kZXAiLCJyZXEiOiI+IDAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg=="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"161"
47+
"148"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX25ldyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
54+
"body": "eyJuYW1lIjoiZm9vX25ldyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg=="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_git_upload.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"157"
47+
"144"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZmd0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZmd0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_git_upload_appends.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"157"
47+
"144"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,
@@ -104,14 +104,14 @@
104104
],
105105
[
106106
"content-length",
107-
"314"
107+
"288"
108108
],
109109
[
110110
"content-type",
111111
"text/plain"
112112
]
113113
],
114-
"body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6IkZQUCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
114+
"body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiRlBQIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
115115
},
116116
"response": {
117117
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_git_upload_with_conflicts.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"167"
47+
"154"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX2NvbmZsaWN0cyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
54+
"body": "eyJuYW1lIjoiZm9vX2NvbmZsaWN0cyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg=="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_records_verified_email.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"172"
47+
"159"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX3ZlcmlmaWVkX2VtYWlsIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZm9vX3ZlcmlmaWVkX2VtYWlsIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_too_big_but_whitelisted.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"167"
47+
"154"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX3doaXRlbGlzdCIsInZlcnMiOiIxLjEuMCIsImRlcHMiOltdLCJja3N1bSI6IjRlMzNkYzU5YmJiYzk2NjQ1ZmMwMTk0NWZiNTAyNTA3ZDFiN2JkM2EyZDA2MjI3YmY3YjBmZTg4NDJmMjg0YzIiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
54+
"body": "eyJuYW1lIjoiZm9vX3doaXRlbGlzdCIsInZlcnMiOiIxLjEuMCIsImRlcHMiOltdLCJja3N1bSI6IjRlMzNkYzU5YmJiYzk2NjQ1ZmMwMTk0NWZiNTAyNTA3ZDFiN2JkM2EyZDA2MjI3YmY3YjBmZTg4NDJmMjg0YzIiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg=="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_twice.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"163"
47+
"150"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX3R3aWNlIiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg=="
54+
"body": "eyJuYW1lIjoiZm9vX3R3aWNlIiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K"
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_weird_version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"167"
47+
"154"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoiZm9vX3dlaXJkIiwidmVycyI6IjAuMC4wLXByZSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
54+
"body": "eyJuYW1lIjoiZm9vX3dlaXJkIiwidmVycyI6IjAuMC4wLXByZSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg=="
5555
},
5656
"response": {
5757
"status": 200,

‎src/tests/http-data/krate_publish_new_krate_with_dependency.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
],
4545
[
4646
"content-length",
47-
"278"
47+
"265"
4848
],
4949
[
5050
"content-type",
5151
"text/plain"
5252
]
5353
],
54-
"body": "eyJuYW1lIjoibmV3X2RlcCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOlt7Im5hbWUiOiJmb28tZGVwIiwicmVxIjoiMS4wLjAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo="
54+
"body": "eyJuYW1lIjoibmV3X2RlcCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOlt7Im5hbWUiOiJmb28tZGVwIiwicmVxIjoiMS4wLjAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg=="
5555
},
5656
"response": {
5757
"status": 200,

0 commit comments

Comments
 (0)