Fix redaction of VCS URL credentials in locks. (#2964)

Author: jsirois

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 2.64.1
+
+This release is a follow-up to 2.64.0 to fix a regression in locks for credentialed VCS
+requirements.
+
+* Fix redaction of VCS URL credentials in locks. (#2964)
+
 ## 2.64.0
 
 This release adds support for `--avoid-downloads` / `--no-avoid-downloads` to `pex3 lock create`. By

pex/resolve/locker.py

@@ -377,13 +377,13 @@ def analyze(self, line):
                     )
                     verified = True
                     selected_path = os.path.basename(archive_path)
-                    artifact_url = self.parse_url_and_maybe_record_fingerprint(
+                    artifact_url = ArtifactURL.parse(
                         self._vcs_url_manager.normalize_url(artifact_url.raw_url)
                     )
                     self._selected_path_to_pin[selected_path] = build_result.pin
 
-                    vcs, _, vcs_url = artifact_url.raw_url.partition("+")
-                    if "@" in artifact_url.path:
+                    vcs, _, vcs_url = build_result.url.raw_url.partition("+")
+                    if "@" in build_result.url.path:
                         vcs_url, _, _ = vcs_url.rpartition("@")
                     commit_id = self._commit_ids.pop(vcs_url, None)
                 elif isinstance(artifact_url.scheme, ArchiveScheme.Value):
@@ -452,8 +452,12 @@ def analyze(self, line):
                     )
                     source_fingerprint = Fingerprint.from_digest(digest)
                     verified = True  # noqa
-                    vcs, _, vcs_url = artifact_url.raw_url.partition("+")
-                    if "@" in artifact_url.path:
+                    artifact_url = ArtifactURL.parse(
+                        self._vcs_url_manager.normalize_url(artifact_url.raw_url)
+                    )
+
+                    vcs, _, vcs_url = build_result.url.raw_url.partition("+")
+                    if "@" in build_result.url.path:
                         vcs_url, _, _ = vcs_url.rpartition("@")
                     commit_id = self._commit_ids.pop(vcs_url, None)
                 elif isinstance(artifact_url.scheme, ArchiveScheme.Value):

pex/version.py

@@ -1,4 +1,4 @@
 # Copyright 2015 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = "2.64.0"
+__version__ = "2.64.1"