Skip to content

chore(sourcemaps): Remove support for non-chunked uploads #2957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: szokeasaurusrex/projects-always-there
Choose a base branch
from
+6 −492
Open

chore(sourcemaps): Remove support for non-chunked uploads #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/api/data_types/chunking/upload/capability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ use serde::{Deserialize, Deserializer};

#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum ChunkUploadCapability {
/// Chunked upload of release files
ReleaseFiles,

/// Chunked upload of standalone artifact bundles
ArtifactBundles,

Expand All @@ -31,7 +28,6 @@ impl<'de> Deserialize<'de> for ChunkUploadCapability {
D: Deserializer<'de>,
{
Ok(match String::deserialize(deserializer)?.as_str() {
"release_files" => ChunkUploadCapability::ReleaseFiles,
"artifact_bundles" => ChunkUploadCapability::ArtifactBundles,
"artifact_bundles_v2" => ChunkUploadCapability::ArtifactBundlesV2,
"dartsymbolmap" => ChunkUploadCapability::DartSymbolMap,
Expand Down
235 changes: 2 additions & 233 deletions src/api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ mod pagination;
use std::borrow::Cow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::ffi::OsStr;
use std::fs::File;
use std::io::{self, Read as _, Write};
use std::path::Path;
use std::rc::Rc;
use std::sync::Arc;
use std::{fmt, thread};
Expand Down Expand Up @@ -46,8 +44,7 @@ use uuid::Uuid;

use crate::api::errors::{ProjectRenamedError, RetryError};
use crate::config::{Auth, Config};
use crate::constants::{ARCH, DEFAULT_URL, EXT, PLATFORM, RELEASE_REGISTRY_LATEST_URL, VERSION};
use crate::utils::file_upload::LegacyUploadContext;
use crate::constants::{ARCH, EXT, PLATFORM, RELEASE_REGISTRY_LATEST_URL, VERSION};
use crate::utils::http::{self, is_absolute_url};
use crate::utils::non_empty::NonEmptySlice;
use crate::utils::progress::{ProgressBar, ProgressBarMode};
Expand Down Expand Up @@ -87,11 +84,6 @@ pub struct AuthenticatedApi<'a> {
api: &'a Api,
}

pub struct RegionSpecificApi<'a> {
api: &'a AuthenticatedApi<'a>,
region_url: Option<Box<str>>,
}

/// Represents an HTTP method that is used by the API.
#[derive(Eq, PartialEq, Debug)]
pub enum Method {
Expand Down Expand Up @@ -446,7 +438,7 @@ impl Api {
}
}

impl<'a> AuthenticatedApi<'a> {
impl AuthenticatedApi<'_> {
// Pass through low-level methods to API.

/// Convenience method to call self.api.get.
Expand Down Expand Up @@ -482,110 +474,6 @@ impl<'a> AuthenticatedApi<'a> {
self.get("/")?.convert()
}

/// Lists release files for the given `release`, filtered by a set of checksums.
/// When empty checksums list is provided, fetches all possible artifacts.
pub fn list_release_files_by_checksum(
&self,
org: &str,
project: Option<&str>,
release: &str,
checksums: &[String],
) -> ApiResult<Vec<Artifact>> {
let mut rv = vec![];
let mut cursor = "".to_owned();
loop {
let mut path = if let Some(project) = project {
format!(
"/projects/{}/{}/releases/{}/files/?cursor={}",
PathArg(org),
PathArg(project),
PathArg(release),
QueryArg(&cursor),
)
} else {
format!(
"/organizations/{}/releases/{}/files/?cursor={}",
PathArg(org),
PathArg(release),
QueryArg(&cursor),
)
};

let mut checksums_qs = String::new();
for checksum in checksums.iter() {
checksums_qs.push_str(&format!("&checksum={}", QueryArg(checksum)));
}
// We have a 16kb buffer for reach request configured in nginx,
// so do not even bother trying if it's too long.
// (16_384 limit still leaves us with 384 bytes for the url itself).
if !checksums_qs.is_empty() && checksums_qs.len() <= 16_000 {
path.push_str(&checksums_qs);
}

let resp = self.get(&path)?;
if resp.status() == 404 || (resp.status() == 400 && !cursor.is_empty()) {
if rv.is_empty() {
return Err(ApiErrorKind::ReleaseNotFound.into());
} else {
break;
}
}

let pagination = resp.pagination();
rv.extend(resp.convert::<Vec<Artifact>>()?);
if let Some(next) = pagination.into_next_cursor() {
cursor = next;
} else {
break;
}
}
Ok(rv)
}

/// Lists all the release files for the given `release`.
pub fn list_release_files(
&self,
org: &str,
project: Option<&str>,
release: &str,
) -> ApiResult<Vec<Artifact>> {
self.list_release_files_by_checksum(org, project, release, &[])
}

/// Deletes a single release file. Returns `true` if the file was
/// deleted or `false` otherwise.
pub fn delete_release_file(
&self,
org: &str,
project: Option<&str>,
version: &str,
file_id: &str,
) -> ApiResult<bool> {
let path = if let Some(project) = project {
format!(
"/projects/{}/{}/releases/{}/files/{}/",
PathArg(org),
PathArg(project),
PathArg(version),
PathArg(file_id)
)
} else {
format!(
"/organizations/{}/releases/{}/files/{}/",
PathArg(org),
PathArg(version),
PathArg(file_id)
)
};

let resp = self.delete(&path)?;
if resp.status() == 404 {
Ok(false)
} else {
resp.into_result().map(|_| true)
}
}

/// Creates a new release.
pub fn new_release(&self, org: &str, release: &NewRelease) -> ApiResult<ReleaseInfo> {
// for single project releases use the legacy endpoint that is project bound.
Expand Down Expand Up @@ -1181,50 +1069,6 @@ impl<'a> AuthenticatedApi<'a> {
}
Ok(rv)
}

fn get_region_url(&self, org: &str) -> ApiResult<String> {
self.get(&format!("/organizations/{org}/region/"))
.and_then(|resp| resp.convert::<Region>())
.map(|region| region.url)
}

pub fn region_specific(&'a self, org: &'a str) -> RegionSpecificApi<'a> {
let base_url = self.api.config.get_base_url();
if base_url.is_err()
|| base_url.expect("base_url should not be error") != DEFAULT_URL.trim_end_matches('/')
{
// Do not specify a region URL unless the URL is configured to https://sentry.io (i.e. the default).
return RegionSpecificApi {
api: self,
region_url: None,
};
}

let region_url = match self
.api
.config
.get_auth()
.expect("auth should not be None for authenticated API!")
{
Auth::Token(token) => match token.payload() {
Some(payload) => Some(payload.region_url.clone().into()),
None => {
let region_url = self.get_region_url(org);
if let Err(err) = &region_url {
log::warn!("Failed to get region URL due to following error: {err}");
log::info!("Failling back to the default region.");
}

region_url.ok().map(|url| url.into())
}
},
};

RegionSpecificApi {
api: self,
region_url,
}
}
}

/// Available datasets for fetching organization events
Expand Down Expand Up @@ -1298,73 +1142,6 @@ impl FetchEventsOptions<'_> {
}
}

impl RegionSpecificApi<'_> {
fn request(&self, method: Method, url: &str) -> ApiResult<ApiRequest> {
self.api
.api
.request(method, url, self.region_url.as_deref())
}

/// Uploads a new release file. The file is loaded directly from the file
/// system and uploaded as `name`.
pub fn upload_release_file(
&self,
context: &LegacyUploadContext,
contents: &[u8],
name: &str,
headers: Option<&[(String, String)]>,
progress_bar_mode: ProgressBarMode,
) -> ApiResult<Option<Artifact>> {
let path = if let Some(project) = context.project() {
format!(
"/projects/{}/{}/releases/{}/files/",
PathArg(context.org()),
PathArg(project),
PathArg(context.release())
)
} else {
format!(
"/organizations/{}/releases/{}/files/",
PathArg(context.org()),
PathArg(context.release())
)
};

let mut form = curl::easy::Form::new();

let filename = Path::new(name)
.file_name()
.and_then(OsStr::to_str)
.unwrap_or("unknown.bin");
form.part("file")
.buffer(filename, contents.to_vec())
.add()?;
form.part("name").contents(name.as_bytes()).add()?;
if let Some(dist) = context.dist() {
form.part("dist").contents(dist.as_bytes()).add()?;
}

if let Some(headers) = headers {
for (key, value) in headers {
form.part("header")
.contents(format!("{key}:{value}").as_bytes())
.add()?;
}
}

let resp = self
.request(Method::Post, &path)?
.with_form_data(form)?
.progress_bar_mode(progress_bar_mode)
.send()?;
if resp.status() == 409 {
Ok(None)
} else {
resp.convert_rnf(ApiErrorKind::ReleaseNotFound)
}
}
}

fn send_req<W: Write>(
handle: &mut curl::easy::Easy,
out: &mut W,
Expand Down Expand Up @@ -1858,14 +1635,6 @@ pub struct AuthInfo {
pub user: Option<User>,
}

/// A release artifact
#[derive(Clone, Deserialize, Debug)]
pub struct Artifact {
pub id: String,
pub name: String,
pub dist: Option<String>,
}

/// Information for new releases
#[derive(Debug, Serialize, Default)]
pub struct NewRelease {
Expand Down
1 change: 0 additions & 1 deletion src/utils/auth_token/org_auth_token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ pub struct OrgAuthToken {
/// Represents the payload data of an org auth token.
#[derive(Clone, Debug, Deserialize)]
pub struct AuthTokenPayload {
pub region_url: String,
pub org: String,

// URL may be missing from some old auth tokens, see getsentry/sentry#57123
Expand Down
Loading
Loading