From b0f714d0e79bc823f118976e39f31359b5638a1e Mon Sep 17 00:00:00 2001 From: Arlo Siemsen Date: Tue, 29 Nov 2022 16:48:19 +0100 Subject: [PATCH 1/8] index/run_command: Add `stdout` to error message --- cargo-registry-index/lib.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cargo-registry-index/lib.rs b/cargo-registry-index/lib.rs index 5ee4a18bc05..976298a3d46 100644 --- a/cargo-registry-index/lib.rs +++ b/cargo-registry-index/lib.rs @@ -524,7 +524,12 @@ impl Repository { let output = command.output()?; if !output.status.success() { let stderr = String::from_utf8_lossy(&output.stderr); - return Err(anyhow!("Running git command failed with: {}", stderr)); + let stdout = String::from_utf8_lossy(&output.stdout); + return Err(anyhow!( + "Running git command failed with: {}{}", + stderr, + stdout + )); } Ok(()) From a987a3540aef661c83da33519f99c1247b78be09 Mon Sep 17 00:00:00 2001 From: Arlo Siemsen Date: Tue, 29 Nov 2022 16:48:19 +0100 Subject: [PATCH 2/8] index: Skip `links: null` serialization --- cargo-registry-index/lib.rs | 2 +- .../krate_publish_features_version_2.json | 4 +- .../http-data/krate_publish_good_badges.json | 4 +- .../krate_publish_good_categories.json | 4 +- .../krate_publish_good_keywords.json | 4 +- .../krate_publish_ignored_badges.json | 4 +- .../krate_publish_ignored_categories.json | 4 +- ...empty_alternative_registry_dependency.json | 4 +- .../http-data/krate_publish_new_krate.json | 4 +- .../krate_publish_new_krate_git_upload.json | 4 +- ..._publish_new_krate_git_upload_appends.json | 8 ++-- ...h_new_krate_git_upload_with_conflicts.json | 4 +- ...lish_new_krate_records_verified_email.json | 4 +- ...ish_new_krate_too_big_but_whitelisted.json | 4 +- .../krate_publish_new_krate_twice.json | 4 +- ...krate_publish_new_krate_weird_version.json | 4 +- ...ate_publish_new_krate_with_dependency.json | 4 +- .../krate_publish_new_krate_with_readme.json | 4 +- .../krate_publish_new_krate_with_token.json | 4 +- ...e_publish_new_with_renamed_dependency.json | 4 +- ...ew_with_underscore_renamed_dependency.json | 4 +- ..._publish_after_removing_documentation.json | 8 ++-- ...ublish_publish_new_crate_rate_limited.json | 8 ++-- ...e_limit_doesnt_affect_existing_crates.json | 8 ++-- ...blish_publish_records_an_audit_action.json | 4 +- ...h_uploading_new_version_touches_crate.json | 8 ++-- ...anking_publish_after_yank_max_version.json | 16 ++++---- .../krate_yanking_yank_max_version.json | 32 +++++++-------- .../krate_yanking_yank_works_as_intended.json | 20 +++++----- .../http-data/owners_new_crate_owner.json | 8 ++-- .../routes_crates_new_daily_limit.json | 40 +++++++++---------- .../routes_crates_read_version_size.json | 8 ++-- ...versions_yank_unyank_auth_cookie_user.json | 12 +++--- ..._versions_yank_unyank_auth_token_user.json | 12 +++--- ...h_token_user_with_correct_crate_scope.json | 12 +++--- ...oken_user_with_correct_endpoint_scope.json | 12 +++--- ...ser_with_correct_wildcard_crate_scope.json | 12 +++--- ...token_user_with_incorrect_crate_scope.json | 4 +- ...en_user_with_incorrect_endpoint_scope.json | 4 +- ...r_with_incorrect_wildcard_crate_scope.json | 4 +- ...ions_yank_unyank_auth_unauthenticated.json | 4 +- ...unyank_unyank_records_an_audit_action.json | 12 +++--- ...k_unyank_yank_records_an_audit_action.json | 8 ++-- src/tests/http-data/team_publish_owned.json | 4 +- 44 files changed, 173 insertions(+), 173 deletions(-) diff --git a/cargo-registry-index/lib.rs b/cargo-registry-index/lib.rs index 976298a3d46..f412f490dd5 100644 --- a/cargo-registry-index/lib.rs +++ b/cargo-registry-index/lib.rs @@ -116,7 +116,7 @@ pub struct Crate { #[serde(skip_serializing_if = "Option::is_none")] pub features2: Option>>, pub yanked: Option, - #[serde(default)] + #[serde(skip_serializing_if = "Option::is_none")] pub links: Option, /// The schema version for this entry. /// diff --git a/src/tests/http-data/krate_publish_features_version_2.json b/src/tests/http-data/krate_publish_features_version_2.json index 4d8e22d28e0..ddc51538c4a 100644 --- a/src/tests/http-data/krate_publish_features_version_2.json +++ b/src/tests/http-data/krate_publish_features_version_2.json @@ -44,14 +44,14 @@ ], [ "content-length", - "336" + "323" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImJhciIsInJlcSI6Ij4gMCIsImZlYXR1cmVzIjpbXSwib3B0aW9uYWwiOmZhbHNlLCJkZWZhdWx0X2ZlYXR1cmVzIjp0cnVlLCJ0YXJnZXQiOm51bGwsImtpbmQiOiJub3JtYWwifV0sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7Im9sZF9mZWF0IjpbXX0sImZlYXR1cmVzMiI6eyJuZXdfZmVhdCI6WyJkZXA6YmFyIiwiYmFyPy9mZWF0Il19LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbCwidiI6Mn0K" + "body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImJhciIsInJlcSI6Ij4gMCIsImZlYXR1cmVzIjpbXSwib3B0aW9uYWwiOmZhbHNlLCJkZWZhdWx0X2ZlYXR1cmVzIjp0cnVlLCJ0YXJnZXQiOm51bGwsImtpbmQiOiJub3JtYWwifV0sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7Im9sZF9mZWF0IjpbXX0sImZlYXR1cmVzMiI6eyJuZXdfZmVhdCI6WyJkZXA6YmFyIiwiYmFyPy9mZWF0Il19LCJ5YW5rZWQiOmZhbHNlLCJ2IjoyfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_good_badges.json b/src/tests/http-data/krate_publish_good_badges.json index e1d83743689..22eb3bd3355 100644 --- a/src/tests/http-data/krate_publish_good_badges.json +++ b/src/tests/http-data/krate_publish_good_badges.json @@ -44,14 +44,14 @@ ], [ "content-length", - "163" + "150" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vYmFkZ2VyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vYmFkZ2VyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_good_categories.json b/src/tests/http-data/krate_publish_good_categories.json index 241ccf16fbe..232a5bbd0f9 100644 --- a/src/tests/http-data/krate_publish_good_categories.json +++ b/src/tests/http-data/krate_publish_good_categories.json @@ -44,14 +44,14 @@ ], [ "content-length", - "166" + "153" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2dvb2RfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX2dvb2RfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_good_keywords.json b/src/tests/http-data/krate_publish_good_keywords.json index 96375065311..5d1fdf571b2 100644 --- a/src/tests/http-data/krate_publish_good_keywords.json +++ b/src/tests/http-data/krate_publish_good_keywords.json @@ -44,14 +44,14 @@ ], [ "content-length", - "166" + "153" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2dvb2Rfa2V5IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX2dvb2Rfa2V5IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_ignored_badges.json b/src/tests/http-data/krate_publish_ignored_badges.json index f0af2aa98de..b3db945d73f 100644 --- a/src/tests/http-data/krate_publish_ignored_badges.json +++ b/src/tests/http-data/krate_publish_ignored_badges.json @@ -44,14 +44,14 @@ ], [ "content-length", - "171" + "158" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfYmFkZ2UiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfYmFkZ2UiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_ignored_categories.json b/src/tests/http-data/krate_publish_ignored_categories.json index 5ba811a5da8..698d904b08a 100644 --- a/src/tests/http-data/krate_publish_ignored_categories.json +++ b/src/tests/http-data/krate_publish_ignored_categories.json @@ -44,14 +44,14 @@ ], [ "content-length", - "169" + "156" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX2lnbm9yZWRfY2F0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_crate_allow_empty_alternative_registry_dependency.json b/src/tests/http-data/krate_publish_new_crate_allow_empty_alternative_registry_dependency.json index 79313755552..3983294bf4d 100644 --- a/src/tests/http-data/krate_publish_new_crate_allow_empty_alternative_registry_dependency.json +++ b/src/tests/http-data/krate_publish_new_crate_allow_empty_alternative_registry_dependency.json @@ -44,14 +44,14 @@ ], [ "content-length", - "272" + "259" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImZvby1kZXAiLCJyZXEiOiI+IDAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6ImZvby1kZXAiLCJyZXEiOiI+IDAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate.json b/src/tests/http-data/krate_publish_new_krate.json index cdff594a945..2a4789a6ff4 100644 --- a/src/tests/http-data/krate_publish_new_krate.json +++ b/src/tests/http-data/krate_publish_new_krate.json @@ -44,14 +44,14 @@ ], [ "content-length", - "161" + "148" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX25ldyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX25ldyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_git_upload.json b/src/tests/http-data/krate_publish_new_krate_git_upload.json index e9efb8f69e5..d242c05ad7b 100644 --- a/src/tests/http-data/krate_publish_new_krate_git_upload.json +++ b/src/tests/http-data/krate_publish_new_krate_git_upload.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZmd0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZmd0IiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_git_upload_appends.json b/src/tests/http-data/krate_publish_new_krate_git_upload_appends.json index e885bd66686..791ab62ce50 100644 --- a/src/tests/http-data/krate_publish_new_krate_git_upload_appends.json +++ b/src/tests/http-data/krate_publish_new_krate_git_upload_appends.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "314" + "288" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6IkZQUCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiRlBQIiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiRlBQIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_git_upload_with_conflicts.json b/src/tests/http-data/krate_publish_new_krate_git_upload_with_conflicts.json index b025c28b0b2..9601df2e93e 100644 --- a/src/tests/http-data/krate_publish_new_krate_git_upload_with_conflicts.json +++ b/src/tests/http-data/krate_publish_new_krate_git_upload_with_conflicts.json @@ -44,14 +44,14 @@ ], [ "content-length", - "167" + "154" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2NvbmZsaWN0cyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX2NvbmZsaWN0cyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_records_verified_email.json b/src/tests/http-data/krate_publish_new_krate_records_verified_email.json index a3ac677a9f5..bc35748174e 100644 --- a/src/tests/http-data/krate_publish_new_krate_records_verified_email.json +++ b/src/tests/http-data/krate_publish_new_krate_records_verified_email.json @@ -44,14 +44,14 @@ ], [ "content-length", - "172" + "159" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3ZlcmlmaWVkX2VtYWlsIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX3ZlcmlmaWVkX2VtYWlsIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_too_big_but_whitelisted.json b/src/tests/http-data/krate_publish_new_krate_too_big_but_whitelisted.json index 094bb88d495..85f37a406c5 100644 --- a/src/tests/http-data/krate_publish_new_krate_too_big_but_whitelisted.json +++ b/src/tests/http-data/krate_publish_new_krate_too_big_but_whitelisted.json @@ -44,14 +44,14 @@ ], [ "content-length", - "167" + "154" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3doaXRlbGlzdCIsInZlcnMiOiIxLjEuMCIsImRlcHMiOltdLCJja3N1bSI6IjRlMzNkYzU5YmJiYzk2NjQ1ZmMwMTk0NWZiNTAyNTA3ZDFiN2JkM2EyZDA2MjI3YmY3YjBmZTg4NDJmMjg0YzIiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX3doaXRlbGlzdCIsInZlcnMiOiIxLjEuMCIsImRlcHMiOltdLCJja3N1bSI6IjRlMzNkYzU5YmJiYzk2NjQ1ZmMwMTk0NWZiNTAyNTA3ZDFiN2JkM2EyZDA2MjI3YmY3YjBmZTg4NDJmMjg0YzIiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_twice.json b/src/tests/http-data/krate_publish_new_krate_twice.json index b8ded4fbd5f..032aa4fa868 100644 --- a/src/tests/http-data/krate_publish_new_krate_twice.json +++ b/src/tests/http-data/krate_publish_new_krate_twice.json @@ -44,14 +44,14 @@ ], [ "content-length", - "163" + "150" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3R3aWNlIiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX3R3aWNlIiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_weird_version.json b/src/tests/http-data/krate_publish_new_krate_weird_version.json index 28ed438d47e..4c57ae6c650 100644 --- a/src/tests/http-data/krate_publish_new_krate_weird_version.json +++ b/src/tests/http-data/krate_publish_new_krate_weird_version.json @@ -44,14 +44,14 @@ ], [ "content-length", - "167" + "154" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3dlaXJkIiwidmVycyI6IjAuMC4wLXByZSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX3dlaXJkIiwidmVycyI6IjAuMC4wLXByZSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_with_dependency.json b/src/tests/http-data/krate_publish_new_krate_with_dependency.json index 15efd59f4f1..fb9babc9ee1 100644 --- a/src/tests/http-data/krate_publish_new_krate_with_dependency.json +++ b/src/tests/http-data/krate_publish_new_krate_with_dependency.json @@ -44,14 +44,14 @@ ], [ "content-length", - "278" + "265" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoibmV3X2RlcCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOlt7Im5hbWUiOiJmb28tZGVwIiwicmVxIjoiMS4wLjAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoibmV3X2RlcCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOlt7Im5hbWUiOiJmb28tZGVwIiwicmVxIjoiMS4wLjAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIn1dLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_with_readme.json b/src/tests/http-data/krate_publish_new_krate_with_readme.json index 22488cb8c79..c7be47716b1 100644 --- a/src/tests/http-data/krate_publish_new_krate_with_readme.json +++ b/src/tests/http-data/krate_publish_new_krate_with_readme.json @@ -74,14 +74,14 @@ ], [ "content-length", - "164" + "151" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3JlYWRtZSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX3JlYWRtZSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_krate_with_token.json b/src/tests/http-data/krate_publish_new_krate_with_token.json index cdff594a945..2a4789a6ff4 100644 --- a/src/tests/http-data/krate_publish_new_krate_with_token.json +++ b/src/tests/http-data/krate_publish_new_krate_with_token.json @@ -44,14 +44,14 @@ ], [ "content-length", - "161" + "148" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX25ldyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX25ldyIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_with_renamed_dependency.json b/src/tests/http-data/krate_publish_new_with_renamed_dependency.json index 17f1726e382..b9732e0956f 100644 --- a/src/tests/http-data/krate_publish_new_with_renamed_dependency.json +++ b/src/tests/http-data/krate_publish_new_with_renamed_dependency.json @@ -44,14 +44,14 @@ ], [ "content-length", - "303" + "290" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoibmV3LWtyYXRlIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6Im15LW5hbWUiLCJyZXEiOiI+IDAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIiwicGFja2FnZSI6InBhY2thZ2UtbmFtZSJ9XSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoibmV3LWtyYXRlIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6Im15LW5hbWUiLCJyZXEiOiI+IDAiLCJmZWF0dXJlcyI6W10sIm9wdGlvbmFsIjpmYWxzZSwiZGVmYXVsdF9mZWF0dXJlcyI6dHJ1ZSwidGFyZ2V0IjpudWxsLCJraW5kIjoibm9ybWFsIiwicGFja2FnZSI6InBhY2thZ2UtbmFtZSJ9XSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_new_with_underscore_renamed_dependency.json b/src/tests/http-data/krate_publish_new_with_underscore_renamed_dependency.json index fe476dda7bf..936acd27923 100644 --- a/src/tests/http-data/krate_publish_new_with_underscore_renamed_dependency.json +++ b/src/tests/http-data/krate_publish_new_with_underscore_renamed_dependency.json @@ -44,14 +44,14 @@ ], [ "content-length", - "304" + "291" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoibmV3LWtyYXRlIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6Il9teS1uYW1lIiwicmVxIjoiPiAwIiwiZmVhdHVyZXMiOltdLCJvcHRpb25hbCI6ZmFsc2UsImRlZmF1bHRfZmVhdHVyZXMiOnRydWUsInRhcmdldCI6bnVsbCwia2luZCI6Im5vcm1hbCIsInBhY2thZ2UiOiJwYWNrYWdlLW5hbWUifV0sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoibmV3LWtyYXRlIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W3sibmFtZSI6Il9teS1uYW1lIiwicmVxIjoiPiAwIiwiZmVhdHVyZXMiOltdLCJvcHRpb25hbCI6ZmFsc2UsImRlZmF1bHRfZmVhdHVyZXMiOnRydWUsInRhcmdldCI6bnVsbCwia2luZCI6Im5vcm1hbCIsInBhY2thZ2UiOiJwYWNrYWdlLW5hbWUifV0sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_publish_after_removing_documentation.json b/src/tests/http-data/krate_publish_publish_after_removing_documentation.json index 60b6aeee70c..d5c2d6ee7e1 100644 --- a/src/tests/http-data/krate_publish_publish_after_removing_documentation.json +++ b/src/tests/http-data/krate_publish_publish_after_removing_documentation.json @@ -44,14 +44,14 @@ ], [ "content-length", - "163" + "150" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZG9jc2NyYXRlIiwidmVycyI6IjAuMi4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZG9jc2NyYXRlIiwidmVycyI6IjAuMi4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "326" + "300" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZG9jc2NyYXRlIiwidmVycyI6IjAuMi4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImRvY3NjcmF0ZSIsInZlcnMiOiIwLjIuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZG9jc2NyYXRlIiwidmVycyI6IjAuMi4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZG9jc2NyYXRlIiwidmVycyI6IjAuMi4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_publish_new_crate_rate_limited.json b/src/tests/http-data/krate_publish_publish_new_crate_rate_limited.json index 1e57626d8a9..d15e43f399f 100644 --- a/src/tests/http-data/krate_publish_publish_new_crate_rate_limited.json +++ b/src/tests/http-data/krate_publish_publish_new_crate_rate_limited.json @@ -44,14 +44,14 @@ ], [ "content-length", - "167" + "154" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "167" + "154" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMiIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMiIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_publish_rate_limit_doesnt_affect_existing_crates.json b/src/tests/http-data/krate_publish_publish_rate_limit_doesnt_affect_existing_crates.json index a8b3027b456..7ebc0a26357 100644 --- a/src/tests/http-data/krate_publish_publish_rate_limit_doesnt_affect_existing_crates.json +++ b/src/tests/http-data/krate_publish_publish_rate_limit_doesnt_affect_existing_crates.json @@ -44,14 +44,14 @@ ], [ "content-length", - "167" + "154" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "334" + "308" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJyYXRlX2xpbWl0ZWQxIiwidmVycyI6IjEuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoicmF0ZV9saW1pdGVkMSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6InJhdGVfbGltaXRlZDEiLCJ2ZXJzIjoiMS4wLjEiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_publish_records_an_audit_action.json b/src/tests/http-data/krate_publish_publish_records_an_audit_action.json index 8c9445c2f5a..fdb1ef2adec 100644 --- a/src/tests/http-data/krate_publish_publish_records_an_audit_action.json +++ b/src/tests/http-data/krate_publish_publish_records_an_audit_action.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_publish_uploading_new_version_touches_crate.json b/src/tests/http-data/krate_publish_uploading_new_version_touches_crate.json index f1df54f9953..474aa7fc8a8 100644 --- a/src/tests/http-data/krate_publish_uploading_new_version_touches_crate.json +++ b/src/tests/http-data/krate_publish_uploading_new_version_touches_crate.json @@ -44,14 +44,14 @@ ], [ "content-length", - "177" + "164" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25zX3VwZGF0ZWRfYXQiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25zX3VwZGF0ZWRfYXQiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "354" + "328" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25zX3VwZGF0ZWRfYXQiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX3ZlcnNpb25zX3VwZGF0ZWRfYXQiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25zX3VwZGF0ZWRfYXQiLCJ2ZXJzIjoiMS4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQp7Im5hbWUiOiJmb29fdmVyc2lvbnNfdXBkYXRlZF9hdCIsInZlcnMiOiIyLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_yanking_publish_after_yank_max_version.json b/src/tests/http-data/krate_yanking_publish_after_yank_max_version.json index 4630205fe25..d490d17f786 100644 --- a/src/tests/http-data/krate_yanking_publish_after_yank_max_version.json +++ b/src/tests/http-data/krate_yanking_publish_after_yank_max_version.json @@ -44,14 +44,14 @@ ], [ "content-length", - "161" + "148" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "160" + "147" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZX0K" }, "response": { "status": 200, @@ -134,14 +134,14 @@ ], [ "content-length", - "321" + "295" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZX0KeyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIyLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -164,14 +164,14 @@ ], [ "content-length", - "322" + "296" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmeWtfbWF4IiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_yanking_yank_max_version.json b/src/tests/http-data/krate_yanking_yank_max_version.json index c98d087caf1..b72bc8ff8fe 100644 --- a/src/tests/http-data/krate_yanking_yank_max_version.json +++ b/src/tests/http-data/krate_yanking_yank_max_version.json @@ -44,14 +44,14 @@ ], [ "content-length", - "161" + "148" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "322" + "296" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmeWtfbWF4IiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, @@ -134,14 +134,14 @@ ], [ "content-length", - "321" + "295" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZX0KeyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIyLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -164,14 +164,14 @@ ], [ "content-length", - "322" + "296" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmeWtfbWF4IiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, @@ -194,14 +194,14 @@ ], [ "content-length", - "321" + "295" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmeWtfbWF4IiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOnRydWV9Cg==" }, "response": { "status": 200, @@ -224,14 +224,14 @@ ], [ "content-length", - "320" + "294" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOnRydWUsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZX0KeyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIyLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZX0K" }, "response": { "status": 200, @@ -254,14 +254,14 @@ ], [ "content-length", - "321" + "295" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6dHJ1ZX0KeyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIyLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -284,14 +284,14 @@ ], [ "content-length", - "322" + "296" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmeWtfbWF4IiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrX21heCIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6ImZ5a19tYXgiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/krate_yanking_yank_works_as_intended.json b/src/tests/http-data/krate_yanking_yank_works_as_intended.json index 8e399692734..0944723a783 100644 --- a/src/tests/http-data/krate_yanking_yank_works_as_intended.json +++ b/src/tests/http-data/krate_yanking_yank_works_as_intended.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -134,14 +134,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -164,14 +164,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/owners_new_crate_owner.json b/src/tests/http-data/owners_new_crate_owner.json index f01c11cdd54..1007a7421e3 100644 --- a/src/tests/http-data/owners_new_crate_owner.json +++ b/src/tests/http-data/owners_new_crate_owner.json @@ -44,14 +44,14 @@ ], [ "content-length", - "163" + "150" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX293bmVyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX293bmVyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "326" + "300" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX293bmVyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19vd25lciIsInZlcnMiOiIyLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX293bmVyIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX293bmVyIiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_new_daily_limit.json b/src/tests/http-data/routes_crates_new_daily_limit.json index 4eb24cc67f7..0c96c82fa63 100644 --- a/src/tests/http-data/routes_crates_new_daily_limit.json +++ b/src/tests/http-data/routes_crates_new_daily_limit.json @@ -44,14 +44,14 @@ ], [ "content-length", - "169" + "156" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "338" + "312" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -164,14 +164,14 @@ ], [ "content-length", - "507" + "468" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -224,14 +224,14 @@ ], [ "content-length", - "676" + "624" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -284,14 +284,14 @@ ], [ "content-length", - "845" + "780" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuNSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC41IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -344,14 +344,14 @@ ], [ "content-length", - "1014" + "936" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuNSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjYiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC41IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC42IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -404,14 +404,14 @@ ], [ "content-length", - "1183" + "1092" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuNSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjYiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC41IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC42IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -464,14 +464,14 @@ ], [ "content-length", - "1352" + "1248" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuNSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjYiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuOCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC41IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC42IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC44IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -524,14 +524,14 @@ ], [ "content-length", - "1521" + "1404" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuNSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjYiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuOCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjkiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC41IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC42IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC44IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC45IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -584,14 +584,14 @@ ], [ "content-length", - "1691" + "1561" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuMiIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjMiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuNSIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjYiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9CnsibmFtZSI6ImZvb19kYWlseV9saW1pdCIsInZlcnMiOiIwLjAuOCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fZGFpbHlfbGltaXQiLCJ2ZXJzIjoiMC4wLjkiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4yIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4zIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC40IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC41IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC42IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC43IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC44IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC45IiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0KeyJuYW1lIjoiZm9vX2RhaWx5X2xpbWl0IiwidmVycyI6IjAuMC4xMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_read_version_size.json b/src/tests/http-data/routes_crates_read_version_size.json index 420076eb820..e61f6d7dff9 100644 --- a/src/tests/http-data/routes_crates_read_version_size.json +++ b/src/tests/http-data/routes_crates_read_version_size.json @@ -44,14 +44,14 @@ ], [ "content-length", - "170" + "157" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25fc2l6ZSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQo=" + "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25fc2l6ZSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9Cg==" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "340" + "314" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25fc2l6ZSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2UsImxpbmtzIjpudWxsfQp7Im5hbWUiOiJmb29fdmVyc2lvbl9zaXplIiwidmVycyI6IjIuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiNzUyMmRkNjFiZGRmZDM1MDFiYTQ4YWY4YmFiY2ZmZDJjODkwOTE5ZGE5MGM4NWI2ZWFhZjdmZDk0NzlmOTAxYSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZm9vX3ZlcnNpb25fc2l6ZSIsInZlcnMiOiIxLjAuMCIsImRlcHMiOltdLCJja3N1bSI6ImFjYjU2MDRiMTI2YWM4OTRjMWViMTFjNDU3NWJmMjA3MmZlYTYxMjMyYTg4OGU0NTM3NzBjNzlkN2VkNTY0MTkiLCJmZWF0dXJlcyI6e30sInlhbmtlZCI6ZmFsc2V9CnsibmFtZSI6ImZvb192ZXJzaW9uX3NpemUiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiI3NTIyZGQ2MWJkZGZkMzUwMWJhNDhhZjhiYWJjZmZkMmM4OTA5MTlkYTkwYzg1YjZlYWFmN2ZkOTQ3OWY5MDFhIiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_cookie_user.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_cookie_user.json index 2a4ad0e250e..5f02066b2eb 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_cookie_user.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_cookie_user.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user.json index 2a4ad0e250e..5f02066b2eb 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_crate_scope.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_crate_scope.json index 95ea6e6e88e..70ce66f8ed8 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_crate_scope.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_crate_scope.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_endpoint_scope.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_endpoint_scope.json index 95ea6e6e88e..70ce66f8ed8 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_endpoint_scope.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_endpoint_scope.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_wildcard_crate_scope.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_wildcard_crate_scope.json index 95ea6e6e88e..70ce66f8ed8 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_wildcard_crate_scope.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_correct_wildcard_crate_scope.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_crate_scope.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_crate_scope.json index 8c9445c2f5a..fdb1ef2adec 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_crate_scope.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_crate_scope.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_endpoint_scope.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_endpoint_scope.json index 8c9445c2f5a..fdb1ef2adec 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_endpoint_scope.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_endpoint_scope.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_wildcard_crate_scope.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_wildcard_crate_scope.json index 8c9445c2f5a..fdb1ef2adec 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_wildcard_crate_scope.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_token_user_with_incorrect_wildcard_crate_scope.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_unauthenticated.json b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_unauthenticated.json index 8c9445c2f5a..fdb1ef2adec 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_auth_unauthenticated.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_auth_unauthenticated.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_unyank_records_an_audit_action.json b/src/tests/http-data/routes_crates_versions_yank_unyank_unyank_records_an_audit_action.json index 2a4ad0e250e..5f02066b2eb 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_unyank_records_an_audit_action.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_unyank_records_an_audit_action.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, @@ -104,14 +104,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, diff --git a/src/tests/http-data/routes_crates_versions_yank_unyank_yank_records_an_audit_action.json b/src/tests/http-data/routes_crates_versions_yank_unyank_yank_records_an_audit_action.json index 0ddb0522c1b..3aa4c9e3a7d 100644 --- a/src/tests/http-data/routes_crates_versions_yank_unyank_yank_records_an_audit_action.json +++ b/src/tests/http-data/routes_crates_versions_yank_unyank_yank_records_an_audit_action.json @@ -44,14 +44,14 @@ ], [ "content-length", - "157" + "144" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZSwibGlua3MiOm51bGx9Cg==" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjpmYWxzZX0K" }, "response": { "status": 200, @@ -74,14 +74,14 @@ ], [ "content-length", - "156" + "143" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZnlrIiwidmVycyI6IjEuMC4wIiwiZGVwcyI6W10sImNrc3VtIjoiYWNiNTYwNGIxMjZhYzg5NGMxZWIxMWM0NTc1YmYyMDcyZmVhNjEyMzJhODg4ZTQ1Mzc3MGM3OWQ3ZWQ1NjQxOSIsImZlYXR1cmVzIjp7fSwieWFua2VkIjp0cnVlfQo=" }, "response": { "status": 200, diff --git a/src/tests/http-data/team_publish_owned.json b/src/tests/http-data/team_publish_owned.json index 57411f75f31..e513a688350 100644 --- a/src/tests/http-data/team_publish_owned.json +++ b/src/tests/http-data/team_publish_owned.json @@ -44,14 +44,14 @@ ], [ "content-length", - "168" + "155" ], [ "content-type", "text/plain" ] ], - "body": "eyJuYW1lIjoiZm9vX3RlYW1fb3duZWQiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlLCJsaW5rcyI6bnVsbH0K" + "body": "eyJuYW1lIjoiZm9vX3RlYW1fb3duZWQiLCJ2ZXJzIjoiMi4wLjAiLCJkZXBzIjpbXSwiY2tzdW0iOiJhY2I1NjA0YjEyNmFjODk0YzFlYjExYzQ1NzViZjIwNzJmZWE2MTIzMmE4ODhlNDUzNzcwYzc5ZDdlZDU2NDE5IiwiZmVhdHVyZXMiOnt9LCJ5YW5rZWQiOmZhbHNlfQo=" }, "response": { "status": 200, From 0df7657e383a50c264573d12f5bd6593cebb2714 Mon Sep 17 00:00:00 2001 From: Arlo Siemsen Date: Tue, 29 Nov 2022 09:48:19 -0600 Subject: [PATCH 3/8] Add normalize-index admin command Re-generates the git index by reading existing files, normalizing them and writing them back out again. Does not use the database. --- src/admin/mod.rs | 1 + src/admin/normalize_index.rs | 102 +++++++++++++++++++++++++++++++++++ src/bin/crates-admin.rs | 6 ++- 3 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 src/admin/normalize_index.rs diff --git a/src/admin/mod.rs b/src/admin/mod.rs index 089218d01dd..7a508b6c492 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -4,6 +4,7 @@ pub mod dialoguer; pub mod enqueue_job; pub mod git_import; pub mod migrate; +pub mod normalize_index; pub mod on_call; pub mod populate; pub mod render_readmes; diff --git a/src/admin/normalize_index.rs b/src/admin/normalize_index.rs new file mode 100644 index 00000000000..ff715454ce5 --- /dev/null +++ b/src/admin/normalize_index.rs @@ -0,0 +1,102 @@ +use std::{ + fs::File, + io::{BufRead, BufReader}, + process::Command, +}; + +use cargo_registry_index::{Repository, RepositoryConfig}; +use chrono::Utc; +use indicatif::{ProgressBar, ProgressIterator, ProgressStyle}; + +use crate::admin::dialoguer; + +#[derive(clap::Parser, Debug, Copy, Clone)] +#[clap(name = "normalize-index", about = "Normalize and squash the git index")] +pub struct Opts {} + +pub fn run(_opts: Opts) -> anyhow::Result<()> { + println!("fetching git repo"); + let config = RepositoryConfig::from_environment(); + let repo = Repository::open(&config)?; + + repo.reset_head()?; + println!("please place site in read-only mode now to prevent further commits"); + if !dialoguer::confirm("continue?") { + return Ok(()); + } + repo.reset_head()?; + println!("HEAD is at {}", repo.head_oid()?); + + let files = repo.get_files_modified_since(None)?; + println!("found {} crates", files.len()); + let pb = ProgressBar::new(files.len() as u64); + pb.set_style(ProgressStyle::with_template("{bar:60} ({pos}/{len}, ETA {eta})").unwrap()); + + for file in files.iter().progress_with(pb) { + let crate_name = file.file_name().unwrap().to_str().unwrap(); + let path = repo.index_file(crate_name); + if !path.exists() { + continue; + } + + let mut body: Vec = Vec::new(); + let file = File::open(&path)?; + let reader = BufReader::new(file); + let mut versions = Vec::new(); + for line in reader.lines() { + let mut krate: cargo_registry_index::Crate = serde_json::from_str(&line?)?; + for dep in &mut krate.deps { + // Remove deps with empty features + dep.features.retain(|d| !d.is_empty()); + // Set null DependencyKind to Normal + dep.kind = Some( + dep.kind + .unwrap_or(cargo_registry_index::DependencyKind::Normal), + ); + } + krate.deps.sort(); + versions.push(krate); + } + versions.sort_by_cached_key(|version| semver::Version::parse(&version.vers).ok()); + for version in versions { + serde_json::to_writer(&mut body, &version).unwrap(); + body.push(b'\n'); + } + std::fs::write(path, body)?; + } + + let original_head = repo.head_oid()?.to_string(); + + // Add an additional commit after the squash commit that normalizes the index. + println!("committing normalization"); + let msg = "Normalize index format\n\n\ + More information can be found at https://github.com/rust-lang/crates.io/pull/5066"; + repo.run_command(Command::new("git").args(["commit", "-am", msg]))?; + let snapshot_head = repo.head_oid()?.to_string(); + + println!("squashing"); + let now = Utc::now().format("%Y-%m-%d"); + let msg = format!("Collapse index into one commit\n\n\ + Previous HEAD was {}, now on the `snapshot-{}` branch\n\n\ + More information about this change can be found [online] and on [this issue].\n\n\ + [online]: https://internals.rust-lang.org/t/cargos-crate-index-upcoming-squash-into-one-commit/8440\n\ + [this issue]: https://github.com/rust-lang/crates-io-cargo-teams/issues/47", snapshot_head, now); + repo.squash_to_single_commit(&msg)?; + + if dialoguer::confirm("push to origin?") { + repo.run_command(Command::new("git").args([ + "push", + // Both updates should succeed or fail together + "--atomic", + "origin", + // Overwrite master, but only if it server matches the expected value + &format!("--force-with-lease=refs/heads/master:{original_head}"), + // The new squashed commit is pushed to master + "HEAD:refs/heads/master", + // The previous value of HEAD is pushed to a snapshot branch + &format!("{snapshot_head}:refs/heads/snapshot-{now}"), + ]))?; + println!("The index has been successfully normalized and squashed."); + } + Ok(()) +} diff --git a/src/bin/crates-admin.rs b/src/bin/crates-admin.rs index 9c124e63125..c26d8f2ff9f 100644 --- a/src/bin/crates-admin.rs +++ b/src/bin/crates-admin.rs @@ -1,8 +1,8 @@ #![warn(clippy::all, rust_2018_idioms)] use cargo_registry::admin::{ - delete_crate, delete_version, enqueue_job, git_import, migrate, populate, render_readmes, - test_pagerduty, transfer_crates, upload_index, verify_token, yank_version, + delete_crate, delete_version, enqueue_job, git_import, migrate, normalize_index, populate, + render_readmes, test_pagerduty, transfer_crates, upload_index, verify_token, yank_version, }; #[derive(clap::Parser, Debug)] @@ -21,6 +21,7 @@ enum Command { GitImport(git_import::Opts), #[clap(subcommand)] EnqueueJob(enqueue_job::Command), + NormalizeIndex(normalize_index::Opts), } fn main() -> anyhow::Result<()> { @@ -46,6 +47,7 @@ fn main() -> anyhow::Result<()> { Command::YankVersion(opts) => yank_version::run(opts), Command::GitImport(opts) => git_import::run(opts)?, Command::EnqueueJob(command) => enqueue_job::run(command)?, + Command::NormalizeIndex(opts) => normalize_index::run(opts)?, } Ok(()) From 0b457b0f1cde9b30615ddd5e52824c64651d8950 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 31 Dec 2022 13:12:06 +0100 Subject: [PATCH 4/8] admin/normalize-index: Remove semver sorting Let's keep the current insertion time order for now. --- src/admin/normalize_index.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/admin/normalize_index.rs b/src/admin/normalize_index.rs index ff715454ce5..11b9e3a0f5e 100644 --- a/src/admin/normalize_index.rs +++ b/src/admin/normalize_index.rs @@ -57,7 +57,6 @@ pub fn run(_opts: Opts) -> anyhow::Result<()> { krate.deps.sort(); versions.push(krate); } - versions.sort_by_cached_key(|version| semver::Version::parse(&version.vers).ok()); for version in versions { serde_json::to_writer(&mut body, &version).unwrap(); body.push(b'\n'); From d69508607abeb28ead8305e72a5322111000ed23 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 31 Dec 2022 13:16:21 +0100 Subject: [PATCH 5/8] admin/normalize-index: Remove index squashing code --- src/admin/normalize_index.rs | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/admin/normalize_index.rs b/src/admin/normalize_index.rs index 11b9e3a0f5e..254e7aa64b3 100644 --- a/src/admin/normalize_index.rs +++ b/src/admin/normalize_index.rs @@ -5,7 +5,6 @@ use std::{ }; use cargo_registry_index::{Repository, RepositoryConfig}; -use chrono::Utc; use indicatif::{ProgressBar, ProgressIterator, ProgressStyle}; use crate::admin::dialoguer; @@ -64,38 +63,14 @@ pub fn run(_opts: Opts) -> anyhow::Result<()> { std::fs::write(path, body)?; } - let original_head = repo.head_oid()?.to_string(); - - // Add an additional commit after the squash commit that normalizes the index. println!("committing normalization"); let msg = "Normalize index format\n\n\ More information can be found at https://github.com/rust-lang/crates.io/pull/5066"; repo.run_command(Command::new("git").args(["commit", "-am", msg]))?; - let snapshot_head = repo.head_oid()?.to_string(); - - println!("squashing"); - let now = Utc::now().format("%Y-%m-%d"); - let msg = format!("Collapse index into one commit\n\n\ - Previous HEAD was {}, now on the `snapshot-{}` branch\n\n\ - More information about this change can be found [online] and on [this issue].\n\n\ - [online]: https://internals.rust-lang.org/t/cargos-crate-index-upcoming-squash-into-one-commit/8440\n\ - [this issue]: https://github.com/rust-lang/crates-io-cargo-teams/issues/47", snapshot_head, now); - repo.squash_to_single_commit(&msg)?; if dialoguer::confirm("push to origin?") { - repo.run_command(Command::new("git").args([ - "push", - // Both updates should succeed or fail together - "--atomic", - "origin", - // Overwrite master, but only if it server matches the expected value - &format!("--force-with-lease=refs/heads/master:{original_head}"), - // The new squashed commit is pushed to master - "HEAD:refs/heads/master", - // The previous value of HEAD is pushed to a snapshot branch - &format!("{snapshot_head}:refs/heads/snapshot-{now}"), - ]))?; - println!("The index has been successfully normalized and squashed."); + repo.run_command(Command::new("git").args(["push", "origin"]))?; + println!("The index has been successfully normalized."); } Ok(()) } From 01af811326ad6b7857eb9115f0e7d274a50b4be9 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 31 Dec 2022 14:39:02 +0100 Subject: [PATCH 6/8] worker: Add `NormalizeIndex` background job --- src/background_jobs.rs | 11 ++++++ src/worker/git.rs | 77 +++++++++++++++++++++++++++++++++++++++++- src/worker/mod.rs | 4 +-- 3 files changed, 89 insertions(+), 3 deletions(-) diff --git a/src/background_jobs.rs b/src/background_jobs.rs index 86d1ed05a9b..f3c881ae89c 100644 --- a/src/background_jobs.rs +++ b/src/background_jobs.rs @@ -18,6 +18,7 @@ pub enum Job { IndexSquash(IndexSquashJob), IndexSyncToHttp(IndexSyncToHttpJob), IndexUpdateYanked(IndexUpdateYankedJob), + NormalizeIndex(NormalizeIndexJob), RenderAndUploadReadme(RenderAndUploadReadmeJob), UpdateDownloads(UpdateDownloadsJob), } @@ -29,6 +30,7 @@ impl Job { const INDEX_SQUASH: &str = "squash_index"; const INDEX_SYNC_TO_HTTP: &str = "update_crate_index"; const INDEX_UPDATE_YANKED: &str = "sync_yanked"; + const NORMALIZE_INDEX: &str = "normalize_index"; const RENDER_AND_UPLOAD_README: &str = "render_and_upload_readme"; const UPDATE_DOWNLOADS: &str = "update_downloads"; @@ -40,6 +42,7 @@ impl Job { Job::IndexSquash(_) => Self::INDEX_SQUASH, Job::IndexSyncToHttp(_) => Self::INDEX_SYNC_TO_HTTP, Job::IndexUpdateYanked(_) => Self::INDEX_UPDATE_YANKED, + Job::NormalizeIndex(_) => Self::NORMALIZE_INDEX, Job::RenderAndUploadReadme(_) => Self::RENDER_AND_UPLOAD_README, Job::UpdateDownloads(_) => Self::UPDATE_DOWNLOADS, } @@ -53,6 +56,7 @@ impl Job { Job::IndexSquash(inner) => serde_json::to_value(inner), Job::IndexSyncToHttp(inner) => serde_json::to_value(inner), Job::IndexUpdateYanked(inner) => serde_json::to_value(inner), + Job::NormalizeIndex(inner) => serde_json::to_value(inner), Job::RenderAndUploadReadme(inner) => serde_json::to_value(inner), Job::UpdateDownloads(inner) => serde_json::to_value(inner), } @@ -80,6 +84,7 @@ impl Job { Self::INDEX_SQUASH => Job::IndexSquash(from_value(value)?), Self::INDEX_SYNC_TO_HTTP => Job::IndexSyncToHttp(from_value(value)?), Self::INDEX_UPDATE_YANKED => Job::IndexUpdateYanked(from_value(value)?), + Self::NORMALIZE_INDEX => Job::NormalizeIndex(from_value(value)?), Self::RENDER_AND_UPLOAD_README => Job::RenderAndUploadReadme(from_value(value)?), Self::UPDATE_DOWNLOADS => Job::UpdateDownloads(from_value(value)?), job_type => Err(PerformError::from(format!("Unknown job type {job_type}")))?, @@ -106,6 +111,7 @@ impl Job { Job::IndexUpdateYanked(args) => conn.with_connection(&|conn| { worker::perform_index_update_yanked(env, conn, &args.krate, &args.version_num) }), + Job::NormalizeIndex(args) => worker::perform_normalize_index(env, args), Job::RenderAndUploadReadme(args) => conn.with_connection(&|conn| { worker::perform_render_and_upload_readme( conn, @@ -150,6 +156,11 @@ pub struct IndexUpdateYankedJob { pub(super) version_num: String, } +#[derive(Serialize, Deserialize)] +pub struct NormalizeIndexJob { + pub dry_run: bool, +} + #[derive(Serialize, Deserialize)] pub struct RenderAndUploadReadmeJob { pub(super) version_id: i32, diff --git a/src/worker/git.rs b/src/worker/git.rs index ceed9c1fbd7..35cc56227ea 100644 --- a/src/worker/git.rs +++ b/src/worker/git.rs @@ -1,5 +1,6 @@ use crate::background_jobs::{ Environment, IndexAddCrateJob, IndexSquashJob, IndexSyncToHttpJob, IndexUpdateYankedJob, Job, + NormalizeIndexJob, }; use crate::schema; use crate::swirl::PerformError; @@ -8,7 +9,7 @@ use cargo_registry_index::{Crate, Repository}; use chrono::Utc; use diesel::prelude::*; use std::fs::{self, OpenOptions}; -use std::io::ErrorKind; +use std::io::{BufRead, BufReader, ErrorKind}; use std::process::Command; #[instrument(skip_all, fields(krate.name = ?krate.name, krate.vers = ?krate.vers))] @@ -178,3 +179,77 @@ pub fn perform_index_squash(env: &Environment) -> Result<(), PerformError> { pub fn squash_index() -> Job { Job::IndexSquash(IndexSquashJob {}) } + +pub fn perform_normalize_index( + env: &Environment, + args: NormalizeIndexJob, +) -> Result<(), PerformError> { + info!("Normalizing the index"); + + let repo = env.lock_index()?; + + let files = repo.get_files_modified_since(None)?; + let num_files = files.len(); + + for (i, file) in files.iter().enumerate() { + if i % 50 == 0 { + info!(num_files, i, ?file); + } + + let crate_name = file.file_name().unwrap().to_str().unwrap(); + let path = repo.index_file(crate_name); + if !path.exists() { + continue; + } + + let mut body: Vec = Vec::new(); + let file = fs::File::open(&path)?; + let reader = BufReader::new(file); + let mut versions = Vec::new(); + for line in reader.lines() { + let line = line?; + if line.is_empty() { + continue; + } + + let mut krate: Crate = serde_json::from_str(&line)?; + for dep in &mut krate.deps { + // Remove deps with empty features + dep.features.retain(|d| !d.is_empty()); + // Set null DependencyKind to Normal + dep.kind = Some( + dep.kind + .unwrap_or(cargo_registry_index::DependencyKind::Normal), + ); + } + krate.deps.sort(); + versions.push(krate); + } + for version in versions { + serde_json::to_writer(&mut body, &version).unwrap(); + body.push(b'\n'); + } + fs::write(path, body)?; + } + + info!("Committing normalization"); + let msg = "Normalize index format\n\n\ + More information can be found at https://github.com/rust-lang/crates.io/pull/5066"; + repo.run_command(Command::new("git").args(["commit", "-am", msg]))?; + + let branch = match args.dry_run { + false => "master", + true => "normalization-dry-run", + }; + + info!(?branch, "Pushing to upstream repository"); + repo.run_command(Command::new("git").args(["push", "origin", &format!("HEAD:{branch}")]))?; + + info!("Index normalization completed"); + + Ok(()) +} + +pub fn normalize_index(dry_run: bool) -> Job { + Job::NormalizeIndex(NormalizeIndexJob { dry_run }) +} diff --git a/src/worker/mod.rs b/src/worker/mod.rs index 24bee097cc7..51f6eb3f9a0 100644 --- a/src/worker/mod.rs +++ b/src/worker/mod.rs @@ -12,7 +12,7 @@ mod update_downloads; pub use daily_db_maintenance::daily_db_maintenance; pub use dump_db::dump_db; -pub use git::{add_crate, squash_index, sync_yanked}; +pub use git::{add_crate, normalize_index, squash_index, sync_yanked}; pub use readmes::render_and_upload_readme; pub use update_downloads::update_downloads; @@ -20,7 +20,7 @@ pub(crate) use daily_db_maintenance::perform_daily_db_maintenance; pub(crate) use dump_db::perform_dump_db; pub(crate) use git::{ perform_index_add_crate, perform_index_squash, perform_index_sync_to_http, - perform_index_update_yanked, + perform_index_update_yanked, perform_normalize_index, }; pub(crate) use readmes::perform_render_and_upload_readme; pub(crate) use update_downloads::perform_update_downloads; From 18ef1bee5d60c25dd380ba459a88fa117784f5b3 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 31 Dec 2022 14:39:19 +0100 Subject: [PATCH 7/8] bin/enqueue-job: Add support for `NormalizeIndex` job --- src/admin/enqueue_job.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/admin/enqueue_job.rs b/src/admin/enqueue_job.rs index 47745a55e25..a9e47fe19e4 100644 --- a/src/admin/enqueue_job.rs +++ b/src/admin/enqueue_job.rs @@ -19,6 +19,10 @@ pub enum Command { }, DailyDbMaintenance, SquashIndex, + NormalizeIndex { + #[arg(long = "dry-run")] + dry_run: bool, + }, } pub fn run(command: Command) -> Result<()> { @@ -46,5 +50,6 @@ pub fn run(command: Command) -> Result<()> { } => Ok(worker::dump_db(database_url, target_name).enqueue(&conn)?), Command::DailyDbMaintenance => Ok(worker::daily_db_maintenance().enqueue(&conn)?), Command::SquashIndex => Ok(worker::squash_index().enqueue(&conn)?), + Command::NormalizeIndex { dry_run } => Ok(worker::normalize_index(dry_run).enqueue(&conn)?), } } From 1a99f2399fe845ba5c2edab383de2c2ff6f862c0 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 31 Dec 2022 14:39:43 +0100 Subject: [PATCH 8/8] admin: Remove `NormalizeIndex` admin command --- src/admin/mod.rs | 1 - src/admin/normalize_index.rs | 76 ------------------------------------ src/bin/crates-admin.rs | 6 +-- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 src/admin/normalize_index.rs diff --git a/src/admin/mod.rs b/src/admin/mod.rs index 7a508b6c492..089218d01dd 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -4,7 +4,6 @@ pub mod dialoguer; pub mod enqueue_job; pub mod git_import; pub mod migrate; -pub mod normalize_index; pub mod on_call; pub mod populate; pub mod render_readmes; diff --git a/src/admin/normalize_index.rs b/src/admin/normalize_index.rs deleted file mode 100644 index 254e7aa64b3..00000000000 --- a/src/admin/normalize_index.rs +++ /dev/null @@ -1,76 +0,0 @@ -use std::{ - fs::File, - io::{BufRead, BufReader}, - process::Command, -}; - -use cargo_registry_index::{Repository, RepositoryConfig}; -use indicatif::{ProgressBar, ProgressIterator, ProgressStyle}; - -use crate::admin::dialoguer; - -#[derive(clap::Parser, Debug, Copy, Clone)] -#[clap(name = "normalize-index", about = "Normalize and squash the git index")] -pub struct Opts {} - -pub fn run(_opts: Opts) -> anyhow::Result<()> { - println!("fetching git repo"); - let config = RepositoryConfig::from_environment(); - let repo = Repository::open(&config)?; - - repo.reset_head()?; - println!("please place site in read-only mode now to prevent further commits"); - if !dialoguer::confirm("continue?") { - return Ok(()); - } - repo.reset_head()?; - println!("HEAD is at {}", repo.head_oid()?); - - let files = repo.get_files_modified_since(None)?; - println!("found {} crates", files.len()); - let pb = ProgressBar::new(files.len() as u64); - pb.set_style(ProgressStyle::with_template("{bar:60} ({pos}/{len}, ETA {eta})").unwrap()); - - for file in files.iter().progress_with(pb) { - let crate_name = file.file_name().unwrap().to_str().unwrap(); - let path = repo.index_file(crate_name); - if !path.exists() { - continue; - } - - let mut body: Vec = Vec::new(); - let file = File::open(&path)?; - let reader = BufReader::new(file); - let mut versions = Vec::new(); - for line in reader.lines() { - let mut krate: cargo_registry_index::Crate = serde_json::from_str(&line?)?; - for dep in &mut krate.deps { - // Remove deps with empty features - dep.features.retain(|d| !d.is_empty()); - // Set null DependencyKind to Normal - dep.kind = Some( - dep.kind - .unwrap_or(cargo_registry_index::DependencyKind::Normal), - ); - } - krate.deps.sort(); - versions.push(krate); - } - for version in versions { - serde_json::to_writer(&mut body, &version).unwrap(); - body.push(b'\n'); - } - std::fs::write(path, body)?; - } - - println!("committing normalization"); - let msg = "Normalize index format\n\n\ - More information can be found at https://github.com/rust-lang/crates.io/pull/5066"; - repo.run_command(Command::new("git").args(["commit", "-am", msg]))?; - - if dialoguer::confirm("push to origin?") { - repo.run_command(Command::new("git").args(["push", "origin"]))?; - println!("The index has been successfully normalized."); - } - Ok(()) -} diff --git a/src/bin/crates-admin.rs b/src/bin/crates-admin.rs index c26d8f2ff9f..9c124e63125 100644 --- a/src/bin/crates-admin.rs +++ b/src/bin/crates-admin.rs @@ -1,8 +1,8 @@ #![warn(clippy::all, rust_2018_idioms)] use cargo_registry::admin::{ - delete_crate, delete_version, enqueue_job, git_import, migrate, normalize_index, populate, - render_readmes, test_pagerduty, transfer_crates, upload_index, verify_token, yank_version, + delete_crate, delete_version, enqueue_job, git_import, migrate, populate, render_readmes, + test_pagerduty, transfer_crates, upload_index, verify_token, yank_version, }; #[derive(clap::Parser, Debug)] @@ -21,7 +21,6 @@ enum Command { GitImport(git_import::Opts), #[clap(subcommand)] EnqueueJob(enqueue_job::Command), - NormalizeIndex(normalize_index::Opts), } fn main() -> anyhow::Result<()> { @@ -47,7 +46,6 @@ fn main() -> anyhow::Result<()> { Command::YankVersion(opts) => yank_version::run(opts), Command::GitImport(opts) => git_import::run(opts)?, Command::EnqueueJob(command) => enqueue_job::run(command)?, - Command::NormalizeIndex(opts) => normalize_index::run(opts)?, } Ok(())