From 00d95c3282fc7317edcd09a34efcae72f16c3370 Mon Sep 17 00:00:00 2001
From: Abraham Egnor <abraham.egnor@mongodb.com>
Date: Fri, 7 Jun 2024 14:01:37 -0400
Subject: [PATCH] RUST-1205 Fix macro crate publishing (#1127)

---
 .evergreen/release-build-vars.sh                 | 1 +
 .evergreen/release-danger-do-not-run-manually.sh | 8 ++++----
 macros/Cargo.toml                                | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.evergreen/release-build-vars.sh b/.evergreen/release-build-vars.sh
index 1ee75ae0e..14df3421f 100644
--- a/.evergreen/release-build-vars.sh
+++ b/.evergreen/release-build-vars.sh
@@ -18,6 +18,7 @@ if [[ "${DRY_RUN:-}" == "yes" ]]; then
 fi
 
 cat <<EOT >release-expansion.yml
+CARGO_REGISTRY_TOKEN: "${CARGO_REGISTRY_TOKEN}"
 CRATE_VERSION: "${CRATE_VERSION}"
 PAPERTRAIL_KEY_ID: "${PAPERTRAIL_KEY_ID}"
 PAPERTRAIL_SECRET_KEY: "${PAPERTRAIL_SECRET_KEY}"
diff --git a/.evergreen/release-danger-do-not-run-manually.sh b/.evergreen/release-danger-do-not-run-manually.sh
index bb19d8149..0f0534469 100755
--- a/.evergreen/release-danger-do-not-run-manually.sh
+++ b/.evergreen/release-danger-do-not-run-manually.sh
@@ -13,8 +13,8 @@ set +x
 
 set -o errexit
 
-if [[ -z "$CRATES_IO_TOKEN" ]]; then
-  echo >&2 "\$CRATES_IO_TOKEN must be set to the crates.io authentication token"
+if [[ -z "$CARGO_REGISTRY_TOKEN" ]]; then
+  echo >&2 "\$CARGO_REGISTRY_TOKEN must be set to the crates.io authentication token"
   exit 1
 fi
 
@@ -32,7 +32,7 @@ if [[ "${PACKAGE_ONLY}" == "yes" ]]; then
   cargo package --no-verify --allow-dirty
 else
   pushd macros
-  cargo publish --token $CRATES_IO_TOKEN ${EXTRA}
+  cargo publish ${EXTRA}
   popd
-  cargo publish --token $CRATES_IO_TOKEN ${EXTRA}
+  cargo publish ${EXTRA}
 fi
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 6f0a2afb7..76e8ef634 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "mongodb-internal-macros"
+description = "Internal macros for the mongodb crate"
 version = "3.0.0-beta"
 edition = "2021"
 license = "Apache-2.0"