commit f1ac6e3ac657dbbc46935c3d2262d50b14b0fc90
author Julie Qiu <julie@golang.org> Sun Sep 20 18:29:37 2020 -0400
committer Julie Qiu <julie@golang.org> Mon Sep 21 20:13:08 2020 +0000
tree bae87d4b6b9a8e6f18bd6b2a47c749d219c823bf
parent 1d7a9d9c2418ce2db524c8f7d7f769b2452c9519

internal/proxy: rename version to requestedVersion

Various uses of the variable version is renamed to requestedVersion for
clarity.

Change-Id: I542503a183f0b584689fe7fef6366e8555c3f84a
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/256177
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>

internal/proxy/client.go

diff --git a/internal/proxy/client.go b/internal/proxy/client.go
index b527df5..a188161 100644
--- a/internal/proxy/client.go
+++ b/internal/proxy/client.go
@@ -115,9 +115,9 @@
 	return res.ContentLength, nil
 }
 
-func (c *Client) escapedURL(modulePath, version, suffix string) (_ string, err error) {
+func (c *Client) escapedURL(modulePath, requestedVersion, suffix string) (_ string, err error) {
 	defer func() {
-		derrors.Wrap(&err, "Client.escapedURL(%q, %q, %q)", modulePath, version, suffix)
+		derrors.Wrap(&err, "Client.escapedURL(%q, %q, %q)", modulePath, requestedVersion, suffix)
 	}()
 
 	if suffix != "info" && suffix != "mod" && suffix != "zip" {
@@ -127,23 +127,23 @@
 	if err != nil {
 		return "", fmt.Errorf("path: %v: %w", err, derrors.InvalidArgument)
 	}
-	if version == internal.LatestVersion {
+	if requestedVersion == internal.LatestVersion {
 		if suffix != "info" {
 			return "", fmt.Errorf("cannot ask for latest with suffix %q", suffix)
 		}
 		return fmt.Sprintf("%s/%s/@latest", c.url, escapedPath), nil
 	}
-	escapedVersion, err := module.EscapeVersion(version)
+	escapedVersion, err := module.EscapeVersion(requestedVersion)
 	if err != nil {
 		return "", fmt.Errorf("version: %v: %w", err, derrors.InvalidArgument)
 	}
 	return fmt.Sprintf("%s/%s/@v/%s.%s", c.url, escapedPath, escapedVersion, suffix), nil
 }
 
-func (c *Client) readBody(ctx context.Context, modulePath, version, suffix string) (_ []byte, err error) {
-	defer derrors.Wrap(&err, "Client.readBody(%q, %q, %q)", modulePath, version, suffix)
+func (c *Client) readBody(ctx context.Context, modulePath, requestedVersion, suffix string) (_ []byte, err error) {
+	defer derrors.Wrap(&err, "Client.readBody(%q, %q, %q)", modulePath, requestedVersion, suffix)
 
-	u, err := c.escapedURL(modulePath, version, suffix)
+	u, err := c.escapedURL(modulePath, requestedVersion, suffix)
 	if err != nil {
 		return nil, err
 	}