From 8926c8d4b3136822f220c23d84b2cf1bb6f1c151 Mon Sep 17 00:00:00 2001
From: konstin <konstin@mailbox.org>
Date: Wed, 2 Oct 2024 18:00:33 +0200
Subject: [PATCH 1/5] Hint at wrong endpoint in publish

Improve hints when using the simple index URL instead of the upload URL in `uv publish`. This is the most common confusion when publishing, so we give it some extra care and put it more centrally in the CLI help.

Fixes #7860
---
 crates/uv-cli/src/lib.rs     |  7 ++++---
 crates/uv-publish/src/lib.rs | 36 +++++++++++++++++++++++++++---------
 docs/reference/cli.md        |  4 ++--
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs
index b4b0a176a47b9..4b73949be7ada 100644
--- a/crates/uv-cli/src/lib.rs
+++ b/crates/uv-cli/src/lib.rs
@@ -4380,7 +4380,8 @@ pub struct DisplayTreeArgs {
     #[arg(long)]
     pub no_dedupe: bool,
 
-    /// Show the reverse dependencies for the given package. This flag will invert the tree and display the packages that depend on the given package.
+    /// Show the reverse dependencies for the given package. This flag will invert the tree and
+    /// display the packages that depend on the given package.
     #[arg(long, alias = "reverse")]
     pub invert: bool,
 }
@@ -4394,9 +4395,9 @@ pub struct PublishArgs {
     #[arg(default_value = "dist/*")]
     pub files: Vec<String>,
 
-    /// The URL of the upload endpoint.
+    /// The URL of the upload endpoint (not the simple index URL!).
     ///
-    /// Note that this typically differs from the index URL.
+    /// Note that there are typically different URLs for index access ("simple") and index upload.
     ///
     /// Defaults to PyPI's publish URL (<https://upload.pypi.org/legacy/>).
     ///
diff --git a/crates/uv-publish/src/lib.rs b/crates/uv-publish/src/lib.rs
index 4276d5b7ed25c..6704e79930fba 100644
--- a/crates/uv-publish/src/lib.rs
+++ b/crates/uv-publish/src/lib.rs
@@ -81,8 +81,12 @@ pub enum PublishSendError {
     ReqwestMiddleware(#[from] reqwest_middleware::Error),
     #[error("Upload failed with status {0}")]
     StatusNoBody(StatusCode, #[source] reqwest::Error),
-    #[error("Upload failed with status code {0}: {1}")]
+    #[error("Upload failed with status code {0}. Server says: {1}")]
     Status(StatusCode, String),
+    #[error("POST requests are not supported by the endpoint, are you using the simple index URL instead of the upload URL?")]
+    MethodNotAllowedNoBody,
+    #[error("POST requests are not supported by the endpoint, are you using the simple index URL instead of the upload URL? Server says: {0}")]
+    MethodNotAllowed(String),
     /// The registry returned a "403 Forbidden".
     #[error("Permission denied (status code {0}): {1}")]
     PermissionDenied(StatusCode, String),
@@ -573,18 +577,32 @@ async fn handle_response(registry: &Url, response: Response) -> Result<bool, Pub
         .get(reqwest::header::CONTENT_TYPE)
         .and_then(|content_type| content_type.to_str().ok())
         .map(ToString::to_string);
-    let upload_error = response
-        .bytes()
-        .await
-        .map_err(|err| PublishSendError::StatusNoBody(status_code, err))?;
+    let upload_error = response.bytes().await.map_err(|err| {
+        if status_code == StatusCode::METHOD_NOT_ALLOWED {
+            PublishSendError::MethodNotAllowedNoBody
+        } else {
+            PublishSendError::StatusNoBody(status_code, err)
+        }
+    })?;
     let upload_error = String::from_utf8_lossy(&upload_error);
 
-    trace!("Response content for non-200 for {registry}: {upload_error}");
+    trace!("Response content for non-200 response for {registry}: {upload_error}");
 
     debug!("Upload error response: {upload_error}");
+
+    // That's most likely the simple index URL, not the upload URL.
+    if status_code == StatusCode::METHOD_NOT_ALLOWED {
+        return Err(PublishSendError::MethodNotAllowed(
+            PublishSendError::extract_error_message(
+                upload_error.to_string(),
+                content_type.as_deref(),
+            ),
+        ));
+    }
+
     // Detect existing file errors the way twine does.
     // https://github.com/pypa/twine/blob/c512bbf166ac38239e58545a39155285f8747a7b/twine/commands/upload.py#L34-L72
-    if status_code == 403 {
+    if status_code == StatusCode::FORBIDDEN {
         if upload_error.contains("overwrite artifact") {
             // Artifactory (https://jfrog.com/artifactory/)
             Ok(false)
@@ -597,10 +615,10 @@ async fn handle_response(registry: &Url, response: Response) -> Result<bool, Pub
                 ),
             ))
         }
-    } else if status_code == 409 {
+    } else if status_code == StatusCode::CONFLICT {
         // conflict, pypiserver (https://pypi.org/project/pypiserver)
         Ok(false)
-    } else if status_code == 400
+    } else if status_code == StatusCode::BAD_REQUEST
         && (upload_error.contains("updating asset") || upload_error.contains("already been taken"))
     {
         // Nexus Repository OSS (https://www.sonatype.com/nexus-repository-oss)
diff --git a/docs/reference/cli.md b/docs/reference/cli.md
index 83292120a0fec..7ffc4100533e0 100644
--- a/docs/reference/cli.md
+++ b/docs/reference/cli.md
@@ -7186,9 +7186,9 @@ uv publish [OPTIONS] [FILES]...
 
 <p>This setting has no effect when used in the <code>uv pip</code> interface.</p>
 
-</dd><dt><code>--publish-url</code> <i>publish-url</i></dt><dd><p>The URL of the upload endpoint.</p>
+</dd><dt><code>--publish-url</code> <i>publish-url</i></dt><dd><p>The URL of the upload endpoint (not the simple index URL!).</p>
 
-<p>Note that this typically differs from the index URL.</p>
+<p>Note that there are typically different URLs for index access (&quot;simple&quot;) and index upload.</p>
 
 <p>Defaults to PyPI&#8217;s publish URL (&lt;https://upload.pypi.org/legacy/&gt;).</p>
 

From 6647915bf3609a7c39072a9d87d05289e4dba7d5 Mon Sep 17 00:00:00 2001
From: konstin <konstin@mailbox.org>
Date: Fri, 4 Oct 2024 11:09:08 +0200
Subject: [PATCH 2/5] Review

---
 crates/uv-cli/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs
index 4b73949be7ada..e207fc7d0e7ea 100644
--- a/crates/uv-cli/src/lib.rs
+++ b/crates/uv-cli/src/lib.rs
@@ -4397,7 +4397,8 @@ pub struct PublishArgs {
 
     /// The URL of the upload endpoint (not the simple index URL!).
     ///
-    /// Note that there are typically different URLs for index access ("simple") and index upload.
+    /// Note that there are typically different URLs for index access (e.g., `https:://.../simple`)
+    /// and index upload.
     ///
     /// Defaults to PyPI's publish URL (<https://upload.pypi.org/legacy/>).
     ///

From 67c0d408bb5260486c542c2761d102e0c9cbf190 Mon Sep 17 00:00:00 2001
From: konstin <konstin@mailbox.org>
Date: Fri, 4 Oct 2024 11:12:57 +0200
Subject: [PATCH 3/5] generate-all

---
 docs/reference/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/cli.md b/docs/reference/cli.md
index 7ffc4100533e0..2052fc68a09a2 100644
--- a/docs/reference/cli.md
+++ b/docs/reference/cli.md
@@ -7188,7 +7188,7 @@ uv publish [OPTIONS] [FILES]...
 
 </dd><dt><code>--publish-url</code> <i>publish-url</i></dt><dd><p>The URL of the upload endpoint (not the simple index URL!).</p>
 
-<p>Note that there are typically different URLs for index access (&quot;simple&quot;) and index upload.</p>
+<p>Note that there are typically different URLs for index access (e.g., <code>https:://.../simple</code>) and index upload.</p>
 
 <p>Defaults to PyPI&#8217;s publish URL (&lt;https://upload.pypi.org/legacy/&gt;).</p>
 

From 86f948952bdf81e8dd3b5ba5cfc0671d6ab0fdd6 Mon Sep 17 00:00:00 2001
From: konsti <konstin@mailbox.org>
Date: Mon, 7 Oct 2024 19:12:04 +0200
Subject: [PATCH 4/5] Update crates/uv-cli/src/lib.rs

Co-authored-by: Zanie Blue <contact@zanie.dev>
---
 crates/uv-cli/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs
index e207fc7d0e7ea..5e4a108363649 100644
--- a/crates/uv-cli/src/lib.rs
+++ b/crates/uv-cli/src/lib.rs
@@ -4395,7 +4395,7 @@ pub struct PublishArgs {
     #[arg(default_value = "dist/*")]
     pub files: Vec<String>,
 
-    /// The URL of the upload endpoint (not the simple index URL!).
+    /// The URL of the upload endpoint (not the index URL).
     ///
     /// Note that there are typically different URLs for index access (e.g., `https:://.../simple`)
     /// and index upload.

From 397c46c0f5f86cff4668399abdf53755c65d931d Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Tue, 8 Oct 2024 14:08:46 -0500
Subject: [PATCH 5/5] Update docs

---
 docs/reference/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/cli.md b/docs/reference/cli.md
index 2052fc68a09a2..6df0823f67991 100644
--- a/docs/reference/cli.md
+++ b/docs/reference/cli.md
@@ -7186,7 +7186,7 @@ uv publish [OPTIONS] [FILES]...
 
 <p>This setting has no effect when used in the <code>uv pip</code> interface.</p>
 
-</dd><dt><code>--publish-url</code> <i>publish-url</i></dt><dd><p>The URL of the upload endpoint (not the simple index URL!).</p>
+</dd><dt><code>--publish-url</code> <i>publish-url</i></dt><dd><p>The URL of the upload endpoint (not the index URL).</p>
 
 <p>Note that there are typically different URLs for index access (e.g., <code>https:://.../simple</code>) and index upload.</p>